Commit 84cb289a authored by Kai Koehne's avatar Kai Koehne

QmlJS: Remove 'qmljsprivateapi.h' header

That's a reminiscent of the times when qmljs was just a copy
of the classes in Qt.

Rather include the files individually.

Change-Id: I6ff8541c004ef4dab9d9d4f5011ff6c5a3a0574a
Reviewed-by: default avatarAurindam Jana <aurindam.jana@nokia.com>
parent 9283d7d5
......@@ -231,7 +231,6 @@ QtcPlugin {
"qml/qmlengine.h",
"qml/qmladapter.h",
"qml/baseqmldebuggerclient.h",
"qml/qmljsprivateapi.h",
"qml/qmlcppengine.h",
"qml/qscriptdebuggerclient.h",
"qml/qmlv8debuggerclient.h",
......
......@@ -33,8 +33,8 @@
#ifndef BASEQMLDEBUGGERCLIENT_H
#define BASEQMLDEBUGGERCLIENT_H
#include "qmljsprivateapi.h"
#include "debuggerengine.h"
#include <qmldebug/qmldebugclient.h>
namespace Debugger {
namespace Internal {
......@@ -45,7 +45,7 @@ class BreakpointModelId;
class QmlEngine;
class BaseQmlDebuggerClientPrivate;
class BaseQmlDebuggerClient : public QmlDebugClient
class BaseQmlDebuggerClient : public QmlDebug::QmlDebugClient
{
Q_OBJECT
......
......@@ -4,7 +4,6 @@ HEADERS += \
$$PWD/qmlengine.h \
$$PWD/qmladapter.h \
$$PWD/baseqmldebuggerclient.h \
$$PWD/qmljsprivateapi.h \
$$PWD/qmlcppengine.h \
$$PWD/qscriptdebuggerclient.h \
$$PWD/qmlv8debuggerclient.h \
......
......@@ -34,13 +34,13 @@
#include "qscriptdebuggerclient.h"
#include "qmlv8debuggerclient.h"
#include "qmljsprivateapi.h"
#include "qmlengine.h"
#include <extensionsystem/pluginmanager.h>
#include <utils/qtcassert.h>
#include <qmldebug/baseenginedebugclient.h>
#include <qmldebug/qdebugmessageclient.h>
#include <QTimer>
......@@ -67,13 +67,13 @@ public:
QWeakPointer<DebuggerEngine> m_engine;
BaseQmlDebuggerClient *m_qmlClient;
QmlDebug::BaseEngineDebugClient *m_engineDebugClient;
BaseEngineDebugClient *m_engineDebugClient;
QTimer m_connectionTimer;
QmlDebugConnection *m_conn;
QHash<QString, BaseQmlDebuggerClient*> debugClients;
int m_currentSelectedDebugId;
QString m_currentSelectedDebugName;
QmlDebug::QDebugMessageClient *m_msgClient;
QDebugMessageClient *m_msgClient;
};
} // namespace Internal
......@@ -93,7 +93,7 @@ QmlAdapter::QmlAdapter(DebuggerEngine *engine, QObject *parent)
pluginManager->addObject(this);
createDebuggerClients();
d->m_msgClient = new QmlDebug::QDebugMessageClient(d->m_conn);
d->m_msgClient = new QDebugMessageClient(d->m_conn);
connect(d->m_msgClient, SIGNAL(newStatus(QmlDebugClient::Status)),
this, SLOT(clientStatusChanged(QmlDebugClient::Status)));
}
......@@ -307,12 +307,12 @@ QHash<QString, Internal::BaseQmlDebuggerClient*> QmlAdapter::debuggerClients()
return d->debugClients;
}
QmlDebug::BaseEngineDebugClient *QmlAdapter::engineDebugClient() const
BaseEngineDebugClient *QmlAdapter::engineDebugClient() const
{
return d->m_engineDebugClient;
}
void QmlAdapter::setEngineDebugClient(QmlDebug::BaseEngineDebugClient *client)
void QmlAdapter::setEngineDebugClient(BaseEngineDebugClient *client)
{
Internal::QmlEngine *engine =
qobject_cast<Internal::QmlEngine *>(d->m_engine.data());
......@@ -327,7 +327,7 @@ void QmlAdapter::setEngineDebugClient(QmlDebug::BaseEngineDebugClient *client)
SLOT(expressionEvaluated(quint32,QVariant)));
}
QmlDebug::QDebugMessageClient *QmlAdapter::messageClient() const
QDebugMessageClient *QmlAdapter::messageClient() const
{
return d->m_msgClient;
}
......
......@@ -34,10 +34,10 @@
#define QMLADAPTER_H
#include "debugger_global.h"
#include "qmljsprivateapi.h"
#include <QObject>
#include <QAbstractSocket>
#include <qmldebug/qmldebugclient.h>
namespace QmlDebug {
class BaseEngineDebugClient;
......@@ -54,6 +54,8 @@ class BaseQmlDebuggerClient;
class QmlAdapterPrivate;
} // namespace Internal
using namespace QmlDebug;
class DEBUGGER_EXPORT QmlAdapter : public QObject
{
Q_OBJECT
......@@ -68,7 +70,7 @@ public:
bool isConnected() const;
QmlDebug::QmlDebugConnection *connection() const;
QmlDebugConnection *connection() const;
DebuggerEngine *debuggerEngine() const;
bool disableJsDebugging(bool block);
......@@ -76,17 +78,18 @@ public:
Internal::BaseQmlDebuggerClient *activeDebuggerClient();
QHash<QString, Internal::BaseQmlDebuggerClient*> debuggerClients();
QmlDebug::BaseEngineDebugClient *engineDebugClient() const;
void setEngineDebugClient(QmlDebug::BaseEngineDebugClient *client);
BaseEngineDebugClient *engineDebugClient() const;
void setEngineDebugClient(BaseEngineDebugClient *client);
QmlDebug::QDebugMessageClient *messageClient() const;
QDebugMessageClient *messageClient() const;
int currentSelectedDebugId() const;
QString currentSelectedDisplayName() const;
void setCurrentSelectedDebugInfo(int debugId, const QString &displayName = QString());
public slots:
void logServiceStatusChange(const QString &service, float version, QmlDebugClient::Status newStatus);
void logServiceStatusChange(const QString &service, float version,
QmlDebugClient::Status newStatus);
void logServiceActivity(const QString &service, const QString &logMessage);
signals:
......
......@@ -115,7 +115,7 @@ private:
QmlAdapter m_adapter;
ApplicationLauncher m_applicationLauncher;
QTimer m_noDebugOutputTimer;
QmlDebug::QmlOutputParser m_outputParser;
QmlOutputParser m_outputParser;
QHash<QString, QTextDocument*> m_sourceDocuments;
QHash<QString, QWeakPointer<TextEditor::ITextEditor> > m_sourceEditors;
InteractiveInterpreter m_interpreter;
......
/**************************************************************************
**
** This file is part of Qt Creator
**
** Copyright (c) 2012 Nokia Corporation and/or its subsidiary(-ies).
**
** Contact: Nokia Corporation (qt-info@nokia.com)
**
**
** GNU Lesser General Public License Usage
**
** This file may be used under the terms of the GNU Lesser General Public
** License version 2.1 as published by the Free Software Foundation and
** appearing in the file LICENSE.LGPL included in the packaging of this file.
** Please review the following information to ensure the GNU Lesser General
** Public License version 2.1 requirements will be met:
** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
** In addition, as a special exception, Nokia gives you certain additional
** rights. These rights are described in the Nokia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** Other Usage
**
** Alternatively, this file may be used in accordance with the terms and
** conditions contained in a signed written agreement between you and Nokia.
**
** If you have questions regarding the use of this file, please contact
** Nokia at qt-info@nokia.com.
**
**************************************************************************/
#ifndef QMLJSPRIVATEAPI_H
#define QMLJSPRIVATEAPI_H
#include <qmldebug/baseenginedebugclient.h>
#include <qmldebug/qmldebugclient.h>
#include <qmldebug/declarativeenginedebugclient.h>
#include <qmldebug/qmlenginedebugclient.h>
using namespace QmlDebug;
#endif // QMLJSPRIVATEAPI_H
......@@ -31,7 +31,6 @@
**************************************************************************/
#include "qmljsclientproxy.h"
#include "qmljsprivateapi.h"
#include "qmltoolsclient.h"
#include "qmljsinspector.h"
......@@ -43,6 +42,8 @@
#include <extensionsystem/pluginmanager.h>
#include <utils/qtcassert.h>
#include <projectexplorer/project.h>
#include <qmldebug/declarativeenginedebugclient.h>
#include <qmldebug/qmlenginedebugclient.h>
#include <QUrl>
#include <QAbstractSocket>
......
......@@ -33,7 +33,7 @@
#define QMLJSCLIENTPROXY_H
#include "qmljsinspectorplugin.h"
#include "qmljsprivateapi.h"
#include <qmldebug/baseenginedebugclient.h>
#include <QObject>
QT_FORWARD_DECLARE_CLASS(QUrl)
......@@ -53,6 +53,8 @@ namespace Internal {
class InspectorPlugin;
class QmlToolsClient;
using namespace QmlDebug;
class ClientProxy : public QObject
{
Q_OBJECT
......
......@@ -35,7 +35,6 @@
#include "qmljsinspectortoolbar.h"
#include "qmljsclientproxy.h"
#include "qmljslivetextpreview.h"
#include "qmljsprivateapi.h"
#include "qmljscontextcrumblepath.h"
#include "qmljsinspectorsettings.h"
#include "qmljspropertyinspector.h"
......
......@@ -33,11 +33,11 @@
#ifndef QMLJSINSPECTOR_H
#define QMLJSINSPECTOR_H
#include "qmljsprivateapi.h"
#include <coreplugin/editormanager/ieditor.h>
#include <utils/fileinprojectfinder.h>
#include <qmldebug/baseenginedebugclient.h>
#include <qmljs/qmljsdocument.h>
#include <qmljs/parser/qmljsastfwd_p.h>
......@@ -73,6 +73,8 @@ class InspectorSettings;
class ContextCrumblePath;
class QmlJSLiveTextPreview;
using namespace QmlDebug;
class InspectorUi : public QObject
{
Q_OBJECT
......
......@@ -12,7 +12,6 @@ greaterThan(QT_MAJOR_VERSION, 4) {
DEFINES += QMLJSINSPECTOR_LIBRARY
HEADERS += \
qmljsprivateapi.h \
qmljsinspector_global.h \
qmljsinspectorconstants.h \
qmljsinspectorplugin.h \
......
......@@ -28,7 +28,6 @@ QtcPlugin {
]
files: [
"qmljsprivateapi.h",
"qmljsinspector_global.h",
"qmljsinspectorconstants.h",
"qmljsinspectorplugin.h",
......
......@@ -35,7 +35,6 @@
#include "qmljsinspector.h"
#include "qmljsclientproxy.h"
#include "qmljslivetextpreview.h"
#include "qmljsprivateapi.h"
#include "qmljsinspectorconstants.h"
#include <qmljseditor/qmljseditorconstants.h>
......
......@@ -37,9 +37,9 @@
#include <QWeakPointer>
#include <texteditor/basetexteditor.h>
#include <qmldebug/baseenginedebugclient.h>
#include <qmljs/parser/qmljsastfwd_p.h>
#include <qmljs/qmljsdocument.h>
#include "qmljsprivateapi.h"
QT_FORWARD_DECLARE_CLASS(QTextDocument)
......@@ -56,6 +56,8 @@ namespace Internal {
class ClientProxy;
using namespace QmlDebug;
class QmlJSLiveTextPreview : public QObject
{
Q_OBJECT
......
/**************************************************************************
**
** This file is part of Qt Creator
**
** Copyright (c) 2012 Nokia Corporation and/or its subsidiary(-ies).
**
** Contact: Nokia Corporation (qt-info@nokia.com)
**
**
** GNU Lesser General Public License Usage
**
** This file may be used under the terms of the GNU Lesser General Public
** License version 2.1 as published by the Free Software Foundation and
** appearing in the file LICENSE.LGPL included in the packaging of this file.
** Please review the following information to ensure the GNU Lesser General
** Public License version 2.1 requirements will be met:
** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
** In addition, as a special exception, Nokia gives you certain additional
** rights. These rights are described in the Nokia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** Other Usage
**
** Alternatively, this file may be used in accordance with the terms and
** conditions contained in a signed written agreement between you and Nokia.
**
** If you have questions regarding the use of this file, please contact
** Nokia at qt-info@nokia.com.
**
**************************************************************************/
#ifndef QMLJSPRIVATEAPI_H
#define QMLJSPRIVATEAPI_H
#include <qmldebug/baseenginedebugclient.h>
#include <qmldebug/qmldebugclient.h>
#include <qmldebug/declarativeenginedebugclient.h>
#include <qmldebug/qmlenginedebugclient.h>
using namespace QmlDebug;
#endif // QMLJSPRIVATEAPI_H
......@@ -32,7 +32,7 @@
#ifndef PROPERTYINSPECTOR_H
#define PROPERTYINSPECTOR_H
#include <qmljsprivateapi.h>
#include <qmldebug/baseenginedebugclient.h>
#include <utils/basetreeview.h>
#include <QStandardItemModel>
......@@ -41,10 +41,6 @@
#include "customcolordialog.h"
QT_BEGIN_NAMESPACE
QT_END_NAMESPACE
namespace Utils {
class SavedAction;
}
......@@ -52,6 +48,8 @@ class SavedAction;
namespace QmlJSInspector {
namespace Internal {
using namespace QmlDebug;
class PropertyEditDelegate;
class ExpressionEdit : public QDialog
......
......@@ -32,18 +32,18 @@
#ifndef QMLTOOLSCLIENT_H
#define QMLTOOLSCLIENT_H
#include "qmljsprivateapi.h"
#include <qmldebug/qmldebugclient.h>
#include <inspectorprotocol.h>
#include <qmldebug/baseenginedebugclient.h>
namespace QmlJSInspector {
namespace Internal {
class QmlToolsClient : public QmlDebugClient
class QmlToolsClient : public QmlDebug::QmlDebugClient
{
Q_OBJECT
public:
explicit QmlToolsClient(QmlDebugConnection *client,
explicit QmlToolsClient(QmlDebug::QmlDebugConnection *client,
QObject *parent = 0);
void setCurrentObjects(const QList<int> &debugIds);
......@@ -68,7 +68,7 @@ public:
QList<int> currentObjects() const;
// ### Qt 4.8: remove if we can have access to qdeclarativecontextdata or id's
void setObjectIdList(const QList<QmlDebugObjectReference> &objectRoots);
void setObjectIdList(const QList<QmlDebug::QmlDebugObjectReference> &objectRoots);
void clearComponentCache();
......@@ -102,7 +102,7 @@ private:
const QString &extra = QString());
QList<int> m_currentDebugIds;
QmlDebugConnection *m_connection;
QmlDebug::QmlDebugConnection *m_connection;
};
} // namespace Internal
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment