Clean up code warning

libnymea-networkmanager/networkconnection.h

@@ -38,7 +38,7 @@ class NetworkConnection : public QObject
 {
     Q_OBJECT
 public:
-    explicit NetworkConnection(const QDBusObjectPath &objectPath, QObject *parent = 0);
+    explicit NetworkConnection(const QDBusObjectPath &objectPath, QObject *parent = nullptr);
 
     void deleteConnection();
 

libnymea-networkmanager/networkdevice.h

@@ -147,7 +147,7 @@ public:
     };
     Q_ENUM(NetworkDeviceType)
 
-    explicit NetworkDevice(const QDBusObjectPath &objectPath, QObject *parent = 0);
+    explicit NetworkDevice(const QDBusObjectPath &objectPath, QObject *parent = nullptr);
 
     QDBusObjectPath objectPath() const;
 

libnymea-networkmanager/networkmanager.cpp

@@ -113,7 +113,7 @@ NetworkManager::NetworkManagerError NetworkManager::connectWifi(const QString &i
         return NetworkManagerErrorNetworkInterfaceNotFound;
 
     // Get wirelessNetworkDevice
-    WirelessNetworkDevice *wirelessNetworkDevice = 0;
+    WirelessNetworkDevice *wirelessNetworkDevice = nullptr;
     foreach (WirelessNetworkDevice *networkDevice, wirelessNetworkDevices()) {
         if (networkDevice->interface() == interface)
             wirelessNetworkDevice = networkDevice;

libnymea-networkmanager/networkmanager.h

@@ -80,7 +80,7 @@ public:
     };
     Q_ENUM(NetworkManagerError)
 
-    explicit NetworkManager(QObject *parent = 0);
+    explicit NetworkManager(QObject *parent = nullptr);
     ~NetworkManager();
 
     bool available() const;

libnymea-networkmanager/networksettings.h

@@ -36,7 +36,7 @@ class NetworkSettings : public QObject
 {
     Q_OBJECT
 public:
-    explicit NetworkSettings(QObject *parent = 0);
+    explicit NetworkSettings(QObject *parent = nullptr);
 
     QDBusObjectPath addConnection(const ConnectionSettings &settings);
     QList<NetworkConnection *> connections() const;

libnymea-networkmanager/wirednetworkdevice.h

@@ -31,7 +31,7 @@ class WiredNetworkDevice : public NetworkDevice
 {
     Q_OBJECT
 public:
-    explicit WiredNetworkDevice(const QDBusObjectPath &objectPath, QObject *parent = 0);
+    explicit WiredNetworkDevice(const QDBusObjectPath &objectPath, QObject *parent = nullptr);
 
     QString macAddress() const;
     int bitRate() const;

libnymea-networkmanager/wirelessaccesspoint.h

@@ -51,7 +51,7 @@ public:
     };
     Q_DECLARE_FLAGS(ApSecurityModes, ApSecurityMode)
 
-    explicit WirelessAccessPoint(const QDBusObjectPath &objectPath, QObject *parent = 0);
+    explicit WirelessAccessPoint(const QDBusObjectPath &objectPath, QObject *parent = nullptr);
 
     QDBusObjectPath objectPath() const;
 

libnymea-networkmanager/wirelessnetworkdevice.h

@@ -38,7 +38,7 @@ class WirelessNetworkDevice : public NetworkDevice
     Q_OBJECT
 public:
 
-    explicit WirelessNetworkDevice(const QDBusObjectPath &objectPath, QObject *parent = 0);
+    explicit WirelessNetworkDevice(const QDBusObjectPath &objectPath, QObject *parent = nullptr);
 
     // Properties
     QString macAddress() const;
@@ -54,11 +54,11 @@ public:
     void scanWirelessNetworks();
 
 private:
-    QDBusInterface *m_wirelessInterface;
+    QDBusInterface *m_wirelessInterface = nullptr;
+    WirelessAccessPoint *m_activeAccessPoint = nullptr;
 
-    QString m_macAddress;
     int m_bitRate;
-    WirelessAccessPoint *m_activeAccessPoint;
+    QString m_macAddress;
     QDBusObjectPath m_activeAccessPointObjectPath;
 
     QHash<QDBusObjectPath, WirelessAccessPoint *> m_accessPointsTable;

nymea-networkmanager/application.cpp

@@ -48,6 +48,7 @@ static void catchUnixSignals(const std::vector<int>& quitSignals, const std::vec
             exit(EXIT_FAILURE);
         }
         default:
+            qCDebug(dcApplication()) << "Cought unhandled signal" << sig;
             break;
         }
 

nymea-networkmanager/bluetooth/bluetoothserver.cpp

@@ -221,8 +221,6 @@ void BluetoothServer::onHostModeStateChanged(const QBluetoothLocalDevice::HostMo
     case QBluetoothLocalDevice::HostDiscoverableLimitedInquiry:
         qCDebug(dcBluetoothServer()) << "Bluetooth host in discoverable limited inquiry mode.";
         break;
-    default:
-        break;
     }
 }
 
@@ -283,8 +281,6 @@ void BluetoothServer::onControllerStateChanged(const QLowEnergyController::Contr
         qCDebug(dcBluetoothServer()) << "Controller state advertising...";
         setRunning(true);
         break;
-    default:
-        break;
     }
 }
 
@@ -338,9 +334,6 @@ void BluetoothServer::serviceError(const QLowEnergyService::ServiceError &error)
     case QLowEnergyService::UnknownError:
         errorString = "Unknown error";
         break;
