Commit bb41109b authored by Kai Koehne's avatar Kai Koehne
Browse files

QmlJSDebugClient: Fix style & indentation

Change-Id: I87bdb465816fc68f83f6c5e097c9d9b853614b94
Reviewed-on: http://codereview.qt.nokia.com/2672

Reviewed-by: default avatarChristiaan Janssen <christiaan.janssen@nokia.com>
parent ca7d5942
......@@ -29,9 +29,9 @@
**
**************************************************************************/
#include "qdeclarativedebugclient_p.h"
#include "qdeclarativedebugclient.h"
#include "qpacketprotocol_p.h"
#include "qpacketprotocol.h"
#include <QtCore/qdebug.h>
#include <QtCore/qstringlist.h>
......@@ -46,7 +46,7 @@ static const uchar KQmlOstProtocolId = 0x94;
class QDeclarativeDebugClientPrivate
{
// Q_DECLARE_PUBLIC(QDeclarativeDebugClient)
// Q_DECLARE_PUBLIC(QDeclarativeDebugClient)
public:
QDeclarativeDebugClientPrivate();
......@@ -77,7 +77,7 @@ public Q_SLOTS:
};
QDeclarativeDebugConnectionPrivate::QDeclarativeDebugConnectionPrivate(QDeclarativeDebugConnection *c)
: QObject(c), q(c), protocol(0), device(0), gotHello(false)
: QObject(c), q(c), protocol(0), device(0), gotHello(false)
{
protocol = new QPacketProtocol(q, this);
QObject::connect(c, SIGNAL(connected()), this, SLOT(connected()));
......@@ -175,7 +175,7 @@ void QDeclarativeDebugConnectionPrivate::readyRead()
pack >> message;
QHash<QString, QDeclarativeDebugClient *>::Iterator iter =
plugins.find(name);
plugins.find(name);
if (iter == plugins.end()) {
qWarning() << "QDeclarativeDebugConnection: Message received for missing plugin" << name;
} else {
......@@ -193,7 +193,7 @@ void QDeclarativeDebugConnectionPrivate::deviceAboutToClose()
}
QDeclarativeDebugConnection::QDeclarativeDebugConnection(QObject *parent)
: QIODevice(parent), d(new QDeclarativeDebugConnectionPrivate(this))
: QIODevice(parent), d(new QDeclarativeDebugConnectionPrivate(this))
{
}
......@@ -201,8 +201,8 @@ QDeclarativeDebugConnection::~QDeclarativeDebugConnection()
{
QHash<QString, QDeclarativeDebugClient*>::iterator iter = d->plugins.begin();
for (; iter != d->plugins.end(); ++iter) {
iter.value()->d_func()->connection = 0;
iter.value()->statusChanged(QDeclarativeDebugClient::NotConnected);
iter.value()->d_func()->connection = 0;
iter.value()->statusChanged(QDeclarativeDebugClient::NotConnected);
}
}
......@@ -240,7 +240,7 @@ void QDeclarativeDebugConnection::close()
QHash<QString, QDeclarativeDebugClient*>::iterator iter = d->plugins.begin();
for (; iter != d->plugins.end(); ++iter) {
iter.value()->statusChanged(QDeclarativeDebugClient::NotConnected);
iter.value()->statusChanged(QDeclarativeDebugClient::NotConnected);
}
}
}
......@@ -322,13 +322,13 @@ void QDeclarativeDebugConnectionPrivate::connectDeviceSignals()
//
QDeclarativeDebugClientPrivate::QDeclarativeDebugClientPrivate()
: connection(0)
: connection(0)
{
}
QDeclarativeDebugClient::QDeclarativeDebugClient(const QString &name,
QDeclarativeDebugConnection *parent)
: QObject(parent), d_ptr(new QDeclarativeDebugClientPrivate())
QDeclarativeDebugConnection *parent)
: QObject(parent), d_ptr(new QDeclarativeDebugClientPrivate())
{
Q_D(QDeclarativeDebugClient);
d->name = name;
......@@ -365,8 +365,8 @@ QDeclarativeDebugClient::Status QDeclarativeDebugClient::status() const
{
Q_D(const QDeclarativeDebugClient);
if (!d->connection
|| !d->connection->isConnected()
|| !d->connection->d->gotHello)
|| !d->connection->isConnected()
|| !d->connection->d->gotHello)
return NotConnected;
if (d->connection->d->serverPlugins.contains(d->name))
......
......@@ -34,8 +34,6 @@
#include <QtNetwork/qtcpsocket.h>
QT_BEGIN_HEADER
namespace QmlJsDebugClient {
class QDeclarativeDebugConnectionPrivate;
......@@ -100,8 +98,6 @@ private:
QScopedPointer<QDeclarativeDebugClientPrivate> d_ptr;
};
}
QT_END_HEADER
} // namespace QmlJsDebugClient
#endif // QDECLARATIVEDEBUGCLIENT_H
......@@ -29,9 +29,9 @@
**
**************************************************************************/
#include "qdeclarativedebug_p.h"
#include "qdeclarativeenginedebug.h"
#include "qdeclarativedebugclient_p.h"
#include "qdeclarativedebugclient.h"
namespace QmlJsDebugClient {
......@@ -52,7 +52,7 @@ private:
class QDeclarativeEngineDebugPrivate
{
// Q_DECLARE_PUBLIC(QDeclarativeEngineDebug)
// Q_DECLARE_PUBLIC(QDeclarativeEngineDebug)
public:
QDeclarativeEngineDebugPrivate(QDeclarativeEngineDebug *, QDeclarativeDebugConnection *);
~QDeclarativeEngineDebugPrivate();
......@@ -83,8 +83,8 @@ public:
};
QDeclarativeEngineDebugClient::QDeclarativeEngineDebugClient(QDeclarativeDebugConnection *client,
QDeclarativeEngineDebugPrivate *p)
: QDeclarativeDebugClient(QLatin1String("QDeclarativeEngine"), client), priv(p)
QDeclarativeEngineDebugPrivate *p)
: QDeclarativeDebugClient(QLatin1String("QDeclarativeEngine"), client), priv(p)
{
}
......@@ -105,7 +105,7 @@ void QDeclarativeEngineDebugClient::messageReceived(const QByteArray &data)
}
QDeclarativeEngineDebugPrivate::QDeclarativeEngineDebugPrivate(QDeclarativeEngineDebug *q, QDeclarativeDebugConnection *c)
: client(new QDeclarativeEngineDebugClient(c, this)), q_ptr(q), nextId(0)
: client(new QDeclarativeEngineDebugClient(c, this)), q_ptr(q), nextId(0)
{
}
......@@ -113,41 +113,41 @@ QDeclarativeEngineDebugPrivate::~QDeclarativeEngineDebugPrivate()
{
if (client)
client->priv = 0;
delete client;
QHash<int, QDeclarativeDebugEnginesQuery*>::iterator enginesIter = enginesQuery.begin();
for (; enginesIter != enginesQuery.end(); ++enginesIter) {
enginesIter.value()->m_client = 0;
if (enginesIter.value()->state() == QDeclarativeDebugQuery::Waiting)
enginesIter.value()->setState(QDeclarativeDebugQuery::Error);
}
QHash<int, QDeclarativeDebugRootContextQuery*>::iterator rootContextIter = rootContextQuery.begin();
for (; rootContextIter != rootContextQuery.end(); ++rootContextIter) {
rootContextIter.value()->m_client = 0;
if (rootContextIter.value()->state() == QDeclarativeDebugQuery::Waiting)
rootContextIter.value()->setState(QDeclarativeDebugQuery::Error);
}
QHash<int, QDeclarativeDebugObjectQuery*>::iterator objectIter = objectQuery.begin();
for (; objectIter != objectQuery.end(); ++objectIter) {
objectIter.value()->m_client = 0;
if (objectIter.value()->state() == QDeclarativeDebugQuery::Waiting)
objectIter.value()->setState(QDeclarativeDebugQuery::Error);
}
QHash<int, QDeclarativeDebugExpressionQuery*>::iterator exprIter = expressionQuery.begin();
for (; exprIter != expressionQuery.end(); ++exprIter) {
exprIter.value()->m_client = 0;
if (exprIter.value()->state() == QDeclarativeDebugQuery::Waiting)
exprIter.value()->setState(QDeclarativeDebugQuery::Error);
}
QHash<int, QDeclarativeDebugWatch*>::iterator watchIter = watched.begin();
for (; watchIter != watched.end(); ++watchIter) {
watchIter.value()->m_client = 0;
watchIter.value()->setState(QDeclarativeDebugWatch::Dead);
}
delete client;
QHash<int, QDeclarativeDebugEnginesQuery*>::iterator enginesIter = enginesQuery.begin();
for (; enginesIter != enginesQuery.end(); ++enginesIter) {
enginesIter.value()->m_client = 0;
if (enginesIter.value()->state() == QDeclarativeDebugQuery::Waiting)
enginesIter.value()->setState(QDeclarativeDebugQuery::Error);
}
QHash<int, QDeclarativeDebugRootContextQuery*>::iterator rootContextIter = rootContextQuery.begin();
for (; rootContextIter != rootContextQuery.end(); ++rootContextIter) {
rootContextIter.value()->m_client = 0;
if (rootContextIter.value()->state() == QDeclarativeDebugQuery::Waiting)
rootContextIter.value()->setState(QDeclarativeDebugQuery::Error);
}
QHash<int, QDeclarativeDebugObjectQuery*>::iterator objectIter = objectQuery.begin();
for (; objectIter != objectQuery.end(); ++objectIter) {
objectIter.value()->m_client = 0;
if (objectIter.value()->state() == QDeclarativeDebugQuery::Waiting)
objectIter.value()->setState(QDeclarativeDebugQuery::Error);
}
QHash<int, QDeclarativeDebugExpressionQuery*>::iterator exprIter = expressionQuery.begin();
for (; exprIter != expressionQuery.end(); ++exprIter) {
exprIter.value()->m_client = 0;
if (exprIter.value()->state() == QDeclarativeDebugQuery::Waiting)
exprIter.value()->setState(QDeclarativeDebugQuery::Error);
}
QHash<int, QDeclarativeDebugWatch*>::iterator watchIter = watched.begin();
for (; watchIter != watched.end(); ++watchIter) {
watchIter.value()->m_client = 0;
watchIter.value()->setState(QDeclarativeDebugWatch::Dead);
}
}
int QDeclarativeEngineDebugPrivate::getId()
......@@ -164,7 +164,7 @@ void QDeclarativeEngineDebugPrivate::remove(QDeclarativeEngineDebug *c, QDeclara
}
void QDeclarativeEngineDebugPrivate::remove(QDeclarativeEngineDebug *c,
QDeclarativeDebugRootContextQuery *q)
QDeclarativeDebugRootContextQuery *q)
{
if (c && q) {
QDeclarativeEngineDebugPrivate *p = c->d_func();
......@@ -195,7 +195,7 @@ struct QDeclarativeObjectData {
QDataStream &operator>>(QDataStream &ds, QDeclarativeObjectData &data)
{
ds >> data.url >> data.lineNumber >> data.columnNumber >> data.idString
>> data.objectName >> data.objectType >> data.objectId >> data.contextId;
>> data.objectName >> data.objectType >> data.objectId >> data.contextId;
return ds;
}
......@@ -235,7 +235,7 @@ void QDeclarativeEngineDebugPrivate::remove(QDeclarativeEngineDebug *c, QDeclara
}
void QDeclarativeEngineDebugPrivate::decode(QDataStream &ds, QDeclarativeDebugObjectReference &o,
bool simple)
bool simple)
{
QDeclarativeObjectData data;
ds >> data;
......@@ -273,22 +273,22 @@ void QDeclarativeEngineDebugPrivate::decode(QDataStream &ds, QDeclarativeDebugOb
prop.m_hasNotifySignal = data.hasNotifySignal;
prop.m_valueTypeName = data.valueTypeName;
switch (data.type) {
case QDeclarativeObjectProperty::Basic:
case QDeclarativeObjectProperty::List:
case QDeclarativeObjectProperty::SignalProperty:
{
prop.m_value = data.value;
break;
}
case QDeclarativeObjectProperty::Object:
{
QDeclarativeDebugObjectReference obj;
obj.m_debugId = prop.m_value.toInt();
prop.m_value = qVariantFromValue(obj);
break;
}
case QDeclarativeObjectProperty::Unknown:
break;
case QDeclarativeObjectProperty::Basic:
case QDeclarativeObjectProperty::List:
case QDeclarativeObjectProperty::SignalProperty:
{
prop.m_value = data.value;
break;
}
case QDeclarativeObjectProperty::Object:
{
QDeclarativeDebugObjectReference obj;
obj.m_debugId = prop.m_value.toInt();
prop.m_value = qVariantFromValue(obj);
break;
}
case QDeclarativeObjectProperty::Unknown:
break;
}
o.m_properties << prop;
}
......@@ -362,7 +362,7 @@ void QDeclarativeEngineDebugPrivate::message(const QByteArray &data)
return;
rootContextQuery.remove(queryId);
if (!ds.atEnd())
if (!ds.atEnd())
decode(ds, query->m_context);
query->m_client = 0;
......@@ -441,7 +441,7 @@ void QDeclarativeEngineDebugPrivate::message(const QByteArray &data)
}
QDeclarativeEngineDebug::QDeclarativeEngineDebug(QDeclarativeDebugConnection *client, QObject *parent)
: QObject(parent), d_ptr(new QDeclarativeEngineDebugPrivate(this, client))
: QObject(parent), d_ptr(new QDeclarativeEngineDebugPrivate(this, client))
{
}
......@@ -612,7 +612,7 @@ QDeclarativeDebugObjectQuery *QDeclarativeEngineDebug::queryObject(const QDeclar
QByteArray message;
QDataStream ds(&message, QIODevice::WriteOnly);
ds << QByteArray("FETCH_OBJECT") << queryId << object.debugId()
ds << QByteArray("FETCH_OBJECT") << queryId << object.debugId()
<< false << true;
d->client->sendMessage(message);
} else {
......@@ -635,7 +635,7 @@ QDeclarativeDebugObjectQuery *QDeclarativeEngineDebug::queryObjectRecursive(cons
QByteArray message;
QDataStream ds(&message, QIODevice::WriteOnly);
ds << QByteArray("FETCH_OBJECT") << queryId << object.debugId()
ds << QByteArray("FETCH_OBJECT") << queryId << object.debugId()
<< true << true;
d->client->sendMessage(message);
} else {
......@@ -718,7 +718,7 @@ bool QDeclarativeEngineDebug::setMethodBody(int objectDebugId, const QString &me
}
QDeclarativeDebugWatch::QDeclarativeDebugWatch(QObject *parent)
: QObject(parent), m_state(Waiting), m_queryId(-1), m_client(0), m_objectDebugId(-1)
: QObject(parent), m_state(Waiting), m_queryId(-1), m_client(0), m_objectDebugId(-1)
{
}
......@@ -774,7 +774,7 @@ QString QDeclarativeDebugObjectExpressionWatch::expression() const
QDeclarativeDebugQuery::QDeclarativeDebugQuery(QObject *parent)
: QObject(parent), m_state(Waiting)
: QObject(parent), m_state(Waiting)
{
}
......@@ -797,13 +797,13 @@ void QDeclarativeDebugQuery::setState(State s)
}
QDeclarativeDebugEnginesQuery::QDeclarativeDebugEnginesQuery(QObject *parent)
: QDeclarativeDebugQuery(parent), m_client(0), m_queryId(-1)
: QDeclarativeDebugQuery(parent), m_client(0), m_queryId(-1)
{
}
QDeclarativeDebugEnginesQuery::~QDeclarativeDebugEnginesQuery()
{
if (m_client && m_queryId != -1)
if (m_client && m_queryId != -1)
QDeclarativeEngineDebugPrivate::remove(m_client, this);
}
......@@ -813,13 +813,13 @@ QList<QDeclarativeDebugEngineReference> QDeclarativeDebugEnginesQuery::engines()
}
QDeclarativeDebugRootContextQuery::QDeclarativeDebugRootContextQuery(QObject *parent)
: QDeclarativeDebugQuery(parent), m_client(0), m_queryId(-1)
: QDeclarativeDebugQuery(parent), m_client(0), m_queryId(-1)
{
}
QDeclarativeDebugRootContextQuery::~QDeclarativeDebugRootContextQuery()
{
if (m_client && m_queryId != -1)
if (m_client && m_queryId != -1)
QDeclarativeEngineDebugPrivate::remove(m_client, this);
}
......@@ -829,13 +829,13 @@ QDeclarativeDebugContextReference QDeclarativeDebugRootContextQuery::rootContext
}
QDeclarativeDebugObjectQuery::QDeclarativeDebugObjectQuery(QObject *parent)
: QDeclarativeDebugQuery(parent), m_client(0), m_queryId(-1)
: QDeclarativeDebugQuery(parent), m_client(0), m_queryId(-1)
{
}
QDeclarativeDebugObjectQuery::~QDeclarativeDebugObjectQuery()
{
if (m_client && m_queryId != -1)
if (m_client && m_queryId != -1)
QDeclarativeEngineDebugPrivate::remove(m_client, this);
}
......@@ -845,13 +845,13 @@ QDeclarativeDebugObjectReference QDeclarativeDebugObjectQuery::object() const
}
QDeclarativeDebugExpressionQuery::QDeclarativeDebugExpressionQuery(QObject *parent)
: QDeclarativeDebugQuery(parent), m_client(0), m_queryId(-1)
: QDeclarativeDebugQuery(parent), m_client(0), m_queryId(-1)
{
}
QDeclarativeDebugExpressionQuery::~QDeclarativeDebugExpressionQuery()
{
if (m_client && m_queryId != -1)
if (m_client && m_queryId != -1)
QDeclarativeEngineDebugPrivate::remove(m_client, this);
}
......@@ -866,17 +866,17 @@ QVariant QDeclarativeDebugExpressionQuery::result() const
}
QDeclarativeDebugEngineReference::QDeclarativeDebugEngineReference()
: m_debugId(-1)
: m_debugId(-1)
{
}
QDeclarativeDebugEngineReference::QDeclarativeDebugEngineReference(int debugId)
: m_debugId(debugId)
: m_debugId(debugId)
{
}
QDeclarativeDebugEngineReference::QDeclarativeDebugEngineReference(const QDeclarativeDebugEngineReference &o)
: m_debugId(o.m_debugId), m_name(o.m_name)
: m_debugId(o.m_debugId), m_name(o.m_name)
{
}
......@@ -898,19 +898,19 @@ QString QDeclarativeDebugEngineReference::name() const
}
QDeclarativeDebugObjectReference::QDeclarativeDebugObjectReference()
: m_debugId(-1), m_contextDebugId(-1)
: m_debugId(-1), m_contextDebugId(-1)
{
}
QDeclarativeDebugObjectReference::QDeclarativeDebugObjectReference(int debugId)
: m_debugId(debugId), m_contextDebugId(-1)
: m_debugId(debugId), m_contextDebugId(-1)
{
}
QDeclarativeDebugObjectReference::QDeclarativeDebugObjectReference(const QDeclarativeDebugObjectReference &o)
: m_debugId(o.m_debugId), m_class(o.m_class), m_idString(o.m_idString),
m_name(o.m_name), m_source(o.m_source), m_contextDebugId(o.m_contextDebugId),
m_properties(o.m_properties), m_children(o.m_children)
: m_debugId(o.m_debugId), m_class(o.m_class), m_idString(o.m_idString),
m_name(o.m_name), m_source(o.m_source), m_contextDebugId(o.m_contextDebugId),
m_properties(o.m_properties), m_children(o.m_children)
{
}
......@@ -964,18 +964,18 @@ QList<QDeclarativeDebugObjectReference> QDeclarativeDebugObjectReference::childr
}
QDeclarativeDebugContextReference::QDeclarativeDebugContextReference()
: m_debugId(-1)
: m_debugId(-1)
{
}
QDeclarativeDebugContextReference::QDeclarativeDebugContextReference(const QDeclarativeDebugContextReference &o)
: m_debugId(o.m_debugId), m_name(o.m_name), m_objects(o.m_objects), m_contexts(o.m_contexts)
: m_debugId(o.m_debugId), m_name(o.m_name), m_objects(o.m_objects), m_contexts(o.m_contexts)
{
}
QDeclarativeDebugContextReference &QDeclarativeDebugContextReference::operator=(const QDeclarativeDebugContextReference &o)
{
m_debugId = o.m_debugId; m_name = o.m_name; m_objects = o.m_objects;
m_debugId = o.m_debugId; m_name = o.m_name; m_objects = o.m_objects;
m_contexts = o.m_contexts;
return *this;
}
......@@ -1001,12 +1001,12 @@ QList<QDeclarativeDebugContextReference> QDeclarativeDebugContextReference::cont
}
QDeclarativeDebugFileReference::QDeclarativeDebugFileReference()
: m_lineNumber(-1), m_columnNumber(-1)
: m_lineNumber(-1), m_columnNumber(-1)
{
}
QDeclarativeDebugFileReference::QDeclarativeDebugFileReference(const QDeclarativeDebugFileReference &o)
: m_url(o.m_url), m_lineNumber(o.m_lineNumber), m_columnNumber(o.m_columnNumber)
: m_url(o.m_url), m_lineNumber(o.m_lineNumber), m_columnNumber(o.m_columnNumber)
{
}
......@@ -1047,14 +1047,14 @@ void QDeclarativeDebugFileReference::setColumnNumber(int c)
}
QDeclarativeDebugPropertyReference::QDeclarativeDebugPropertyReference()
: m_objectDebugId(-1), m_hasNotifySignal(false)
: m_objectDebugId(-1), m_hasNotifySignal(false)
{
}
QDeclarativeDebugPropertyReference::QDeclarativeDebugPropertyReference(const QDeclarativeDebugPropertyReference &o)
: m_objectDebugId(o.m_objectDebugId), m_name(o.m_name), m_value(o.m_value),
m_valueTypeName(o.m_valueTypeName), m_binding(o.m_binding),
m_hasNotifySignal(o.m_hasNotifySignal)
: m_objectDebugId(o.m_objectDebugId), m_name(o.m_name), m_value(o.m_value),
m_valueTypeName(o.m_valueTypeName), m_binding(o.m_binding),
m_hasNotifySignal(o.m_hasNotifySignal)
{
}
......@@ -1096,4 +1096,4 @@ bool QDeclarativeDebugPropertyReference::hasNotifySignal() const
return m_hasNotifySignal;
}
}
} // namespace QmlJsDebugClient
......@@ -36,8 +36,6 @@
#include <QtCore/qurl.h>
#include <QtCore/qvariant.h>
QT_BEGIN_HEADER
namespace QmlJsDebugClient {
class QDeclarativeDebugConnection;
......@@ -57,7 +55,7 @@ class QDeclarativeEngineDebugPrivate;
class QDeclarativeEngineDebug : public QObject
{
Q_OBJECT
Q_OBJECT
public:
enum Status { NotConnected, Unavailable, Enabled };
......@@ -67,28 +65,28 @@ public:
Status status() const;
QDeclarativeDebugPropertyWatch *addWatch(const QDeclarativeDebugPropertyReference &,
QObject *parent = 0);
QObject *parent = 0);
QDeclarativeDebugWatch *addWatch(const QDeclarativeDebugContextReference &, const QString &,
QObject *parent = 0);
QObject *parent = 0);
QDeclarativeDebugObjectExpressionWatch *addWatch(const QDeclarativeDebugObjectReference &, const QString &,
QObject *parent = 0);
QObject *parent = 0);
QDeclarativeDebugWatch *addWatch(const QDeclarativeDebugObjectReference &,
QObject *parent = 0);
QObject *parent = 0);
QDeclarativeDebugWatch *addWatch(const QDeclarativeDebugFileReference &,
QObject *parent = 0);
QObject *parent = 0);
void removeWatch(QDeclarativeDebugWatch *watch);
QDeclarativeDebugEnginesQuery *queryAvailableEngines(QObject *parent = 0);
QDeclarativeDebugRootContextQuery *queryRootContexts(const QDeclarativeDebugEngineReference &,
QObject *parent = 0);
QDeclarativeDebugObjectQuery *queryObject(const QDeclarativeDebugObjectReference &,
QObject *parent = 0);
QDeclarativeDebugObjectQuery *queryObjectRecursive(const QDeclarativeDebugObjectReference &,
QObject *parent = 0);
QDeclarativeDebugObjectQuery *queryObject(const QDeclarativeDebugObjectReference &,
QObject *parent = 0);
QDeclarativeDebugExpressionQuery *queryExpressionResult(int objectDebugId,
const QString &expr,
QObject *parent = 0);
QDeclarativeDebugObjectQuery *queryObjectRecursive(const QDeclarativeDebugObjectReference &,
QObject *parent = 0);
QDeclarativeDebugExpressionQuery *queryExpressionResult(int objectDebugId,
const QString &expr,
QObject *parent = 0);
bool setBindingForObject(int objectDebugId, const QString &propertyName,
const QVariant &bindingExpression, bool isLiteralValue,
QString source = QString(), int line = -1);
......@@ -106,7 +104,7 @@ private:
class QDeclarativeDebugWatch : public QObject
{
Q_OBJECT
Q_OBJECT
public:
enum State { Waiting, Active, Inactive, Dead };
......@@ -164,15 +162,13 @@ private:
class QDeclarativeDebugQuery : public QObject
{
Q_OBJECT
Q_OBJECT
public:
enum State { Waiting, Error, Completed };
State state() const;
bool isWaiting() const;
// bool waitUntilCompleted();
Q_SIGNALS:
void stateChanged(QDeclarativeDebugQuery::State);
......@@ -303,7 +299,7 @@ private: