From aab7a6ec47d8c17d059fd7f13a1c121d57056926 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Simon=20St=C3=BCrz?= <stuerz.simon@gmail.com>
Date: Tue, 29 Jul 2014 00:03:26 +0200
Subject: [PATCH] fixed some bugs in eq-3 and penweathermap plugins

---
 libguh/hardware/radio433transmitter.h                    | 3 ---
 plugins/deviceplugins/eq-3/deviceplugineq-3.cpp          | 9 +++++----
 plugins/deviceplugins/eq-3/deviceplugineq-3.h            | 2 +-
 .../openweathermap/devicepluginopenweathermap.cpp        | 4 ++--
 4 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/libguh/hardware/radio433transmitter.h b/libguh/hardware/radio433transmitter.h
index 2f5236f0..16d63161 100644
--- a/libguh/hardware/radio433transmitter.h
+++ b/libguh/hardware/radio433transmitter.h
@@ -37,10 +37,7 @@ public:
 
     bool startTransmitter();
     bool stopTransmitter();
-<<<<<<< HEAD
     bool setUpGpio();
-=======
->>>>>>> fixed some Radio433 bugs
 
     void sendData(QList<int> rawData);
 
diff --git a/plugins/deviceplugins/eq-3/deviceplugineq-3.cpp b/plugins/deviceplugins/eq-3/deviceplugineq-3.cpp
index b705f0e1..b07f142b 100644
--- a/plugins/deviceplugins/eq-3/deviceplugineq-3.cpp
+++ b/plugins/deviceplugins/eq-3/deviceplugineq-3.cpp
@@ -107,15 +107,16 @@ QList<ParamType> DevicePluginEQ3::configurationDescription() const
     return params;
 }
 
-DeviceManager::DeviceError DevicePluginEQ3::discoverDevices(const DeviceClassId &deviceClassId, const QList<Param> &params) const
+QPair<DeviceManager::DeviceError, QString> DevicePluginEQ3::discoverDevices(const DeviceClassId &deviceClassId, const ParamList &params)
 {
     if(deviceClassId == cubeDeviceClassId){
         m_cubeDiscovery->detectCubes();
-        return DeviceManager::DeviceErrorAsync;
+        return report(DeviceManager::DeviceErrorAsync);
     }
-    return DeviceManager::DeviceErrorDeviceClassNotFound;
+    return report(DeviceManager::DeviceErrorDeviceClassNotFound);
 }
 
+
 QPair<DeviceManager::DeviceSetupStatus, QString> DevicePluginEQ3::setupDevice(Device *device)
 {
     qDebug() << "setupDevice" << device->params();
@@ -167,7 +168,7 @@ void DevicePluginEQ3::discoveryDone(const QList<MaxCube *> &cubeList)
     QList<DeviceDescriptor> retList;
     foreach (MaxCube *cube, cubeList) {
         DeviceDescriptor descriptor(cubeDeviceClassId, "Max! Cube LAN Gateway",cube->serialNumber());
-        QList<Param> params;
+        ParamList params;
         Param hostParam("host address", cube->hostAddress().toString());
         params.append(hostParam);
         Param portParam("port", cube->port());
diff --git a/plugins/deviceplugins/eq-3/deviceplugineq-3.h b/plugins/deviceplugins/eq-3/deviceplugineq-3.h
index 6d771758..c26ede57 100644
--- a/plugins/deviceplugins/eq-3/deviceplugineq-3.h
+++ b/plugins/deviceplugins/eq-3/deviceplugineq-3.h
@@ -44,7 +44,7 @@ public:
     PluginId pluginId() const override;
 
     QList<ParamType> configurationDescription() const override;
-    DeviceManager::DeviceError discoverDevices(const DeviceClassId &deviceClassId, const QList<Param> &params) const override;
+    QPair<DeviceManager::DeviceError, QString> discoverDevices(const DeviceClassId &deviceClassId, const ParamList &params) override;
 
     QPair<DeviceManager::DeviceSetupStatus, QString> setupDevice(Device *device) override;
 
diff --git a/plugins/deviceplugins/openweathermap/devicepluginopenweathermap.cpp b/plugins/deviceplugins/openweathermap/devicepluginopenweathermap.cpp
index 86a92fa1..deb42f00 100644
--- a/plugins/deviceplugins/openweathermap/devicepluginopenweathermap.cpp
+++ b/plugins/deviceplugins/openweathermap/devicepluginopenweathermap.cpp
@@ -439,9 +439,9 @@ QPair<DeviceManager::DeviceError, QString> DevicePluginOpenweathermap::discoverD
         }else{
             m_openweaher->search(location);
         }
-        return DeviceManager::DeviceErrorAsync;
+        return report(DeviceManager::DeviceErrorAsync);
     }else{
-        return DeviceManager::DeviceErrorDeviceClassNotFound;
+        return report(DeviceManager::DeviceErrorDeviceClassNotFound);
     }
 }