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

QmlDebug: Move QDDEngineDebug instance to ClientProxy

Browse Source 
Only the ClientProxy uses it anyway.

Reviewed-by: Thorbjorn Lindeijer
This commit is contained in:
Kai Koehne
2011-02-17 13:56:45 +01:00
parent 748ea3edb1
commit 8d14887446
3 changed files with 50 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/plugins/debugger/qml/qmladapter.cpp
View File

@@ -53,7 +53,6 @@ public:
explicit QmlAdapterPrivate(DebuggerEngine *engine)
: m_engine(engine)
, m_qmlClient(0)
, m_mainClient(0)
, m_connectionAttempts(0)
, m_maxConnectionAttempts(50) // overall time: 50 x 200ms
, m_conn(0)
@@ -63,7 +62,6 @@ public:
QWeakPointer<DebuggerEngine> m_engine;
Internal::QmlDebuggerClient *m_qmlClient;
QDeclarativeEngineDebug *m_mainClient;
QTimer m_connectionTimer;
int m_connectionAttempts;
@@ -187,10 +185,6 @@ void QmlAdapter::connectionStateChanged()
{
showConnectionStatusMessage(tr("connected.\n"));
if (!d->m_mainClient) {
d->m_mainClient = new QDeclarativeEngineDebug(d->m_conn, this);
}
createDebuggerClient();
//reloadEngines();
emit connected();
@@ -224,11 +218,6 @@ bool QmlAdapter::isConnected() const
return d->m_conn && d->m_qmlClient && d->m_conn->state() == QAbstractSocket::ConnectedState;
}
QDeclarativeEngineDebug *QmlAdapter::client() const
{
return d->m_mainClient;
}
QDeclarativeDebugConnection *QmlAdapter::connection() const
{
if (!isConnected())