Commit 06ae4b35 authored by Aurindam Jana's avatar Aurindam Jana Committed by Kai Koehne
Browse files

QDeclarativeEngineDebug: Rename class



Renamed to QmlEngineDebugClient

Change-Id: I200e8ccf23a3464e2b6ad07288d17228118e905f
Reviewed-by: default avatarKai Koehne <kai.koehne@nokia.com>
parent dffbc440
...@@ -29,12 +29,11 @@ ...@@ -29,12 +29,11 @@
** **
**************************************************************************/ **************************************************************************/
#ifndef QDECLARATIVEENGINEDEBUG_H #ifndef QMLENGINEDEBUGCLIENT_H
#define QDECLARATIVEENGINEDEBUG_H #define QMLENGINEDEBUGCLIENT_H
#include "qmljsdebugclient_global.h" #include "qmljsdebugclient_global.h"
#include "qdeclarativedebugclient.h" #include "qdeclarativedebugclient.h"
#include <qobject.h>
#include <qurl.h> #include <qurl.h>
#include <qvariant.h> #include <qvariant.h>
...@@ -53,16 +52,14 @@ class QDeclarativeDebugContextReference; ...@@ -53,16 +52,14 @@ class QDeclarativeDebugContextReference;
class QDeclarativeDebugObjectReference; class QDeclarativeDebugObjectReference;
class QDeclarativeDebugFileReference; class QDeclarativeDebugFileReference;
class QDeclarativeDebugEngineReference; class QDeclarativeDebugEngineReference;
class QDeclarativeEngineDebugPrivate; class QmlEngineDebugClientPrivate;
class QMLJSDEBUGCLIENT_EXPORT QDeclarativeEngineDebug : public QObject class QMLJSDEBUGCLIENT_EXPORT QmlEngineDebugClient : public QDeclarativeDebugClient
{ {
Q_OBJECT Q_OBJECT
public: public:
explicit QDeclarativeEngineDebug(QDeclarativeDebugConnection *, QObject * = 0); explicit QmlEngineDebugClient(QDeclarativeDebugConnection *);
~QDeclarativeEngineDebug(); ~QmlEngineDebugClient();
QDeclarativeDebugClient::Status status() const;
QDeclarativeDebugPropertyWatch *addWatch(const QDeclarativeDebugPropertyReference &, QDeclarativeDebugPropertyWatch *addWatch(const QDeclarativeDebugPropertyReference &,
QObject *parent = 0); QObject *parent = 0);
...@@ -93,13 +90,18 @@ public: ...@@ -93,13 +90,18 @@ public:
bool resetBindingForObject(int objectDebugId, const QString &propertyName); bool resetBindingForObject(int objectDebugId, const QString &propertyName);
bool setMethodBody(int objectDebugId, const QString &methodName, const QString &methodBody); bool setMethodBody(int objectDebugId, const QString &methodName, const QString &methodBody);
QmlEngineDebugClientPrivate *priv() const { return d; }
Q_SIGNALS: Q_SIGNALS:
void newObjects(); void newObjects();
void statusChanged(QDeclarativeDebugClient::Status status); void newStatus(QDeclarativeDebugClient::Status status);
protected:
virtual void statusChanged(Status status);
virtual void messageReceived(const QByteArray &);
private: private:
Q_DECLARE_PRIVATE(QDeclarativeEngineDebug) friend class QmlEngineDebugClientPrivate;
QScopedPointer<QDeclarativeEngineDebugPrivate> d_ptr; QmlEngineDebugClientPrivate *d;
}; };
class QMLJSDEBUGCLIENT_EXPORT QDeclarativeDebugWatch : public QObject class QMLJSDEBUGCLIENT_EXPORT QDeclarativeDebugWatch : public QObject
...@@ -124,12 +126,12 @@ Q_SIGNALS: ...@@ -124,12 +126,12 @@ Q_SIGNALS:
void valueChanged(const QByteArray &name, const QVariant &value); void valueChanged(const QByteArray &name, const QVariant &value);
private: private:
friend class QDeclarativeEngineDebug; friend class QmlEngineDebugClient;
friend class QDeclarativeEngineDebugPrivate; friend class QmlEngineDebugClientPrivate;
void setState(State); void setState(State);
State m_state; State m_state;
int m_queryId; int m_queryId;
QDeclarativeEngineDebug *m_client; QmlEngineDebugClient *m_client;
int m_objectDebugId; int m_objectDebugId;
}; };
...@@ -142,7 +144,7 @@ public: ...@@ -142,7 +144,7 @@ public:
QString name() const; QString name() const;
private: private:
friend class QDeclarativeEngineDebug; friend class QmlEngineDebugClient;
QString m_name; QString m_name;
}; };
...@@ -155,7 +157,7 @@ public: ...@@ -155,7 +157,7 @@ public:
QString expression() const; QString expression() const;
private: private:
friend class QDeclarativeEngineDebug; friend class QmlEngineDebugClient;
QString m_expr; QString m_expr;
int m_debugId; int m_debugId;
}; };
...@@ -176,8 +178,8 @@ protected: ...@@ -176,8 +178,8 @@ protected:
QDeclarativeDebugQuery(QObject *); QDeclarativeDebugQuery(QObject *);
private: private:
friend class QDeclarativeEngineDebug; friend class QmlEngineDebugClient;
friend class QDeclarativeEngineDebugPrivate; friend class QmlEngineDebugClientPrivate;
void setState(State); void setState(State);
State m_state; State m_state;
}; };
...@@ -197,7 +199,7 @@ public: ...@@ -197,7 +199,7 @@ public:
void setColumnNumber(int); void setColumnNumber(int);
private: private:
friend class QDeclarativeEngineDebugPrivate; friend class QmlEngineDebugClientPrivate;
QUrl m_url; QUrl m_url;
int m_lineNumber; int m_lineNumber;
int m_columnNumber; int m_columnNumber;
...@@ -215,7 +217,7 @@ public: ...@@ -215,7 +217,7 @@ public:
QString name() const; QString name() const;
private: private:
friend class QDeclarativeEngineDebugPrivate; friend class QmlEngineDebugClientPrivate;
int m_debugId; int m_debugId;
QString m_name; QString m_name;
}; };
...@@ -240,7 +242,7 @@ public: ...@@ -240,7 +242,7 @@ public:
QList<QDeclarativeDebugObjectReference> children() const; QList<QDeclarativeDebugObjectReference> children() const;
private: private:
friend class QDeclarativeEngineDebugPrivate; friend class QmlEngineDebugClientPrivate;
int m_debugId; int m_debugId;
QString m_class; QString m_class;
QString m_idString; QString m_idString;
...@@ -265,7 +267,7 @@ public: ...@@ -265,7 +267,7 @@ public:
QList<QDeclarativeDebugContextReference> contexts() const; QList<QDeclarativeDebugContextReference> contexts() const;
private: private:
friend class QDeclarativeEngineDebugPrivate; friend class QmlEngineDebugClientPrivate;
int m_debugId; int m_debugId;
QString m_name; QString m_name;
QList<QDeclarativeDebugObjectReference> m_objects; QList<QDeclarativeDebugObjectReference> m_objects;
...@@ -287,7 +289,7 @@ public: ...@@ -287,7 +289,7 @@ public:
bool hasNotifySignal() const; bool hasNotifySignal() const;
private: private:
friend class QDeclarativeEngineDebugPrivate; friend class QmlEngineDebugClientPrivate;
int m_objectDebugId; int m_objectDebugId;
QString m_name; QString m_name;
QVariant m_value; QVariant m_value;
...@@ -304,10 +306,10 @@ public: ...@@ -304,10 +306,10 @@ public:
virtual ~QDeclarativeDebugEnginesQuery(); virtual ~QDeclarativeDebugEnginesQuery();
QList<QDeclarativeDebugEngineReference> engines() const; QList<QDeclarativeDebugEngineReference> engines() const;
private: private:
friend class QDeclarativeEngineDebug; friend class QmlEngineDebugClient;
friend class QDeclarativeEngineDebugPrivate; friend class QmlEngineDebugClientPrivate;
QDeclarativeDebugEnginesQuery(QObject *); QDeclarativeDebugEnginesQuery(QObject *);
QDeclarativeEngineDebug *m_client; QmlEngineDebugClient *m_client;
int m_queryId; int m_queryId;
QList<QDeclarativeDebugEngineReference> m_engines; QList<QDeclarativeDebugEngineReference> m_engines;
}; };
...@@ -319,10 +321,10 @@ public: ...@@ -319,10 +321,10 @@ public:
virtual ~QDeclarativeDebugRootContextQuery(); virtual ~QDeclarativeDebugRootContextQuery();
QDeclarativeDebugContextReference rootContext() const; QDeclarativeDebugContextReference rootContext() const;
private: private:
friend class QDeclarativeEngineDebug; friend class QmlEngineDebugClient;
friend class QDeclarativeEngineDebugPrivate; friend class QmlEngineDebugClientPrivate;
QDeclarativeDebugRootContextQuery(QObject *); QDeclarativeDebugRootContextQuery(QObject *);
QDeclarativeEngineDebug *m_client; QmlEngineDebugClient *m_client;
int m_queryId; int m_queryId;
QDeclarativeDebugContextReference m_context; QDeclarativeDebugContextReference m_context;
}; };
...@@ -334,10 +336,10 @@ public: ...@@ -334,10 +336,10 @@ public:
virtual ~QDeclarativeDebugObjectQuery(); virtual ~QDeclarativeDebugObjectQuery();
QDeclarativeDebugObjectReference object() const; QDeclarativeDebugObjectReference object() const;
private: private:
friend class QDeclarativeEngineDebug; friend class QmlEngineDebugClient;
friend class QDeclarativeEngineDebugPrivate; friend class QmlEngineDebugClientPrivate;
QDeclarativeDebugObjectQuery(QObject *); QDeclarativeDebugObjectQuery(QObject *);
QDeclarativeEngineDebug *m_client; QmlEngineDebugClient *m_client;
int m_queryId; int m_queryId;
QDeclarativeDebugObjectReference m_object; QDeclarativeDebugObjectReference m_object;
...@@ -351,10 +353,10 @@ public: ...@@ -351,10 +353,10 @@ public:
QVariant expression() const; QVariant expression() const;
QVariant result() const; QVariant result() const;
private: private:
friend class QDeclarativeEngineDebug; friend class QmlEngineDebugClient;
friend class QDeclarativeEngineDebugPrivate; friend class QmlEngineDebugClientPrivate;
QDeclarativeDebugExpressionQuery(QObject *); QDeclarativeDebugExpressionQuery(QObject *);
QDeclarativeEngineDebug *m_client; QmlEngineDebugClient *m_client;
int m_queryId; int m_queryId;
QVariant m_expr; QVariant m_expr;
QVariant m_result; QVariant m_result;
...@@ -367,4 +369,4 @@ Q_DECLARE_METATYPE(QmlJsDebugClient::QDeclarativeDebugObjectReference) ...@@ -367,4 +369,4 @@ Q_DECLARE_METATYPE(QmlJsDebugClient::QDeclarativeDebugObjectReference)
Q_DECLARE_METATYPE(QmlJsDebugClient::QDeclarativeDebugContextReference) Q_DECLARE_METATYPE(QmlJsDebugClient::QDeclarativeDebugContextReference)
Q_DECLARE_METATYPE(QmlJsDebugClient::QDeclarativeDebugPropertyReference) Q_DECLARE_METATYPE(QmlJsDebugClient::QDeclarativeDebugPropertyReference)
#endif // QDECLARATIVEENGINEDEBUG_H #endif // QMLENGINEDEBUGCLIENT_H
...@@ -9,7 +9,7 @@ INCLUDEPATH += $$PWD/.. ...@@ -9,7 +9,7 @@ INCLUDEPATH += $$PWD/..
HEADERS += \ HEADERS += \
$$PWD/qmlprofilereventlocation.h \ $$PWD/qmlprofilereventlocation.h \
$$PWD/qdeclarativedebugclient.h \ $$PWD/qdeclarativedebugclient.h \
$$PWD/qdeclarativeenginedebug.h \ $$PWD/qmlenginedebugclient.h \
$$PWD/qdeclarativeoutputparser.h \ $$PWD/qdeclarativeoutputparser.h \
$$PWD/qmljsdebugclient_global.h \ $$PWD/qmljsdebugclient_global.h \
$$PWD/qmlprofilereventtypes.h \ $$PWD/qmlprofilereventtypes.h \
...@@ -21,7 +21,7 @@ HEADERS += \ ...@@ -21,7 +21,7 @@ HEADERS += \
SOURCES += \ SOURCES += \
$$PWD/qdeclarativedebugclient.cpp \ $$PWD/qdeclarativedebugclient.cpp \
$$PWD/qdeclarativeenginedebug.cpp \ $$PWD/qmlenginedebugclient.cpp \
$$PWD/qdeclarativeoutputparser.cpp \ $$PWD/qdeclarativeoutputparser.cpp \
$$PWD/qmlprofilertraceclient.cpp \ $$PWD/qmlprofilertraceclient.cpp \
$$PWD/qpacketprotocol.cpp \ $$PWD/qpacketprotocol.cpp \
......
...@@ -30,8 +30,8 @@ DynamicLibrary { ...@@ -30,8 +30,8 @@ DynamicLibrary {
"qv8profilerclient.cpp", "qv8profilerclient.cpp",
"qv8profilerclient.h", "qv8profilerclient.h",
"qdeclarativedebugclient.h", "qdeclarativedebugclient.h",
"qdeclarativeenginedebug.cpp", "qmlenginedebugclient.cpp",
"qdeclarativeenginedebug.h", "qmlenginedebugclient.h",
"qmlprofilereventtypes.h", "qmlprofilereventtypes.h",
"qmlprofilertraceclient.h", "qmlprofilertraceclient.h",
"qpacketprotocol.h", "qpacketprotocol.h",
......
...@@ -67,7 +67,7 @@ public: ...@@ -67,7 +67,7 @@ public:
QWeakPointer<DebuggerEngine> m_engine; QWeakPointer<DebuggerEngine> m_engine;
QmlDebuggerClient *m_qmlClient; QmlDebuggerClient *m_qmlClient;
QmlJsDebugClient::QDeclarativeEngineDebug *m_engineDebugClient; QmlJsDebugClient::QmlEngineDebugClient *m_engineDebugClient;
QTimer m_connectionTimer; QTimer m_connectionTimer;
QDeclarativeDebugConnection *m_conn; QDeclarativeDebugConnection *m_conn;
QHash<QString, QmlDebuggerClient*> debugClients; QHash<QString, QmlDebuggerClient*> debugClients;
...@@ -304,12 +304,12 @@ QHash<QString, Internal::QmlDebuggerClient*> QmlAdapter::debuggerClients() ...@@ -304,12 +304,12 @@ QHash<QString, Internal::QmlDebuggerClient*> QmlAdapter::debuggerClients()
return d->debugClients; return d->debugClients;
} }
QmlJsDebugClient::QDeclarativeEngineDebug *QmlAdapter::engineDebugClient() const QmlJsDebugClient::QmlEngineDebugClient *QmlAdapter::engineDebugClient() const
{ {
return d->m_engineDebugClient; return d->m_engineDebugClient;
} }
void QmlAdapter::setEngineDebugClient(QmlJsDebugClient::QDeclarativeEngineDebug *client) void QmlAdapter::setEngineDebugClient(QmlJsDebugClient::QmlEngineDebugClient *client)
{ {
d->m_engineDebugClient = client; d->m_engineDebugClient = client;
} }
......
...@@ -40,7 +40,7 @@ ...@@ -40,7 +40,7 @@
#include <QAbstractSocket> #include <QAbstractSocket>
namespace QmlJsDebugClient { namespace QmlJsDebugClient {
class QDeclarativeEngineDebug; class QmlEngineDebugClient;
class QDeclarativeDebugConnection; class QDeclarativeDebugConnection;
class QDebugMessageClient; class QDebugMessageClient;
} }
...@@ -76,8 +76,8 @@ public: ...@@ -76,8 +76,8 @@ public:
Internal::QmlDebuggerClient *activeDebuggerClient(); Internal::QmlDebuggerClient *activeDebuggerClient();
QHash<QString, Internal::QmlDebuggerClient*> debuggerClients(); QHash<QString, Internal::QmlDebuggerClient*> debuggerClients();
QmlJsDebugClient::QDeclarativeEngineDebug *engineDebugClient() const; QmlJsDebugClient::QmlEngineDebugClient *engineDebugClient() const;
void setEngineDebugClient(QmlJsDebugClient::QDeclarativeEngineDebug *client); void setEngineDebugClient(QmlJsDebugClient::QmlEngineDebugClient *client);
QDebugMessageClient *messageClient() const; QDebugMessageClient *messageClient() const;
......
...@@ -1149,7 +1149,7 @@ bool QmlEngine::evaluateScriptExpression(const QString& expression) ...@@ -1149,7 +1149,7 @@ bool QmlEngine::evaluateScriptExpression(const QString& expression)
//is sent to V8DebugService. In all other cases, the //is sent to V8DebugService. In all other cases, the
//expression is evaluated by QDeclarativeEngine. //expression is evaluated by QDeclarativeEngine.
if (state() != InferiorStopOk) { if (state() != InferiorStopOk) {
QDeclarativeEngineDebug *engineDebug = QmlEngineDebugClient *engineDebug =
d->m_adapter.engineDebugClient(); d->m_adapter.engineDebugClient();
int id = d->m_adapter.currentSelectedDebugId(); int id = d->m_adapter.currentSelectedDebugId();
......
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
#define DEBUGGER_QMLENGINE_H #define DEBUGGER_QMLENGINE_H
#include "debuggerengine.h" #include "debuggerengine.h"
#include <qmljsdebugclient/qdeclarativeenginedebug.h> #include <qmljsdebugclient/qmlenginedebugclient.h>
#include <qmljsdebugclient/qdebugmessageclient.h> #include <qmljsdebugclient/qdebugmessageclient.h>
#include <utils/outputformat.h> #include <utils/outputformat.h>
#include <qmljs/qmljsdocument.h> #include <qmljs/qmljsdocument.h>
......
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
#ifndef QMLJSPRIVATEAPI_H #ifndef QMLJSPRIVATEAPI_H
#define QMLJSPRIVATEAPI_H #define QMLJSPRIVATEAPI_H
#include <qmljsdebugclient/qdeclarativeenginedebug.h> #include <qmljsdebugclient/qmlenginedebugclient.h>
#include <qmljsdebugclient/qdeclarativedebugclient.h> #include <qmljsdebugclient/qdeclarativedebugclient.h>
using namespace QmlJsDebugClient; using namespace QmlJsDebugClient;
......
...@@ -71,7 +71,7 @@ ClientProxy::~ClientProxy() ...@@ -71,7 +71,7 @@ ClientProxy::~ClientProxy()
void ClientProxy::connectToServer() void ClientProxy::connectToServer()
{ {
m_engineClient = new QDeclarativeEngineDebug(m_adapter.data()->connection(), this); m_engineClient = new QmlEngineDebugClient(m_adapter.data()->connection());
connect(m_engineClient, SIGNAL(newObjects()), this, SLOT(newObjects())); connect(m_engineClient, SIGNAL(newObjects()), this, SLOT(newObjects()));
connect(m_engineClient, SIGNAL(statusChanged(QDeclarativeDebugClient::Status)), connect(m_engineClient, SIGNAL(statusChanged(QDeclarativeDebugClient::Status)),
...@@ -127,7 +127,7 @@ void ClientProxy::clientStatusChanged(QDeclarativeDebugClient::Status status) ...@@ -127,7 +127,7 @@ void ClientProxy::clientStatusChanged(QDeclarativeDebugClient::Status status)
void ClientProxy::engineClientStatusChanged(QDeclarativeDebugClient::Status status) void ClientProxy::engineClientStatusChanged(QDeclarativeDebugClient::Status status)
{ {
if (status == QDeclarativeDebugClient::Enabled) { if (status == QDeclarativeDebugClient::Enabled) {
m_adapter.data()->setEngineDebugClient(qobject_cast<QDeclarativeEngineDebug *>(sender())); m_adapter.data()->setEngineDebugClient(qobject_cast<QmlEngineDebugClient *>(sender()));
} }
} }
......
...@@ -167,7 +167,7 @@ private: ...@@ -167,7 +167,7 @@ private:
void buildDebugIdHashRecursive(const QDeclarativeDebugObjectReference &ref); void buildDebugIdHashRecursive(const QDeclarativeDebugObjectReference &ref);
QWeakPointer<Debugger::QmlAdapter> m_adapter; QWeakPointer<Debugger::QmlAdapter> m_adapter;
QDeclarativeEngineDebug *m_engineClient; QmlEngineDebugClient *m_engineClient;
QmlJSInspectorClient *m_inspectorClient; QmlJSInspectorClient *m_inspectorClient;
QDeclarativeDebugEnginesQuery *m_engineQuery; QDeclarativeDebugEnginesQuery *m_engineQuery;
......
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
#ifndef QMLJSPRIVATEAPI_H #ifndef QMLJSPRIVATEAPI_H
#define QMLJSPRIVATEAPI_H #define QMLJSPRIVATEAPI_H
#include <qmljsdebugclient/qdeclarativeenginedebug.h> #include <qmljsdebugclient/qmlenginedebugclient.h>
#include <qmljsdebugclient/qdeclarativedebugclient.h> #include <qmljsdebugclient/qdeclarativedebugclient.h>
using namespace QmlJsDebugClient; using namespace QmlJsDebugClient;
......
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