summaryrefslogtreecommitdiffstats
path: root/tests/auto/declarative/debugger/shared
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 /tests/auto/declarative/debugger/shared
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 'tests/auto/declarative/debugger/shared')
-rw-r--r--tests/auto/declarative/debugger/shared/debugutil.cpp10
-rw-r--r--tests/auto/declarative/debugger/shared/debugutil_p.h8
2 files changed, 9 insertions, 9 deletions
diff --git a/tests/auto/declarative/debugger/shared/debugutil.cpp b/tests/auto/declarative/debugger/shared/debugutil.cpp
index 14bf68285d..fcac1bc61d 100644
--- a/tests/auto/declarative/debugger/shared/debugutil.cpp
+++ b/tests/auto/declarative/debugger/shared/debugutil.cpp
@@ -69,9 +69,9 @@ void QDeclarativeDebugTestService::messageReceived(const QByteArray &ba)
sendMessage(ba);
}
-void QDeclarativeDebugTestService::statusChanged(Status)
+void QDeclarativeDebugTestService::stateChanged(State)
{
- emit statusHasChanged();
+ emit stateHasChanged();
}
@@ -91,10 +91,10 @@ QByteArray QDeclarativeDebugTestClient::waitForResponse()
return lastMsg;
}
-void QDeclarativeDebugTestClient::statusChanged(Status stat)
+void QDeclarativeDebugTestClient::stateChanged(State stat)
{
- QCOMPARE(stat, status());
- emit statusHasChanged();
+ QCOMPARE(stat, state());
+ emit stateHasChanged();
}
void QDeclarativeDebugTestClient::messageReceived(const QByteArray &ba)
diff --git a/tests/auto/declarative/debugger/shared/debugutil_p.h b/tests/auto/declarative/debugger/shared/debugutil_p.h
index aecd656a07..520cb11a5a 100644
--- a/tests/auto/declarative/debugger/shared/debugutil_p.h
+++ b/tests/auto/declarative/debugger/shared/debugutil_p.h
@@ -67,11 +67,11 @@ public:
QDeclarativeDebugTestService(const QString &s, float version = 1, QObject *parent = 0);
signals:
- void statusHasChanged();
+ void stateHasChanged();
protected:
virtual void messageReceived(const QByteArray &ba);
- virtual void statusChanged(Status status);
+ virtual void stateChanged(State state);
};
class QDeclarativeDebugTestClient : public QDeclarativeDebugClient
@@ -83,11 +83,11 @@ public:
QByteArray waitForResponse();
signals:
- void statusHasChanged();
+ void stateHasChanged();
void serverMessage(const QByteArray &);
protected:
- virtual void statusChanged(Status status);
+ virtual void stateChanged(State state);
virtual void messageReceived(const QByteArray &ba);
private: