Remove indirection from QMqttConnection to data values

Instead of querying the properties each time from the client, prefer to
use QMqttClientPrivate, which stores the value types.

Change-Id: I3f199029dc82077bd67a46a922206502b6519dfd
Reviewed-by: Lorenz Haas <lorenz.haas@histomatics.de>
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>

1 files changed, 4 insertions, 3 deletions

diff --git a/src/mqtt/qmqttclient.cpp b/src/mqtt/qmqttclient.cpp
index 69af887..6f5dfa8 100644
--- a/src/mqtt/qmqttclient.cpp
+++ b/src/mqtt/qmqttclient.cpp
@@ -271,10 +271,10 @@ QT_BEGIN_NAMESPACE
 /*!
     Creates a new MQTT client instance with the specified \a parent.
  */
-QMqttClient::QMqttClient(QObject *parent) : QObject(*(new QMqttClientPrivate), parent)
+QMqttClient::QMqttClient(QObject *parent) : QObject(*(new QMqttClientPrivate(this)), parent)
 {
     Q_D(QMqttClient);
-    d->m_connection.setClient(this, d);
+    d->m_connection.setClientPrivate(d);
 }
 
 /*!
@@ -670,9 +670,10 @@ void QMqttClient::setError(ClientError e)
     emit errorChanged(d->m_error);
 }
 
-QMqttClientPrivate::QMqttClientPrivate()
+QMqttClientPrivate::QMqttClientPrivate(QMqttClient *c)
     : QObjectPrivate()
 {
+    m_client = c;
     m_clientId = QUuid::createUuid().toString();
     m_clientId.remove(QLatin1Char('{'), Qt::CaseInsensitive);
     m_clientId.remove(QLatin1Char('}'), Qt::CaseInsensitive);