Debugger: Consistenly use 'state' instead of 'status'

Fix inconsistent naming e.g. in QtDeclarativeEngineDebug by always
using 'state' instead of 'status'. This is in line with the other
source code, which also seems to favor 'state'.

Change-Id: I65a7a3bd0eb7dfffeb37b5f8dad15b0a4a78de70
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>

18 files changed, 101 insertions, 101 deletions

diff --git a/src/declarative/debugger/qdebugmessageservice.cpp b/src/declarative/debugger/qdebugmessageservice.cpp
index 10a4a718c2..e7c4901a48 100644
--- a/src/declarative/debugger/qdebugmessageservice.cpp
+++ b/src/declarative/debugger/qdebugmessageservice.cpp
@@ -56,12 +56,12 @@ class QDebugMessageServicePrivate : public QDeclarativeDebugServicePrivate
 public:
     QDebugMessageServicePrivate()
         : oldMsgHandler(0)
-        , prevStatus(QDeclarativeDebugService::NotConnected)
+        , prevState(QDeclarativeDebugService::NotConnected)
     {
     }
 
     QtMsgHandler oldMsgHandler;
-    QDeclarativeDebugService::Status prevStatus;
+    QDeclarativeDebugService::State prevState;
 };
 
 QDebugMessageService::QDebugMessageService(QObject *parent) :
@@ -71,9 +71,9 @@ QDebugMessageService::QDebugMessageService(QObject *parent) :
     Q_D(QDebugMessageService);
 
     registerService();
-    if (status() == Enabled) {
+    if (state() == Enabled) {
         d->oldMsgHandler = qInstallMsgHandler(DebugMessageHandler);
-        d->prevStatus = Enabled;
+        d->prevState = Enabled;
     }
 }
 
@@ -98,22 +98,22 @@ void QDebugMessageService::sendDebugMessage(QtMsgType type, const char *buf)
         (*d->oldMsgHandler)(type, buf);
 }
 
-void QDebugMessageService::statusChanged(Status status)
+void QDebugMessageService::stateChanged(State state)
 {
     Q_D(QDebugMessageService);
 
-    if (status != Enabled && d->prevStatus == Enabled) {
+    if (state != Enabled && d->prevState == Enabled) {
         QtMsgHandler handler = qInstallMsgHandler(d->oldMsgHandler);
         // has our handler been overwritten in between?
         if (handler != DebugMessageHandler)
             qInstallMsgHandler(handler);
 
-    } else if (status == Enabled && d->prevStatus != Enabled) {
+    } else if (state == Enabled && d->prevState != Enabled) {
         d->oldMsgHandler = qInstallMsgHandler(DebugMessageHandler);
 
     }
 
-    d->prevStatus = status;
+    d->prevState = state;
 }
 
 QT_END_NAMESPACE
diff --git a/src/declarative/debugger/qdebugmessageservice_p.h b/src/declarative/debugger/qdebugmessageservice_p.h
index 4f25c7b673..bf0e17c2fe 100644
--- a/src/declarative/debugger/qdebugmessageservice_p.h
+++ b/src/declarative/debugger/qdebugmessageservice_p.h
@@ -74,7 +74,7 @@ public:
     void sendDebugMessage(QtMsgType type, const char *buf);
 
 protected:
-    void statusChanged(Status);
+    void stateChanged(State);
 
 private:
     Q_DISABLE_COPY(QDebugMessageService)
diff --git a/src/declarative/debugger/qdeclarativedebugclient.cpp b/src/declarative/debugger/qdeclarativedebugclient.cpp
index a3e0c83849..df250f3ef6 100644
--- a/src/declarative/debugger/qdeclarativedebugclient.cpp
+++ b/src/declarative/debugger/qdeclarativedebugclient.cpp
@@ -159,10 +159,10 @@ void QDeclarativeDebugConnectionPrivate::readyRead()
 
         QHash<QString, QDeclarativeDebugClient *>::Iterator iter = plugins.begin();
         for (; iter != plugins.end(); ++iter) {
-            QDeclarativeDebugClient::Status newStatus = QDeclarativeDebugClient::Unavailable;
+            QDeclarativeDebugClient::State newState = QDeclarativeDebugClient::Unavailable;
             if (serverPlugins.contains(iter.key()))
-                newStatus = QDeclarativeDebugClient::Enabled;
-            iter.value()->statusChanged(newStatus);
+                newState = QDeclarativeDebugClient::Enabled;
+            iter.value()->stateChanged(newState);
         }
     }
 
