diff options
author | Kai Koehne <kai.koehne@nokia.com> | 2012-02-02 11:18:08 +0100 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-02-10 11:49:38 +0100 |
commit | 9daf11cede6a13fb95f202b2bdee7966a502d3f7 (patch) | |
tree | ae09d426af7edb1e998eeb45f1afb7a644a19800 /src/declarative/debugger/qdebugmessageservice.cpp | |
parent | e761f5b906c427433325debb9f08c4f2d0ba902d (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/qdebugmessageservice.cpp')
-rw-r--r-- | src/declarative/debugger/qdebugmessageservice.cpp | 16 |
1 files changed, 8 insertions, 8 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 |