Update nymea-remoteproxy submodule to 1.12.0

libnymea-app/configuration/mqttpolicies.h

@@ -58,15 +58,17 @@ public:
     void addPolicy(MqttPolicy *policy);
     void removePolicy(MqttPolicy *policy);
 
-    Q_INVOKABLE MqttPolicy* getPolicy(const QString &clientId) const;
-    Q_INVOKABLE MqttPolicy* get(int index) const;
+    Q_INVOKABLE MqttPolicy *getPolicy(const QString &clientId) const;
+    Q_INVOKABLE MqttPolicy *get(int index) const;
 
     void clear();
+
 signals:
     void countChanged();
 
 private:
-    QList<MqttPolicy*> m_list;
+    QList<MqttPolicy *> m_list;
+
 };
 
 #endif // MQTTPOLICIES_H

libnymea-app/configuration/nymeaconfiguration.h

@@ -139,7 +139,7 @@ signals:
     void serverNameChanged();
 
 private:
-    JsonRpcClient* m_client = nullptr;
+    JsonRpcClient *m_client = nullptr;
 
     bool m_fetchingData = false;
     bool m_debugServerEnabled = false;

libnymea-app/configuration/serverconfiguration.h

@@ -62,7 +62,7 @@ public:
     bool sslEnabled() const;
     void setSslEnabled(bool sslEnabled);
 
-    Q_INVOKABLE virtual ServerConfiguration* clone() const;
+    Q_INVOKABLE virtual ServerConfiguration *clone() const;
 
 signals:
     void addressChanged();

libnymea-app/configuration/serverconfigurations.h

@@ -63,8 +63,8 @@ public:
 
     void clear();
 
-    Q_INVOKABLE ServerConfiguration* get(int index) const;
-    Q_INVOKABLE ServerConfiguration* getConfiguration(const QString &id) const;
+    Q_INVOKABLE ServerConfiguration *get(int index) const;
+    Q_INVOKABLE ServerConfiguration *getConfiguration(const QString &id) const;
 
 signals:
     void countChanged();

libnymea-app/connection/discovery/bluetoothservicediscovery.cpp

@@ -30,9 +30,6 @@
 
 #include "bluetoothservicediscovery.h"
 
-#include "../nymeahosts.h"
-#include "../nymeahost.h"
-
 #include <QTimer>
 
 #include "logging.h"
@@ -133,17 +130,6 @@ void BluetoothServiceDiscovery::onServiceDiscovered(const QBluetoothServiceInfo
 
     if (serviceInfo.serviceClassUuids().first() == QBluetoothUuid(QUuid("997936b5-d2cd-4c57-b41b-c6048320cd2b"))) {
         qCDebug(dcBluetoothDiscovery()) << "BluetoothServiceDiscovery: Found nymea rfcom service!";
-
-//        NymeaHost* host = m_nymeaHosts->find(serviceInfo.device().address());
-//        if (!host) {
-//            host = new DiscoveryDevice(DiscoveryDevice::DeviceTypeBluetooth, this);
-//            qDebug() << "BluetoothServiceDiscovery: Adding new bluetooth host to model";
-//            host->setName(QString("%1 (%2)").arg(serviceInfo.serviceName()).arg(serviceInfo.device().name()));
-////            device->setBluetoothAddress(serviceInfo.device().address());
-//            PortConfig pc;
-
-//            m_nymeaHosts->addHost(device);
-//        }
     }
 }
 
@@ -163,7 +149,6 @@ void BluetoothServiceDiscovery::onServiceDiscoveryFinished()
             return;
         }
 
-//        qDebug() << "BluetoothServiceDiscovery: Restart service discovery";
         discover();
     }
 }

libnymea-app/connection/discovery/nymeadiscovery.h

@@ -42,7 +42,6 @@ class UpnpDiscovery;
 class ZeroconfDiscovery;
 class BluetoothServiceDiscovery;
 
-
 class NymeaDiscovery : public QObject
 {
     Q_OBJECT

libnymea-app/connection/nymeahosts.cpp

@@ -29,9 +29,8 @@
 * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 #include "nymeahosts.h"
-#include "connection/discovery/nymeadiscovery.h"
 #include "nymeahost.h"
-#include "jsonrpc/jsonrpcclient.h"
+
 #include <QUuid>
 
 NymeaHosts::NymeaHosts(QObject *parent) :

libnymea-app/connection/nymeahosts.h

@@ -35,8 +35,11 @@
 #include <QList>
 #include <QBluetoothAddress>
 #include <QSortFilterProxyModel>
+
 #include "nymeahost.h"
+
 class JsonRpcClient;
+class NymeaDiscovery;
 
 class NymeaHosts : public QAbstractListModel
 {
@@ -104,7 +107,7 @@ public:
     bool showUnreachableHosts() const;
     void setShowUnreachableHosts(bool showUnreachableHosts);
 
-    Q_INVOKABLE NymeaHost* get(int index) const;
+    Q_INVOKABLE NymeaHost *get(int index) const;
 
 signals:
     void countChanged();

nymea-remoteproxy

@@ -1 +1 @@
-Subproject commit 81ba94583d4873efe5110beef7240c4d229ec2c7
+Subproject commit 9fba08477f507ae15b2909cf637c31a74a9c5028