@@ -198,13 +198,13 @@ void QDeclarativeDebugConnectionPrivate::readyRead()
                 QHash<QString, QDeclarativeDebugClient *>::Iterator iter = plugins.begin();
                 for (; iter != plugins.end(); ++iter) {
                     const QString pluginName = iter.key();
-                    QDeclarativeDebugClient::Status newStatus = QDeclarativeDebugClient::Unavailable;
+                    QDeclarativeDebugClient::State newSate = QDeclarativeDebugClient::Unavailable;
                     if (serverPlugins.contains(pluginName))
-                        newStatus = QDeclarativeDebugClient::Enabled;
+                        newSate = QDeclarativeDebugClient::Enabled;
 
                     if (oldServerPlugins.contains(pluginName)
                             != serverPlugins.contains(pluginName)) {
-                        iter.value()->statusChanged(newStatus);
+                        iter.value()->stateChanged(newSate);
                     }
                 }
             } else {
@@ -242,7 +242,7 @@ 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()->stateChanged(QDeclarativeDebugClient::NotConnected);
     }
 }
 
@@ -280,7 +280,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()->stateChanged(QDeclarativeDebugClient::NotConnected);
         }
     }
 }
@@ -382,7 +382,7 @@ float QDeclarativeDebugClient::serviceVersion() const
     return -1;
 }
 
