From a841dcebfc6c26ea8800d9dde8ff00fc8245cfad Mon Sep 17 00:00:00 2001
From: Ulf Hermann <ulf.hermann@theqtcompany.com>
Date: Thu, 26 Nov 2015 17:22:10 +0100
Subject: [PATCH] QmlProfiler: Deobfuscate connection mechanism

Whenever we create the connection we as well try connectToHost()
immediately instead of deferring it until the next timeout. The
else branch in tryToConnect() would never be executed because if
the connection is there and not connecting or connected, then
the socketState must be != ConnectedState.

Change-Id: I6736b35348671961fbb3a48edb5e9c6c1d7ce915
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
---
 .../qmlprofiler/qmlprofilerclientmanager.cpp      | 15 ++-------------
 .../qmlprofiler/qmlprofilerclientmanager.h        |  2 --
 2 files changed, 2 insertions(+), 15 deletions(-)

diff --git a/src/plugins/qmlprofiler/qmlprofilerclientmanager.cpp b/src/plugins/qmlprofiler/qmlprofilerclientmanager.cpp
index e111a17ea4e..40218db57ee 100644
--- a/src/plugins/qmlprofiler/qmlprofilerclientmanager.cpp
+++ b/src/plugins/qmlprofiler/qmlprofilerclientmanager.cpp
@@ -152,6 +152,7 @@ void QmlProfilerClientManager::connectTcpClient(quint16 port)
     createConnection();
     d->connectionTimer.start();
     d->tcpPort = port;
+    d->connection->connectToHost(d->tcpHost, d->tcpPort);
 }
 
 void QmlProfilerClientManager::connectLocalClient(const QString &file)
@@ -240,14 +241,6 @@ void QmlProfilerClientManager::disconnectClientSignals()
     }
 }
 
-void QmlProfilerClientManager::connectToClient()
-{
-    if (!d->connection || d->connection->isConnected() || d->connection->isConnecting())
-        return;
-
-    d->connection->connectToHost(d->tcpHost, d->tcpPort);
-}
-
 bool QmlProfilerClientManager::isConnected() const
 {
     return d->connection && d->connection->isConnected();
@@ -270,8 +263,7 @@ void QmlProfilerClientManager::tryToConnect()
     if (d->connection && d->connection->isConnected()) {
         d->connectionTimer.stop();
         d->connectionAttempts = 0;
-    } else if (d->connection &&
-               d->connection->socketState() != QAbstractSocket::ConnectedState) {
+    } else if (d->connection && d->connection->socketState() != QAbstractSocket::ConnectedState) {
         // Replace the connection after trying for some time. On some operating systems (OSX) the
         // very first connection to a TCP server takes a very long time to get established.
 
@@ -280,7 +272,6 @@ void QmlProfilerClientManager::tryToConnect()
         delete d->connection;
         d->connection = 0;
         connectTcpClient(d->tcpPort);
-        connectToClient();
     } else if (d->connectionAttempts == 50) {
         d->connectionTimer.stop();
         d->connectionAttempts = 0;
@@ -302,8 +293,6 @@ void QmlProfilerClientManager::tryToConnect()
                 this, &QmlProfilerClientManager::retryMessageBoxFinished);
 
         infoBox->show();
-    } else {
-        connectToClient();
     }
 }
 
diff --git a/src/plugins/qmlprofiler/qmlprofilerclientmanager.h b/src/plugins/qmlprofiler/qmlprofilerclientmanager.h
index 2d11ffdb9d3..dfeb446ae3b 100644
--- a/src/plugins/qmlprofiler/qmlprofilerclientmanager.h
+++ b/src/plugins/qmlprofiler/qmlprofilerclientmanager.h
@@ -93,8 +93,6 @@ private:
     class QmlProfilerClientManagerPrivate;
     QmlProfilerClientManagerPrivate *d;
 
-    void connectToClient();
-
     void createConnection();
     void connectClientSignals();
     void disconnectClientSignals();