-    default:
-        errorString = "Unhandled error";
-        break;
     }
 
     qCWarning(dcBluetoothServer()) << "Service error:" << errorString;

nymea-networkmanager/bluetooth/bluetoothserver.h

@@ -47,7 +47,7 @@ class BluetoothServer : public QObject
     Q_OBJECT
 public:
 
-    explicit BluetoothServer(QObject *parent = 0);
+    explicit BluetoothServer(QObject *parent = nullptr);
     ~BluetoothServer();
 
     QString machineId() const;

nymea-networkmanager/bluetooth/networkservice.h

@@ -53,7 +53,7 @@ public:
     };
     Q_ENUM(NetworkServiceResponse)
 
-    explicit NetworkService(QLowEnergyService *service, QObject *parent = 0);
+    explicit NetworkService(QLowEnergyService *service, QObject *parent = nullptr);
     ~NetworkService();
 
     QLowEnergyService *service();

nymea-networkmanager/bluetooth/wirelessservice.cpp

@@ -146,9 +146,6 @@ QByteArray WirelessService::getWirelessNetworkDeviceState(const NetworkDevice::N
         return QByteArray::fromHex("0b");
     case NetworkDevice::NetworkDeviceStateFailed:
         return QByteArray::fromHex("0c");
-    default:
-        qCWarning(dcBluetoothServer()) << "WirelessService: Unhandled wireless network device state." << state;
-        break;
     }
 
     // Unknown
@@ -182,8 +179,8 @@ void WirelessService::streamData(const QVariantMap &responseMap)
 QVariantMap WirelessService::createResponse(const WirelessService::WirelessServiceCommand &command, const WirelessService::WirelessServiceResponse &responseCode)
 {
     QVariantMap response;
-    response.insert("c", (int)command);
+    response.insert("c", static_cast<int>(command));
-    response.insert("r", (int)responseCode);
+    response.insert("r", static_cast<int>(responseCode));
     return response;
 }
 
@@ -328,7 +325,7 @@ void WirelessService::commandGetCurrentConnection(const QVariantMap &request)
         connectionDataMap.insert("e", device->activeAccessPoint()->ssid());
         connectionDataMap.insert("m", device->activeAccessPoint()->macAddress());
         connectionDataMap.insert("s", device->activeAccessPoint()->signalStrength());
-        connectionDataMap.insert("p", (int)device->activeAccessPoint()->isProtected());
+        connectionDataMap.insert("p", static_cast<int>(device->activeAccessPoint()->isProtected()));
         connectionDataMap.insert("i", address.toString());
     }
 
@@ -423,9 +420,6 @@ void WirelessService::serviceError(const QLowEnergyService::ServiceError &error)
     case QLowEnergyService::UnknownError:
         errorString = "Unknown error";
         break;
-    default:
-        errorString = "Unhandled error";
-        break;
     }
 
     qCWarning(dcBluetoothServer()) << "WirelessService: Error:" << errorString;

nymea-networkmanager/bluetooth/wirelessservice.h

@@ -61,7 +61,7 @@ public:
     };
     Q_ENUM(WirelessServiceResponse)
 
-    explicit WirelessService(QLowEnergyService *service, QObject *parent = 0);
+    explicit WirelessService(QLowEnergyService *service, QObject *parent = nullptr);
     ~WirelessService();
 
     QLowEnergyService *service();

nymea-networkmanager/core.cpp

@@ -118,8 +118,6 @@ void Core::run()
     case ModeOffline:
         evaluateNetworkManagerState(m_networkManager->state());
         break;
-    default:
-        break;
     }
 
 }
@@ -259,8 +257,6 @@ void Core::onBluetoothServerRunningChanged(bool running)
         case ModeOffline:
             evaluateNetworkManagerState(m_networkManager->state());
             break;
-        default:
-            break;
         }
     }
 }
@@ -305,8 +301,6 @@ void Core::onNetworkManagerAvailableChanged(const bool &available)
     case ModeOffline:
         evaluateNetworkManagerState(m_networkManager->state());
         break;
-    default:
-        break;
     }
 }
 

nymea-networkmanager/core.h

@@ -97,8 +97,6 @@ private slots:
     void onNetworkManagerWirelessDeviceAdded(WirelessNetworkDevice *wirelessDevice);
     void onNetworkManagerWirelessDeviceRemoved(const QString &interface);
 
-
-
     // Wireless device
     void onWirelessDeviceBitRateChanged(int bitRate);
     void onWirelessDeviceStateChanged(const NetworkDevice::NetworkDeviceState state);

nymea-networkmanager/main.cpp

@@ -87,7 +87,6 @@ int main(int argc, char *argv[])
     QString advertiseName = "BT WLAN setup";
     QString platformName = "nymea-box";
 
-
     Application application(argc, argv);
     application.setApplicationName("nymea-networkmanager");
     application.setOrganizationName("nymea");
@@ -115,7 +114,7 @@ int main(int argc, char *argv[])
     timeoutOption.setDefaultValue(QString::number(timeout));
     parser.addOption(timeoutOption);
 
-    QCommandLineOption modeOption(QStringList() << "m" << "mode", "Run the daemon in a specific mode. Default \"offline\".\n\n" \
+    QCommandLineOption modeOption(QStringList() << "m" << "mode", "Run the daemon in a specific mode. Default is \"offline\".\n\n" \
                                   "- offline: this mode starts the bluetooth server once the device is offline and not connected to any LAN network.\n\n" \
                                   "- always: this mode enables the bluetooth server as long the application is running.\n\n" \
                                   "- start: this mode starts the bluetooth server for 3 minutes on start and shuts down after a connection.\n\n", "offline | always | start");