-QDeclarativeDebugClient::Status QDeclarativeDebugClient::status() const
+QDeclarativeDebugClient::State QDeclarativeDebugClient::state() const
 {
     Q_D(const QDeclarativeDebugClient);
     if (!d->connection
@@ -399,7 +399,7 @@ QDeclarativeDebugClient::Status QDeclarativeDebugClient::status() const
 void QDeclarativeDebugClient::sendMessage(const QByteArray &message)
 {
     Q_D(QDeclarativeDebugClient);
-    if (status() != Enabled)
+    if (state() != Enabled)
         return;
 
     QPacket pack;
@@ -408,7 +408,7 @@ void QDeclarativeDebugClient::sendMessage(const QByteArray &message)
     d->connection->flush();
 }
 
-void QDeclarativeDebugClient::statusChanged(Status)
+void QDeclarativeDebugClient::stateChanged(State)
 {
 }
 
diff --git a/src/declarative/debugger/qdeclarativedebugclient_p.h b/src/declarative/debugger/qdeclarativedebugclient_p.h
index ff4f88f408..93c5be9e44 100644
--- a/src/declarative/debugger/qdeclarativedebugclient_p.h
+++ b/src/declarative/debugger/qdeclarativedebugclient_p.h
@@ -104,19 +104,19 @@ class Q_DECLARATIVE_PRIVATE_EXPORT QDeclarativeDebugClient : public QObject
     Q_DISABLE_COPY(QDeclarativeDebugClient)
 
 public:
-    enum Status { NotConnected, Unavailable, Enabled };
+    enum State { NotConnected, Unavailable, Enabled };
 
     QDeclarativeDebugClient(const QString &, QDeclarativeDebugConnection *parent);
     ~QDeclarativeDebugClient();
 
     QString name() const;
     float serviceVersion() const;
-    Status status() const;
+    State state() const;
 
     virtual void sendMessage(const QByteArray &);
 
 protected:
-    virtual void statusChanged(Status);
+    virtual void stateChanged(State);
     virtual void messageReceived(const QByteArray &);
 
 private:
diff --git a/src/declarative/debugger/qdeclarativedebugserver.cpp b/src/declarative/debugger/qdeclarativedebugserver.cpp
index d4c203f1f7..482847c7a7 100644
--- a/src/declarative/debugger/qdeclarativedebugserver.cpp
+++ b/src/declarative/debugger/qdeclarativedebugserver.cpp
@@ -329,10 +329,10 @@ QDeclarativeDebugServer::~QDeclarativeDebugServer()
     QReadLocker(&d->pluginsLock);
     {
         foreach (QDeclarativeDebugService *service, d->plugins.values()) {
-            service->statusAboutToBeChanged(QDeclarativeDebugService::NotConnected);
+            service->stateAboutToBeChanged(QDeclarativeDebugService::NotConnected);
             service->d_func()->server = 0;
-            service->d_func()->status = QDeclarativeDebugService::NotConnected;
-            service->statusChanged(QDeclarativeDebugService::NotConnected);
+            service->d_func()->state = QDeclarativeDebugService::NotConnected;
+            service->stateChanged(QDeclarativeDebugService::NotConnected);
         }
     }
 
@@ -381,11 +381,11 @@ void QDeclarativeDebugServer::receiveMessage(const QByteArray &message)
             QReadLocker(&d->pluginsLock);
             QHash<QString, QDeclarativeDebugService*>::ConstIterator iter = d->plugins.constBegin();
             for (; iter != d->plugins.constEnd(); ++iter) {
-                QDeclarativeDebugService::Status newStatus = QDeclarativeDebugService::Unavailable;
+                QDeclarativeDebugService::State newState = QDeclarativeDebugService::Unavailable;
                 if (d->clientPlugins.contains(iter.key()))
-                    newStatus = QDeclarativeDebugService::Enabled;
-                iter.value()->d_func()->status = newStatus;
-                iter.value()->statusChanged(newStatus);
+                    newState = QDeclarativeDebugService::Enabled;
+                iter.value()->d_func()->state = newState;
+                iter.value()->stateChanged(newState);
             }
 
             qWarning("QDeclarativeDebugServer: Connection established");
@@ -401,14 +401,14 @@ void QDeclarativeDebugServer::receiveMessage(const QByteArray &message)
             QHash<QString, QDeclarativeDebugService*>::ConstIterator iter = d->plugins.constBegin();
             for (; iter != d->plugins.constEnd(); ++iter) {
                 const QString pluginName = iter.key();
-                QDeclarativeDebugService::Status newStatus = QDeclarativeDebugService::Unavailable;
+                QDeclarativeDebugService::State newState = QDeclarativeDebugService::Unavailable;
                 if (d->clientPlugins.contains(pluginName))
-                    newStatus = QDeclarativeDebugService::Enabled;
+                    newState = QDeclarativeDebugService::Enabled;
 
                 if (oldClientPlugins.contains(pluginName)
                         != d->clientPlugins.contains(pluginName)) {
-                    iter.value()->d_func()->status = newStatus;
-                    iter.value()->statusChanged(newStatus);
+                    iter.value()->d_func()->state = newState;
+                    iter.value()->stateChanged(newState);
                 }
             }
 
@@ -472,10 +472,10 @@ bool QDeclarativeDebugServer::addService(QDeclarativeDebugService *service)
     {
         QReadLocker(&d->pluginsLock);
         d->advertisePlugins();
-        QDeclarativeDebugService::Status newStatus = QDeclarativeDebugService::Unavailable;
+        QDeclarativeDebugService::State newState = QDeclarativeDebugService::Unavailable;
         if (d->clientPlugins.contains(service->name()))
-            newStatus = QDeclarativeDebugService::Enabled;
-        service->d_func()->status = newStatus;
+            newState = QDeclarativeDebugService::Enabled;
+        service->d_func()->state = newState;
     }
     return true;
 }
@@ -491,12 +491,12 @@ bool QDeclarativeDebugServer::removeService(QDeclarativeDebugService *service)
     }
     {
         QReadLocker(&d->pluginsLock);
-        QDeclarativeDebugService::Status newStatus = QDeclarativeDebugService::NotConnected;
-        service->statusAboutToBeChanged(newStatus);
+        QDeclarativeDebugService::State newState = QDeclarativeDebugService::NotConnected;
+        service->stateAboutToBeChanged(newState);
         d->advertisePlugins();
         service->d_func()->server = 0;
-        service->d_func()->status = newStatus;
-        service->statusChanged(newStatus);
+        service->d_func()->state = newState;
+        service->stateChanged(newState);
     }
 
     return true;
diff --git a/src/declarative/debugger/qdeclarativedebugservice.cpp b/src/declarative/debugger/qdeclarativedebugservice.cpp
index 98d95d7b34..96344d7717 100644
--- a/src/declarative/debugger/qdeclarativedebugservice.cpp
+++ b/src/declarative/debugger/qdeclarativedebugservice.cpp
@@ -60,7 +60,7 @@ QDeclarativeDebugService::QDeclarativeDebugService(const QString &name, float ve
     d->name = name;
     d->version = version;
     d->server = QDeclarativeDebugServer::instance();
-    d->status = QDeclarativeDebugService::NotConnected;
+    d->state = QDeclarativeDebugService::NotConnected;
 
 
 }
@@ -73,14 +73,14 @@ QDeclarativeDebugService::QDeclarativeDebugService(QDeclarativeDebugServicePriva
     d->name = name;
     d->version = version;
     d->server = QDeclarativeDebugServer::instance();
-    d->status = QDeclarativeDebugService::NotConnected;
+    d->state = QDeclarativeDebugService::NotConnected;
 }
 
 /**
   Registers the service. This should be called in the constructor of the inherited class. From
   then on the service might get asynchronous calls to messageReceived().
   */
