aboutsummaryrefslogtreecommitdiffstats
path: root/src/declarative/debugger/qdeclarativedebugclient.cpp
diff options
context:
space:
mode:
authorKai Koehne <kai.koehne@nokia.com>2012-02-02 11:18:08 +0100
committerQt by Nokia <qt-info@nokia.com>2012-02-10 11:49:38 +0100
commit9daf11cede6a13fb95f202b2bdee7966a502d3f7 (patch)
treeae09d426af7edb1e998eeb45f1afb7a644a19800 /src/declarative/debugger/qdeclarativedebugclient.cpp
parente761f5b906c427433325debb9f08c4f2d0ba902d (diff)
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>
Diffstat (limited to 'src/declarative/debugger/qdeclarativedebugclient.cpp')
-rw-r--r--src/declarative/debugger/qdeclarativedebugclient.cpp22
1 files changed, 11 insertions, 11 deletions
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)
{
}