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

QmlDebug: Simplify error and state signaling

Browse Source 
There is no point in sending two signals for every state change and
error. Also, the signals only reflect events in the socket, not in the
logical connection.

Change-Id: I617a925c69164aa1a02a7781b9da7dca55daa304
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
This commit is contained in:
Ulf Hermann
2015-11-16 17:29:17 +01:00
parent 47317eff60
commit 81eea72d44
6 changed files with 64 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/plugins/qmlprofiler/qmlprofilerclientmanager.cpp
View File

@@ -32,7 +32,6 @@
#include "qmlprofilertool.h"
#include "qmlprofilerplugin.h"
#include <qmldebug/qmldebugclient.h>
#include <qmldebug/qmlprofilertraceclient.h>
#include <utils/qtcassert.h>
@@ -132,16 +131,14 @@ void QmlProfilerClientManager::connectClient(quint16 port)
d->connection = new QmlDebugConnection;
enableServices();
connect(d->connection, &QmlDebugConnection::stateMessage,
this, &QmlProfilerClientManager::logState);
connect(d->connection, &QmlDebugConnection::errorMessage,
this, &QmlProfilerClientManager::logState);
connect(d->connection, &QmlDebugConnection::connected,
this, &QmlProfilerClientManager::qmlDebugConnectionOpened);
connect(d->connection, &QmlDebugConnection::disconnected,
this, &QmlProfilerClientManager::qmlDebugConnectionClosed);
connect(d->connection, &QmlDebugConnection::error,
connect(d->connection, &QmlDebugConnection::socketError,
this, &QmlProfilerClientManager::qmlDebugConnectionError);
connect(d->connection, &QmlDebugConnection::socketStateChanged,
this, &QmlProfilerClientManager::qmlDebugConnectionStateChanged);
d->connectionTimer.start();
d->tcpPort = port;
}
@@ -273,9 +270,9 @@ void QmlProfilerClientManager::qmlDebugConnectionClosed()
emit connectionClosed();
}
void QmlProfilerClientManager::qmlDebugConnectionError(QDebugSupport::Error error)
void QmlProfilerClientManager::qmlDebugConnectionError(QAbstractSocket::SocketError error)
{
logState(tr("Debug connection error %1").arg(error));
logState(QmlDebugConnection::socketErrorToString(error));
if (d->connection->isConnected()) {
disconnectClient();
emit connectionClosed();
@@ -284,6 +281,11 @@ void QmlProfilerClientManager::qmlDebugConnectionError(QDebugSupport::Error erro
}
}
void QmlProfilerClientManager::qmlDebugConnectionStateChanged(QAbstractSocket::SocketState state)
{
logState(QmlDebugConnection::socketStateToString(state));
}
void QmlProfilerClientManager::logState(const QString &msg)
{
QString state = QLatin1String("QML Profiler: ") + msg;

5
src/plugins/qmlprofiler/qmlprofilerclientmanager.h
View File

@@ -33,10 +33,10 @@
#include "qmlprofilerstatemanager.h"
#include <qmldebug/qmlprofilereventlocation.h>
#include <qmldebug/qmldebugclient.h>
#include <QObject>
#include <QStringList>
#include <QAbstractSocket>
namespace QmlProfiler {
class QmlProfilerModelManager;
@@ -72,7 +72,8 @@ private slots:
void tryToConnect();
void qmlDebugConnectionOpened();
void qmlDebugConnectionClosed();
void qmlDebugConnectionError(QDebugSupport::Error error);
void qmlDebugConnectionError(QAbstractSocket::SocketError error);
void qmlDebugConnectionStateChanged(QAbstractSocket::SocketState state);
void logState(const QString &);
void retryMessageBoxFinished(int result);