-QDeclarativeDebugService::Status QDeclarativeDebugService::registerService()
+QDeclarativeDebugService::State QDeclarativeDebugService::registerService()
 {
     Q_D(QDeclarativeDebugService);
     if (!d->server)
@@ -92,7 +92,7 @@ QDeclarativeDebugService::Status QDeclarativeDebugService::registerService()
     } else {
         d->server->addService(this);
     }
-    return status();
+    return state();
 }
 
 QDeclarativeDebugService::~QDeclarativeDebugService()
@@ -115,10 +115,10 @@ float QDeclarativeDebugService::version() const
     return d->version;
 }
 
-QDeclarativeDebugService::Status QDeclarativeDebugService::status() const
+QDeclarativeDebugService::State QDeclarativeDebugService::state() const
 {
     Q_D(const QDeclarativeDebugService);
-    return d->status;
+    return d->state;
 }
 
 namespace {
@@ -237,7 +237,7 @@ void QDeclarativeDebugService::sendMessages(const QList<QByteArray> &messages)
 {
     Q_D(QDeclarativeDebugService);
 
-    if (status() != Enabled)
+    if (state() != Enabled)
         return;
 
     d->server->sendMessages(this, messages);
@@ -247,17 +247,17 @@ bool QDeclarativeDebugService::waitForMessage()
 {
     Q_D(QDeclarativeDebugService);
 
-    if (status() != Enabled)
+    if (state() != Enabled)
         return false;
 
     return d->server->waitForMessage(this);
 }
 
-void QDeclarativeDebugService::statusAboutToBeChanged(Status)
+void QDeclarativeDebugService::stateAboutToBeChanged(State)
 {
 }
 
-void QDeclarativeDebugService::statusChanged(Status)
+void QDeclarativeDebugService::stateChanged(State)
 {
 }
 
diff --git a/src/declarative/debugger/qdeclarativedebugservice_p.h b/src/declarative/debugger/qdeclarativedebugservice_p.h
index 7cce2ba86b..203e27ad09 100644
--- a/src/declarative/debugger/qdeclarativedebugservice_p.h
+++ b/src/declarative/debugger/qdeclarativedebugservice_p.h
@@ -76,8 +76,8 @@ public:
     QString name() const;
     float version() const;
 
-    enum Status { NotConnected, Unavailable, Enabled };
-    Status status() const;
+    enum State { NotConnected, Unavailable, Enabled };
+    State state() const;
 
     void sendMessage(const QByteArray &);
     void sendMessages(const QList<QByteArray> &);
@@ -94,10 +94,10 @@ public:
 protected:
     QDeclarativeDebugService(QDeclarativeDebugServicePrivate &dd, const QString &name, float version, QObject *parent = 0);
 
-    Status registerService();
+    State registerService();
 
-    virtual void statusAboutToBeChanged(Status);
-    virtual void statusChanged(Status);
+    virtual void stateAboutToBeChanged(State);
+    virtual void stateChanged(State);
     virtual void messageReceived(const QByteArray &);
 
 private:
diff --git a/src/declarative/debugger/qdeclarativedebugservice_p_p.h b/src/declarative/debugger/qdeclarativedebugservice_p_p.h
index 868f6ca7cf..6638ccbec7 100644
--- a/src/declarative/debugger/qdeclarativedebugservice_p_p.h
+++ b/src/declarative/debugger/qdeclarativedebugservice_p_p.h
@@ -72,7 +72,7 @@ public:
     QString name;
     float version;
     QDeclarativeDebugServer *server;
-    QDeclarativeDebugService::Status status;
+    QDeclarativeDebugService::State state;
 };
 
 QT_END_NAMESPACE
diff --git a/src/declarative/debugger/qdeclarativedebugtrace.cpp b/src/declarative/debugger/qdeclarativedebugtrace.cpp
index 5f8a61cc3b..3c718604d8 100644
--- a/src/declarative/debugger/qdeclarativedebugtrace.cpp
+++ b/src/declarative/debugger/qdeclarativedebugtrace.cpp
@@ -310,12 +310,12 @@ void QDeclarativeDebugTrace::sendMessages()
     QDeclarativeDebugService::sendMessages(messages);
 }
 
