From 06b64534de6020cae9c53980429c3b96ba7760d6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Simon=20St=C3=BCrz?= <stuerz.simon@gmail.com>
Date: Thu, 9 Oct 2014 20:32:48 +0200
Subject: [PATCH] fixed inline comments

---
 .../hardware/radio433/radio433brennenstuhlgateway.cpp  | 10 ++++++----
 libguh/hardware/radio433/radio433receiver.cpp          |  4 ++--
 libguh/hardware/radio433/radio433receiver.h            |  2 +-
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/libguh/hardware/radio433/radio433brennenstuhlgateway.cpp b/libguh/hardware/radio433/radio433brennenstuhlgateway.cpp
index 4e0cd834..db0ffa30 100644
--- a/libguh/hardware/radio433/radio433brennenstuhlgateway.cpp
+++ b/libguh/hardware/radio433/radio433brennenstuhlgateway.cpp
@@ -24,7 +24,7 @@ Radio433BrennenstuhlGateway::Radio433BrennenstuhlGateway(QObject *parent) :
     m_gatewayDiscovery = new QUdpSocket(this);
     m_gateway = new QUdpSocket(this);
 
-    // connect(m_gateway, &QUdpSocket::error, this, &Radio433BrennenstuhlGateway::gatewayError) -> does not work...runtime connection error.
+    // connect(m_gateway, &QAbstractSocket::error, this, &Radio433BrennenstuhlGateway::gatewayError) -> does not work...runtime connection error.
     connect(m_gateway, SIGNAL(error(QAbstractSocket::SocketError)), this, SLOT(gatewayError(QAbstractSocket::SocketError)));
 
     m_available = false;
@@ -63,10 +63,9 @@ bool Radio433BrennenstuhlGateway::sendData(int delay, QList<int> rawData)
         if(m_gateway->writeDatagram(message,m_gatewayAddress,m_gatewayPort) > 0){
             m_available = true;
             return true;
-        }else{
-            return false;
         }
     }
+    return false;
 }
 
 bool Radio433BrennenstuhlGateway::enable()
@@ -78,12 +77,14 @@ bool Radio433BrennenstuhlGateway::enable()
     connect(m_gatewayDiscovery, &QUdpSocket::readyRead, this, &Radio433BrennenstuhlGateway::readDataDiscovery);
 
     discover();
+    return true;
 }
 
 bool Radio433BrennenstuhlGateway::disable()
 {
     m_gateway->close();
     m_gatewayDiscovery->close();
+    return true;
 }
 
 void Radio433BrennenstuhlGateway::discover()
@@ -139,7 +140,7 @@ void Radio433BrennenstuhlGateway::readDataGateway()
     QHostAddress sender;
     quint16 udpPort;
 
-    // read the answere from the
+    // read the answere from the gateway
     while (m_gateway->hasPendingDatagrams()) {
         data.resize(m_gateway->pendingDatagramSize());
         m_gateway->readDatagram(data.data(), data.size(), &sender, &udpPort);
@@ -148,6 +149,7 @@ void Radio433BrennenstuhlGateway::readDataGateway()
 
 void Radio433BrennenstuhlGateway::gatewayError(QAbstractSocket::SocketError error)
 {
+    Q_UNUSED(error)
     QUdpSocket *gateway = static_cast<QUdpSocket*>(sender());
     qDebug() << "--> ERROR: Radio 433 MHz Brennenstuhl LAN Gateway disabled: " << gateway->errorString();
     m_available = false;
diff --git a/libguh/hardware/radio433/radio433receiver.cpp b/libguh/hardware/radio433/radio433receiver.cpp
index 9dba9a2d..661d32f0 100644
--- a/libguh/hardware/radio433/radio433receiver.cpp
+++ b/libguh/hardware/radio433/radio433receiver.cpp
@@ -137,10 +137,10 @@ int Radio433Receiver::micros()
     return (int)(now - m_epochMicro) ;
 }
 
-bool Radio433Receiver::valueInTolerance(int value, int sollValue)
+bool Radio433Receiver::valueInTolerance(int value, int correctValue)
 {
     // in in range of +- 200 [us] of sollValue return true, eles return false
-    if(value >= (double)sollValue - 200 && value <= (double)sollValue + 200){
+    if(value >= (double)correctValue - 200 && value <= (double)correctValue + 200){
         return true;
     }
     return false;
diff --git a/libguh/hardware/radio433/radio433receiver.h b/libguh/hardware/radio433/radio433receiver.h
index dd7120b7..57dc1364 100644
--- a/libguh/hardware/radio433/radio433receiver.h
+++ b/libguh/hardware/radio433/radio433receiver.h
@@ -60,7 +60,7 @@ private:
 
     bool setUpGpio();
     int micros();
-    bool valueInTolerance(int value, int sollValue);
+    bool valueInTolerance(int value, int correctValue);
     bool checkValue(int value);
     bool checkValues(Protocol protocol);
     void changeReading(bool reading);