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

QmlDebug: Rename some members of QmlDebugConnection

Browse Source 
This is to adopt the naming to the code in src/qmldebug in
qtdeclarative. Once we can require a version of Qt that has qmldebug
for building QtCreator we can then remove our own version of this code.

Change-Id: I573f0703871b5812789c5c7a6287567d5c2875e6
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
This commit is contained in:
Ulf Hermann
2015-11-16 17:05:10 +01:00
parent a3e4a28bee
commit 47317eff60
7 changed files with 42 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/plugins/debugger/qml/qmlengine.cpp
View File

@@ -297,11 +297,11 @@ QmlEngine::QmlEngine(const DebuggerRunParameters &startParameters, DebuggerEngin
this, &QmlEngine::showConnectionErrorMessage);
connect(d->connection, &QmlDebugConnection::error,
this, &QmlEngine::connectionErrorOccurred);
connect(d->connection, &QmlDebugConnection::opened,
connect(d->connection, &QmlDebugConnection::connected,
&d->connectionTimer, &QTimer::stop);
connect(d->connection, &QmlDebugConnection::opened,
connect(d->connection, &QmlDebugConnection::connected,
this, &QmlEngine::connectionEstablished);
connect(d->connection, &QmlDebugConnection::closed,
connect(d->connection, &QmlDebugConnection::disconnected,
this, &QmlEngine::disconnected);
d->msgClient = new QDebugMessageClient(d->connection);
@@ -398,7 +398,7 @@ void QmlEngine::beginConnection(quint16 port)
if (runParameters().qmlServerPort > 0)
port = runParameters().qmlServerPort;
if (!d->connection || d->connection->isOpen())
if (!d->connection || d->connection->isConnected())
return;
d->connection->connectToHost(host, port);
@@ -1236,7 +1236,7 @@ void QmlEngine::clientStateChanged(QmlDebugClient::State state)
float version = 0;
if (QmlDebugClient *client = qobject_cast<QmlDebugClient*>(sender())) {
serviceName = client->name();
version = client->remoteVersion();
version = client->serviceVersion();
}
logServiceStateChange(serviceName, version, state);
@@ -1252,7 +1252,7 @@ void QmlEngine::checkConnectionState()
bool QmlEngine::isConnected() const
{
return d->connection->isOpen();
return d->connection->isConnected();
}
void QmlEngine::showConnectionStateMessage(const QString &message)