-void QDeclarativeDebugTrace::statusAboutToBeChanged(QDeclarativeDebugService::Status newStatus)
+void QDeclarativeDebugTrace::stateAboutToBeChanged(QDeclarativeDebugService::State newState)
 {
-    if (status() == newStatus)
+    if (state() == newState)
         return;
 
-    if (status() == Enabled
+    if (state() == Enabled
             && m_enabled) {
         stopProfilingImpl();
         sendMessages();
diff --git a/src/declarative/debugger/qdeclarativedebugtrace_p.h b/src/declarative/debugger/qdeclarativedebugtrace_p.h
index 0701f35617..7e2db4dbad 100644
--- a/src/declarative/debugger/qdeclarativedebugtrace_p.h
+++ b/src/declarative/debugger/qdeclarativedebugtrace_p.h
@@ -145,7 +145,7 @@ public:
     ~QDeclarativeDebugTrace();
 
 protected:
-    virtual void statusAboutToBeChanged(Status status);
+    virtual void stateAboutToBeChanged(State state);
     virtual void messageReceived(const QByteArray &);
 
 private:
diff --git a/src/declarative/debugger/qdeclarativeenginedebug.cpp b/src/declarative/debugger/qdeclarativeenginedebug.cpp
index c6f09f193d..462f99937e 100644
--- a/src/declarative/debugger/qdeclarativeenginedebug.cpp
+++ b/src/declarative/debugger/qdeclarativeenginedebug.cpp
@@ -55,7 +55,7 @@ public:
     QDeclarativeEngineDebugClient(QDeclarativeDebugConnection *client, QDeclarativeEngineDebugPrivate *p);
 
 protected:
-    virtual void statusChanged(Status status);
+    virtual void stateChanged(State state);
     virtual void messageReceived(const QByteArray &);
 
 private:
@@ -70,7 +70,7 @@ public:
     QDeclarativeEngineDebugPrivate(QDeclarativeDebugConnection *);
     ~QDeclarativeEngineDebugPrivate();
 
-    void statusChanged(QDeclarativeEngineDebug::Status status);
+    void stateChanged(QDeclarativeEngineDebug::State status);
     void message(const QByteArray &);
 
     QDeclarativeEngineDebugClient *client;
@@ -100,10 +100,10 @@ QDeclarativeEngineDebugClient::QDeclarativeEngineDebugClient(QDeclarativeDebugCo
 {
 }
 
-void QDeclarativeEngineDebugClient::statusChanged(Status status)
+void QDeclarativeEngineDebugClient::stateChanged(State status)
 {
     if (priv)
-        priv->statusChanged(static_cast<QDeclarativeEngineDebug::Status>(status));
+        priv->stateChanged(static_cast<QDeclarativeEngineDebug::State>(status));
 }
 
 void QDeclarativeEngineDebugClient::messageReceived(const QByteArray &data)
@@ -288,9 +288,9 @@ void QDeclarativeEngineDebugPrivate::decode(QDataStream &ds, QDeclarativeDebugCo
     }
 }
 
-void QDeclarativeEngineDebugPrivate::statusChanged(QDeclarativeEngineDebug::Status status)
+void QDeclarativeEngineDebugPrivate::stateChanged(QDeclarativeEngineDebug::State status)
 {
-    emit q_func()->statusChanged(status);
+    emit q_func()->stateChanged(status);
 }
 
 void QDeclarativeEngineDebugPrivate::message(const QByteArray &data)
@@ -419,11 +419,11 @@ QDeclarativeEngineDebug::~QDeclarativeEngineDebug()
 {
 }
 
-QDeclarativeEngineDebug::Status QDeclarativeEngineDebug::status() const
+QDeclarativeEngineDebug::State QDeclarativeEngineDebug::state() const
 {
     Q_D(const QDeclarativeEngineDebug);
 
-    return static_cast<QDeclarativeEngineDebug::Status>(d->client->status());
+    return static_cast<QDeclarativeEngineDebug::State>(d->client->state());
 }
 
 QDeclarativeDebugPropertyWatch *QDeclarativeEngineDebug::addWatch(const QDeclarativeDebugPropertyReference &property, QObject *parent)
@@ -431,7 +431,7 @@ QDeclarativeDebugPropertyWatch *QDeclarativeEngineDebug::addWatch(const QDeclara
     Q_D(QDeclarativeEngineDebug);
 
     QDeclarativeDebugPropertyWatch *watch = new QDeclarativeDebugPropertyWatch(parent);
-    if (d->client->status() == QDeclarativeDebugClient::Enabled) {
+    if (d->client->state() == QDeclarativeDebugClient::Enabled) {
         int queryId = d->getId();
         watch->m_queryId = queryId;
         watch->m_client = this;
@@ -460,7 +460,7 @@ QDeclarativeDebugObjectExpressionWatch *QDeclarativeEngineDebug::addWatch(const
 {
     Q_D(QDeclarativeEngineDebug);
     QDeclarativeDebugObjectExpressionWatch *watch = new QDeclarativeDebugObjectExpressionWatch(parent);
-    if (d->client->status() == QDeclarativeDebugClient::Enabled) {
+    if (d->client->state() == QDeclarativeDebugClient::Enabled) {
         int queryId = d->getId();
         watch->m_queryId = queryId;
         watch->m_client = this;
@@ -483,7 +483,7 @@ QDeclarativeDebugWatch *QDeclarativeEngineDebug::addWatch(const QDeclarativeDebu
     Q_D(QDeclarativeEngineDebug);
 
     QDeclarativeDebugWatch *watch = new QDeclarativeDebugWatch(parent);
-    if (d->client->status() == QDeclarativeDebugClient::Enabled) {
+    if (d->client->state() == QDeclarativeDebugClient::Enabled) {
         int queryId = d->getId();
         watch->m_queryId = queryId;
         watch->m_client = this;
@@ -519,7 +519,7 @@ void QDeclarativeEngineDebug::removeWatch(QDeclarativeDebugWatch *watch)
     
     d->watched.remove(watch->queryId());
 
-    if (d->client && d->client->status() == QDeclarativeDebugClient::Enabled) {
+    if (d->client && d->client->state() == QDeclarativeDebugClient::Enabled) {
         QByteArray message;
         QDataStream ds(&message, QIODevice::WriteOnly);
         ds << QByteArray("NO_WATCH") << watch->queryId();
@@ -532,7 +532,7 @@ QDeclarativeDebugEnginesQuery *QDeclarativeEngineDebug::queryAvailableEngines(QO
     Q_D(QDeclarativeEngineDebug);
 
     QDeclarativeDebugEnginesQuery *query = new QDeclarativeDebugEnginesQuery(parent);
-    if (d->client->status() == QDeclarativeDebugClient::Enabled) {
+    if (d->client->state() == QDeclarativeDebugClient::Enabled) {
         query->m_client = this;
         int queryId = d->getId();
         query->m_queryId = queryId;
@@ -554,7 +554,7 @@ QDeclarativeDebugRootContextQuery *QDeclarativeEngineDebug::queryRootContexts(co
     Q_D(QDeclarativeEngineDebug);
 
     QDeclarativeDebugRootContextQuery *query = new QDeclarativeDebugRootContextQuery(parent);
-    if (d->client->status() == QDeclarativeDebugClient::Enabled && engine.debugId() != -1) {
+    if (d->client->state() == QDeclarativeDebugClient::Enabled && engine.debugId() != -1) {
         query->m_client = this;
         int queryId = d->getId();
         query->m_queryId = queryId;
@@ -576,7 +576,7 @@ QDeclarativeDebugObjectQuery *QDeclarativeEngineDebug::queryObject(const QDeclar
     Q_D(QDeclarativeEngineDebug);
 
     QDeclarativeDebugObjectQuery *query = new QDeclarativeDebugObjectQuery(parent);
-    if (d->client->status() == QDeclarativeDebugClient::Enabled && object.debugId() != -1) {
+    if (d->client->state() == QDeclarativeDebugClient::Enabled && object.debugId() != -1) {
         query->m_client = this;
         int queryId = d->getId();
         query->m_queryId = queryId;
@@ -599,7 +599,7 @@ QDeclarativeDebugObjectQuery *QDeclarativeEngineDebug::queryObjectRecursive(cons
     Q_D(QDeclarativeEngineDebug);
 
     QDeclarativeDebugObjectQuery *query = new QDeclarativeDebugObjectQuery(parent);
-    if (d->client->status() == QDeclarativeDebugClient::Enabled && object.debugId() != -1) {
+    if (d->client->state() == QDeclarativeDebugClient::Enabled && object.debugId() != -1) {
         query->m_client = this;
         int queryId = d->getId();
         query->m_queryId = queryId;
@@ -622,7 +622,7 @@ QDeclarativeDebugExpressionQuery *QDeclarativeEngineDebug::queryExpressionResult
     Q_D(QDeclarativeEngineDebug);
 
     QDeclarativeDebugExpressionQuery *query = new QDeclarativeDebugExpressionQuery(parent);
-    if (d->client->status() == QDeclarativeDebugClient::Enabled && objectDebugId != -1) {
+    if (d->client->state() == QDeclarativeDebugClient::Enabled && objectDebugId != -1) {
         query->m_client = this;
         query->m_expr = expr;
         int queryId = d->getId();
@@ -647,7 +647,7 @@ bool QDeclarativeEngineDebug::setBindingForObject(int objectDebugId, const QStri
 {
     Q_D(QDeclarativeEngineDebug);
 
-    if (d->client->status() == QDeclarativeDebugClient::Enabled && objectDebugId != -1) {
+    if (d->client->state() == QDeclarativeDebugClient::Enabled && objectDebugId != -1) {
         QByteArray message;
         QDataStream ds(&message, QIODevice::WriteOnly);
         ds << QByteArray("SET_BINDING") << objectDebugId << propertyName << bindingExpression << isLiteralValue << source << line;
@@ -662,7 +662,7 @@ bool QDeclarativeEngineDebug::resetBindingForObject(int objectDebugId, const QSt
 {
     Q_D(QDeclarativeEngineDebug);
 
-    if (d->client->status() == QDeclarativeDebugClient::Enabled && objectDebugId != -1) {
+    if (d->client->state() == QDeclarativeDebugClient::Enabled && objectDebugId != -1) {
         QByteArray message;
         QDataStream ds(&message, QIODevice::WriteOnly);
         ds << QByteArray("RESET_BINDING") << objectDebugId << propertyName;
@@ -678,7 +678,7 @@ bool QDeclarativeEngineDebug::setMethodBody(int objectDebugId, const QString &me
 {
     Q_D(QDeclarativeEngineDebug);
 
-    if (d->client->status() == QDeclarativeDebugClient::Enabled && objectDebugId != -1) {
+    if (d->client->state() == QDeclarativeDebugClient::Enabled && objectDebugId != -1) {
         QByteArray message;
         QDataStream ds(&message, QIODevice::WriteOnly);
         ds << QByteArray("SET_METHOD_BODY") << objectDebugId << methodName << methodBody;
diff --git a/src/declarative/debugger/qdeclarativeenginedebug_p.h b/src/declarative/debugger/qdeclarativeenginedebug_p.h
index 7c4a18c793..5ca2987da3 100644
--- a/src/declarative/debugger/qdeclarativeenginedebug_p.h
+++ b/src/declarative/debugger/qdeclarativeenginedebug_p.h
@@ -82,12 +82,12 @@ class Q_DECLARATIVE_PRIVATE_EXPORT QDeclarativeEngineDebug : public QObject
 {
     Q_OBJECT
 public:
-    enum Status { NotConnected, Unavailable, Enabled };
+    enum State { NotConnected, Unavailable, Enabled };
 
     explicit QDeclarativeEngineDebug(QDeclarativeDebugConnection *, QObject * = 0);
     ~QDeclarativeEngineDebug();
 
-    Status status() const;
+    State state() const;
 
     QDeclarativeDebugPropertyWatch *addWatch(const QDeclarativeDebugPropertyReference &,
                                              QObject *parent = 0);
@@ -120,7 +120,7 @@ public:
 
 Q_SIGNALS:
     void newObjects();
-    void statusChanged(Status status);
+    void stateChanged(State state);
 
 private:
     Q_DECLARE_PRIVATE(QDeclarativeEngineDebug)
diff --git a/src/declarative/debugger/qdeclarativeinspectorservice.cpp b/src/declarative/debugger/qdeclarativeinspectorservice.cpp
index e0454789c7..94b04985ba 100644
--- a/src/declarative/debugger/qdeclarativeinspectorservice.cpp
+++ b/src/declarative/debugger/qdeclarativeinspectorservice.cpp
@@ -70,29 +70,29 @@ QDeclarativeInspectorService *QDeclarativeInspectorService::instance()
 void QDeclarativeInspectorService::addView(QObject *view)
 {
     m_views.append(view);
-    updateStatus();
+    updateState();
 }
 
 void QDeclarativeInspectorService::removeView(QObject *view)
 {
     m_views.removeAll(view);
-    updateStatus();
+    updateState();
 }
 
 void QDeclarativeInspectorService::sendMessage(const QByteArray &message)
 {
-    if (status() != Enabled)
+    if (state() != Enabled)
         return;
 
     QDeclarativeDebugService::sendMessage(message);
 }
 
-void QDeclarativeInspectorService::statusChanged(Status /*status*/)
+void QDeclarativeInspectorService::stateChanged(State /*state*/)
 {
-    QMetaObject::invokeMethod(this, "updateStatus", Qt::QueuedConnection);
+    QMetaObject::invokeMethod(this, "updateState", Qt::QueuedConnection);
 }
 
-void QDeclarativeInspectorService::updateStatus()
+void QDeclarativeInspectorService::updateState()
 {
     if (m_views.isEmpty()) {
         if (m_currentInspectorPlugin) {
@@ -102,7 +102,7 @@ void QDeclarativeInspectorService::updateStatus()
         return;
     }
 
-    if (status() == Enabled) {
+    if (state() == Enabled) {
         if (m_inspectorPlugins.isEmpty())
             loadInspectorPlugins();
 
diff --git a/src/declarative/debugger/qdeclarativeinspectorservice_p.h b/src/declarative/debugger/qdeclarativeinspectorservice_p.h
index 457060dda0..7ed530adc0 100644
--- a/src/declarative/debugger/qdeclarativeinspectorservice_p.h
+++ b/src/declarative/debugger/qdeclarativeinspectorservice_p.h
@@ -79,12 +79,12 @@ public:
     void sendMessage(const QByteArray &message);
 
 protected:
-    virtual void statusChanged(Status status);
+    virtual void stateChanged(State state);
     virtual void messageReceived(const QByteArray &);
 
 private slots:
     void processMessage(const QByteArray &message);
-    void updateStatus();
+    void updateState();
 
 private:
     void loadInspectorPlugins();
diff --git a/src/declarative/debugger/qv8debugservice.cpp b/src/declarative/debugger/qv8debugservice.cpp
index bcc9296481..389c465420 100644
--- a/src/declarative/debugger/qv8debugservice.cpp
+++ b/src/declarative/debugger/qv8debugservice.cpp
@@ -124,7 +124,7 @@ QV8DebugService::QV8DebugService(QObject *parent)
 {
     Q_D(QV8DebugService);
     v8ServiceInstancePtr = this;
-    // wait for statusChanged() -> initialize()
+    // wait for stateChanged() -> initialize()
     d->initializeMutex.lock();
     if (registerService() == Enabled) {
         init();
@@ -205,10 +205,10 @@ void QV8DebugService::scheduledDebugBreak(bool schedule)
 }
 
 // executed in the debugger thread
-void QV8DebugService::statusChanged(QDeclarativeDebugService::Status newStatus)
+void QV8DebugService::stateChanged(QDeclarativeDebugService::State newState)
 {
     Q_D(QV8DebugService);
-    if (newStatus == Enabled) {
+    if (newState == Enabled) {
         // execute in GUI thread
         d->initializeMutex.lock();
         QMetaObject::invokeMethod(this, "init", Qt::QueuedConnection);
diff --git a/src/declarative/debugger/qv8debugservice_p.h b/src/declarative/debugger/qv8debugservice_p.h
index 7f67f70302..3f1d1ca177 100644
--- a/src/declarative/debugger/qv8debugservice_p.h
+++ b/src/declarative/debugger/qv8debugservice_p.h
@@ -87,7 +87,7 @@ private slots:
     void init();
 
 protected:
-    void statusChanged(Status newStatus);
+    void stateChanged(State newState);
     void messageReceived(const QByteArray &);
 
 private:
diff --git a/src/declarative/debugger/qv8profilerservice.cpp b/src/declarative/debugger/qv8profilerservice.cpp
index 743ee6ec4f..4519fd6eeb 100644
--- a/src/declarative/debugger/qv8profilerservice.cpp
+++ b/src/declarative/debugger/qv8profilerservice.cpp
@@ -127,14 +127,14 @@ void QV8ProfilerService::initialize()
     v8ProfilerInstance();
 }
 
-void QV8ProfilerService::statusAboutToBeChanged(QDeclarativeDebugService::Status newStatus)
+void QV8ProfilerService::stateAboutToBeChanged(QDeclarativeDebugService::State newState)
 {
     Q_D(QV8ProfilerService);
 
-    if (status() == newStatus)
+    if (state() == newState)
         return;
 
-    if (status() == Enabled) {
+    if (state() == Enabled) {
         foreach (const QString &title, d->m_ongoing)
             QMetaObject::invokeMethod(this, "stopProfiling", Qt::QueuedConnection, Q_ARG(QString, title));
         sendProfilingData();
diff --git a/src/declarative/debugger/qv8profilerservice_p.h b/src/declarative/debugger/qv8profilerservice_p.h
index 75589ad839..706907ae23 100644
--- a/src/declarative/debugger/qv8profilerservice_p.h
+++ b/src/declarative/debugger/qv8profilerservice_p.h
@@ -104,7 +104,7 @@ public slots:
     void sendProfilingData();
 
 protected:
-    void statusAboutToBeChanged(Status status);
+    void stateAboutToBeChanged(State state);
     void messageReceived(const QByteArray &);
 
 private: