feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Debugger: Modernize qmlinspectoradapter.cpp

Browse Source 
Change-Id: Idb65d85664632121e80a91fd5fae021315c9b33f
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
This commit is contained in:
hjk
2015-06-04 12:20:45 +02:00
parent 76a071757d
commit eaf718bdea
2 changed files with 41 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

82
src/plugins/debugger/qml/qmlinspectoradapter.cpp
View File

@@ -81,33 +81,31 @@ QmlInspectorAdapter::QmlInspectorAdapter(QmlAdapter *debugAdapter,
{ {
if (!m_engine->isMasterEngine()) if (!m_engine->isMasterEngine())
m_engine = m_engine->masterEngine(); m_engine = m_engine->masterEngine();
connect(m_engine, SIGNAL(stateChanged(Debugger::DebuggerState)), connect(m_engine, &DebuggerEngine::stateChanged,
SLOT(onEngineStateChanged(Debugger::DebuggerState))); this, &QmlInspectorAdapter::onEngineStateChanged);
connect(m_agent, SIGNAL(objectFetched(QmlDebug::ObjectReference)), connect(m_agent, &QmlInspectorAgent::objectFetched,
SLOT(onObjectFetched(QmlDebug::ObjectReference))); this, &QmlInspectorAdapter::onObjectFetched);
connect(m_agent, SIGNAL(jumpToObjectDefinition(QmlDebug::FileReference,int)), connect(m_agent, &QmlInspectorAgent::jumpToObjectDefinition,
SLOT(jumpToObjectDefinitionInEditor(QmlDebug::FileReference,int))); this, &QmlInspectorAdapter::jumpToObjectDefinitionInEditor);
QmlDebugConnection *connection = m_debugAdapter->connection(); QmlDebugConnection *connection = m_debugAdapter->connection();
DeclarativeEngineDebugClient *engineClient1 auto engineClient1 = new DeclarativeEngineDebugClient(connection);
= new DeclarativeEngineDebugClient(connection); connect(engineClient1, &BaseEngineDebugClient::newState,
connect(engineClient1, SIGNAL(newState(QmlDebug::QmlDebugClient::State)), this, &QmlInspectorAdapter::clientStateChanged);
this, SLOT(clientStateChanged(QmlDebug::QmlDebugClient::State))); connect(engineClient1, &BaseEngineDebugClient::newState,
connect(engineClient1, SIGNAL(newState(QmlDebug::QmlDebugClient::State)), this, &QmlInspectorAdapter::engineClientStateChanged);
this, SLOT(engineClientStateChanged(QmlDebug::QmlDebugClient::State)));
QmlEngineDebugClient *engineClient2 = new QmlEngineDebugClient(connection); auto engineClient2 = new QmlEngineDebugClient(connection);
connect(engineClient2, SIGNAL(newState(QmlDebug::QmlDebugClient::State)), connect(engineClient2, &BaseEngineDebugClient::newState,
this, SLOT(clientStateChanged(QmlDebug::QmlDebugClient::State))); this, &QmlInspectorAdapter::clientStateChanged);
connect(engineClient2, SIGNAL(newState(QmlDebug::QmlDebugClient::State)), connect(engineClient2, &BaseEngineDebugClient::newState,
this, SLOT(engineClientStateChanged(QmlDebug::QmlDebugClient::State))); this, &QmlInspectorAdapter::engineClientStateChanged);
DeclarativeEngineDebugClientV2 *engineClient3 auto engineClient3 = new DeclarativeEngineDebugClientV2(connection);
= new DeclarativeEngineDebugClientV2(connection); connect(engineClient3, &BaseEngineDebugClient::newState,
connect(engineClient3, SIGNAL(newState(QmlDebug::QmlDebugClient::State)), this, &QmlInspectorAdapter::clientStateChanged);
this, SLOT(clientStateChanged(QmlDebug::QmlDebugClient::State))); connect(engineClient3, &BaseEngineDebugClient::newState,
connect(engineClient3, SIGNAL(newState(QmlDebug::QmlDebugClient::State)), this, &QmlInspectorAdapter::engineClientStateChanged);
this, SLOT(engineClientStateChanged(QmlDebug::QmlDebugClient::State)));
m_engineClients.insert(engineClient1->name(), engineClient1); m_engineClients.insert(engineClient1->name(), engineClient1);
m_engineClients.insert(engineClient2->name(), engineClient2); m_engineClients.insert(engineClient2->name(), engineClient2);
@@ -120,17 +118,17 @@ QmlInspectorAdapter::QmlInspectorAdapter(QmlAdapter *debugAdapter,
if (engineClient3->state() == QmlDebugClient::Enabled) if (engineClient3->state() == QmlDebugClient::Enabled)
setActiveEngineClient(engineClient3); setActiveEngineClient(engineClient3);
DeclarativeToolsClient *toolsClient1 = new DeclarativeToolsClient(connection); auto toolsClient1 = new DeclarativeToolsClient(connection);
connect(toolsClient1, SIGNAL(newState(QmlDebug::QmlDebugClient::State)), connect(toolsClient1, &BaseToolsClient::newState,
this, SLOT(clientStateChanged(QmlDebug::QmlDebugClient::State))); this, &QmlInspectorAdapter::clientStateChanged);
connect(toolsClient1, SIGNAL(newState(QmlDebug::QmlDebugClient::State)), connect(toolsClient1, &BaseToolsClient::newState,
this, SLOT(toolsClientStateChanged(QmlDebug::QmlDebugClient::State))); this, &QmlInspectorAdapter::toolsClientStateChanged);
QmlToolsClient *toolsClient2 = new QmlToolsClient(connection); auto toolsClient2 = new QmlToolsClient(connection);
connect(toolsClient2, SIGNAL(newState(QmlDebug::QmlDebugClient::State)), connect(toolsClient2, SIGNAL(newState(QmlDebug::QmlDebugClient::State)),
this, SLOT(clientStateChanged(QmlDebug::QmlDebugClient::State))); this, SLOT(clientStateChanged(QmlDebug::QmlDebugClient::State)));
connect(toolsClient2, SIGNAL(newState(QmlDebug::QmlDebugClient::State)), connect(toolsClient2, &BaseToolsClient::newState,
this, SLOT(toolsClientStateChanged(QmlDebug::QmlDebugClient::State))); this, &QmlInspectorAdapter::toolsClientStateChanged);
// toolbar // toolbar
m_selectAction->setObjectName(QLatin1String("QML Select Action")); m_selectAction->setObjectName(QLatin1String("QML Select Action"));
@@ -142,12 +140,12 @@ QmlInspectorAdapter::QmlInspectorAdapter(QmlAdapter *debugAdapter,
m_zoomAction->setEnabled(false); m_zoomAction->setEnabled(false);
m_showAppOnTopAction->setEnabled(false); m_showAppOnTopAction->setEnabled(false);
connect(m_selectAction, SIGNAL(triggered(bool)), connect(m_selectAction, &QAction::triggered,
SLOT(onSelectActionTriggered(bool))); this, &QmlInspectorAdapter::onSelectActionTriggered);
connect(m_zoomAction, SIGNAL(triggered(bool)), connect(m_zoomAction, &QAction::triggered,
SLOT(onZoomActionTriggered(bool))); this, &QmlInspectorAdapter::onZoomActionTriggered);
connect(m_showAppOnTopAction, SIGNAL(triggered(bool)), connect(m_showAppOnTopAction, &QAction::triggered,
SLOT(onShowAppOnTopChanged(bool))); this, &QmlInspectorAdapter::onShowAppOnTopChanged);
} }
QmlInspectorAdapter::~QmlInspectorAdapter() QmlInspectorAdapter::~QmlInspectorAdapter()
@@ -198,11 +196,11 @@ void QmlInspectorAdapter::toolsClientStateChanged(QmlDebugClient::State state)
if (state == QmlDebugClient::Enabled) { if (state == QmlDebugClient::Enabled) {
m_toolsClient = client; m_toolsClient = client;
connect(client, SIGNAL(currentObjectsChanged(QList<int>)), connect(client, &BaseToolsClient::currentObjectsChanged,
SLOT(selectObjectsFromToolsClient(QList<int>))); this, &QmlInspectorAdapter::selectObjectsFromToolsClient);
connect(client, SIGNAL(logActivity(QString,QString)), connect(client, &BaseToolsClient::logActivity,
m_debugAdapter, SLOT(logServiceActivity(QString,QString))); m_debugAdapter, &QmlAdapter::logServiceActivity);
connect(client, SIGNAL(reloaded()), SLOT(onReloaded())); connect(client, &BaseToolsClient::reloaded, this, &QmlInspectorAdapter::onReloaded);
// register actions here // register actions here
// because there can be multiple QmlEngines // because there can be multiple QmlEngines

3
src/plugins/debugger/qml/qmlinspectoradapter.h
View File

@@ -69,7 +69,7 @@ public:
signals: signals:
void expressionResult(); void expressionResult();
private slots: private:
void onEngineStateChanged(const Debugger::DebuggerState); void onEngineStateChanged(const Debugger::DebuggerState);
void clientStateChanged(QmlDebug::QmlDebugClient::State state); void clientStateChanged(QmlDebug::QmlDebugClient::State state);
@@ -85,7 +85,6 @@ private slots:
void onReloaded(); void onReloaded();
void jumpToObjectDefinitionInEditor(const QmlDebug::FileReference &objSource, int debugId = -1); void jumpToObjectDefinitionInEditor(const QmlDebug::FileReference &objSource, int debugId = -1);
private:
void setActiveEngineClient(QmlDebug::BaseEngineDebugClient *client); void setActiveEngineClient(QmlDebug::BaseEngineDebugClient *client);
void showConnectionStateMessage(const QString &message); void showConnectionStateMessage(const QString &message);