diff options
| author | Ulf Hermann <ulf.hermann@digia.com> | 2014-05-05 16:11:43 +0200 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@digia.com> | 2014-05-06 12:53:10 +0200 |
| commit | e6792d33c374eaff6840f863114733697140525f (patch) | |
| tree | 367947c898fb04c75b66bf2a9e489a180795e979 /src/plugins/debugger/qml/qmlinspectoragent.cpp | |
| parent | 7018a375c68f09cc62e43dfa9181ef46b6df4653 (diff) | |
| download | qt-creator-e6792d33c374eaff6840f863114733697140525f.tar.gz | |
QmlDebugClient: Rename "status" to "state" for consistency
"state" is the more widely used term and we should follow that
convention. We also need to distinguish between the state of the
underlying network socket and the client itself. The change makes this
explicit.
As preparation for the upcoming centralized debug support the "State"
enum of the debug client is also moved into the QmlDebugClient class.
Change-Id: Ib9d7e03d23528f16ed696ed3518e813d11ea1c32
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
Diffstat (limited to 'src/plugins/debugger/qml/qmlinspectoragent.cpp')
| -rw-r--r-- | src/plugins/debugger/qml/qmlinspectoragent.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/plugins/debugger/qml/qmlinspectoragent.cpp b/src/plugins/debugger/qml/qmlinspectoragent.cpp index 689101c540..c091b2be96 100644 --- a/src/plugins/debugger/qml/qmlinspectoragent.cpp +++ b/src/plugins/debugger/qml/qmlinspectoragent.cpp @@ -64,7 +64,7 @@ QmlInspectorAgent::QmlInspectorAgent(DebuggerEngine *engine, QObject *parent) { m_debugIdToIname.insert(-1, QByteArray("inspect")); connect(debuggerCore()->action(ShowQmlObjectTree), - SIGNAL(valueChanged(QVariant)), SLOT(updateStatus())); + SIGNAL(valueChanged(QVariant)), SLOT(updateState())); m_delayQueryTimer.setSingleShot(true); m_delayQueryTimer.setInterval(100); connect(&m_delayQueryTimer, SIGNAL(timeout()), SLOT(queryEngineContext())); @@ -393,8 +393,8 @@ void QmlInspectorAgent::setEngineClient(BaseEngineDebugClient *client) return; if (m_engineClient) { - disconnect(m_engineClient, SIGNAL(newStatus(QmlDebug::ClientStatus)), - this, SLOT(updateStatus())); + disconnect(m_engineClient, SIGNAL(newState(QmlDebug::QmlDebugClient::State)), + this, SLOT(updateState())); disconnect(m_engineClient, SIGNAL(result(quint32,QVariant,QByteArray)), this, SLOT(onResult(quint32,QVariant,QByteArray))); disconnect(m_engineClient, SIGNAL(newObject(int,int,int)), @@ -406,8 +406,8 @@ void QmlInspectorAgent::setEngineClient(BaseEngineDebugClient *client) m_engineClient = client; if (m_engineClient) { - connect(m_engineClient, SIGNAL(newStatus(QmlDebug::ClientStatus)), - this, SLOT(updateStatus())); + connect(m_engineClient, SIGNAL(newState(QmlDebug::QmlDebugClient::State)), + this, SLOT(updateState())); connect(m_engineClient, SIGNAL(result(quint32,QVariant,QByteArray)), this, SLOT(onResult(quint32,QVariant,QByteArray))); connect(m_engineClient, SIGNAL(newObject(int,int,int)), @@ -416,7 +416,7 @@ void QmlInspectorAgent::setEngineClient(BaseEngineDebugClient *client) this, SLOT(onValueChanged(int,QByteArray,QVariant))); } - updateStatus(); + updateState(); } QString QmlInspectorAgent::displayName(int objectDebugId) const @@ -434,10 +434,10 @@ QString QmlInspectorAgent::displayName(int objectDebugId) const return QString(); } -void QmlInspectorAgent::updateStatus() +void QmlInspectorAgent::updateState() { if (m_engineClient - && (m_engineClient->status() == QmlDebug::Enabled) + && (m_engineClient->state() == QmlDebugClient::Enabled) && debuggerCore()->boolSetting(ShowQmlObjectTree)) { reloadEngines(); } else { @@ -870,7 +870,7 @@ void QmlInspectorAgent::log(QmlInspectorAgent::LogDirection direction, bool QmlInspectorAgent::isConnected() const { return m_engineClient - && (m_engineClient->status() == QmlDebug::Enabled); + && (m_engineClient->state() == QmlDebugClient::Enabled); } void QmlInspectorAgent::clearObjectTree() |