Index: CloudConnect/CloudConnectController.h
===================================================================
diff -u -r59b4c22f45a1d098064a886452769204e90cfb4b -r51e99f2578e0901d9da91a4cb60d1b8858cfe971
--- CloudConnect/CloudConnectController.h	(.../CloudConnectController.h)	(revision 59b4c22f45a1d098064a886452769204e90cfb4b)
+++ CloudConnect/CloudConnectController.h	(.../CloudConnectController.h)	(revision 51e99f2578e0901d9da91a4cb60d1b8858cfe971)
@@ -30,8 +30,7 @@
 #include "CanMessage.h"
 #include "CloudConnectServer.h"
 #include "MessageDispatcher.h"
-#include "MqttPublisher.h"
-#include "MqttTcpTransport.h"
+#include "MqttClient.h"
 
 using namespace Can;
 
@@ -80,8 +79,7 @@
     QMap<Can::MsgId, std::pair<bool, Can::Message>> _msgCache;
     QHash<Can::MsgId, MsgHandling> _msgHandling;
     QSharedPointer<CloudConnectServer> _appServer;
-    QSharedPointer<MqttTcpTransport> _mqttTransport;
-    MqttPublisher _publisher;
+    MqttClient _mqttClient;
     QString _topicPrefix; // TODO: define in INI?
     QString _deviceId; // TODO: this needs to be sent from Leahi app or retrieved from somewhere
     bool _mqttEnabled = false;
@@ -93,6 +91,4 @@
 private Q_SLOTS:
     void onFrameReceive(const QCanBusFrame frame);
     void onMessageReceive(const Can::Message &msg);
-    void onCloudConnectionChange(bool connected);
-    void onPublishAck(qint64 messageId, bool success);
 };