feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

QmlJS: Remove 'qmljsprivateapi.h' header

Browse Source 
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: Aurindam Jana <aurindam.jana@nokia.com>
This commit is contained in:
Kai Koehne
2012-04-18 13:31:36 +02:00
parent 9283d7d50f
commit 84cb289ae3
18 changed files with 40 additions and 122 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/plugins/debugger/qml/qmladapter.h
View File

@@ -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: