Index: sources/wifi/Network.h
===================================================================
diff -u -re5a802bc26647388cfea4f1d46ae22570ec2dba3 -rea52cee2614f319804690a9b1d5091bed9676753
--- sources/wifi/Network.h	(.../Network.h)	(revision e5a802bc26647388cfea4f1d46ae22570ec2dba3)
+++ sources/wifi/Network.h	(.../Network.h)	(revision ea52cee2614f319804690a9b1d5091bed9676753)
@@ -22,12 +22,12 @@
         WPA_TKIP,
         WPA_TKIP_AES,
         WPA_AES,
-        WPA2_AES,
+        WPA2_AES_PERSONAL,
+        WPA2_AES_ENTERPRISE
     };
 
     enum SIGNAL_LEVEL
     {
-        REFRESHING,
         NO_SIGNAL,
         LVL_1,
         LVL_2,
@@ -43,27 +43,86 @@
         DISCONNECTING
     };
 
+    bool operator==(const Network &d1) {
+        if (ssid() == d1.ssid())
+            return true;
+        return false;
+    }
+
+    bool operator>(const Network &d1) {
+        if (signalLevel() > d1.signalLevel())
+            return true;
+        return false;
+    }
+
+    bool operator<(const Network &d1) {
+        if (signalLevel() < d1.signalLevel())
+            return true;
+        return false;
+    }
+
     QString ssid() const {
         return _ssid;
     }
+    void ssid(const QString &vSSID) {
+        _ssid = vSSID;
+    }
     SECURITY_LEVEL security() const {
         return _security;
     }
+    void security(const SECURITY_LEVEL &vSecurity) {
+        _security = vSecurity;
+    }
+    SIGNAL_LEVEL signalLevel() const {
+        return _signalLevel;
+    }
+    void signalLevel(const SIGNAL_LEVEL &vLevel) {
+        _signalLevel = vLevel;
+    }
     STATUS status() const {
         return _status;
     }
+    void status(const STATUS &vStatus) {
+        _status = vStatus;
+    }
+    QString macAddress() const {
+        return _macAddress;
+    }
+    void macAddress(const QString &vMacAddress) {
+        _macAddress = vMacAddress;
+    }
 
-    explicit Network();
-    explicit Network(const int vSSID) {_ssid = vSSID; }
-    explicit Network(const int vSSID, const SECURITY_LEVEL vSecurityLevel, const STATUS vStatus) {
+    SIGNAL_LEVEL convertSignalLevel(int vLevel) {
+        if (vLevel == 0)
+             return NO_SIGNAL;
+        else if (vLevel >= -50)
+            return LVL_5;
+        else if (vLevel >= -60)
+            return LVL_4;
+        else if (vLevel >= -70)
+            return LVL_3;
+        else if (vLevel >= -80)
+            return LVL_2;
+        else if (vLevel >= -90)
+            return LVL_1;
+
+        return NO_SIGNAL;
+     }
+
+    explicit Network(const QString &vMacAddress) {_macAddress = vMacAddress; }
+    explicit Network(const QString &vMacAddress, const QString &vSSID, const SECURITY_LEVEL &vSecurityLevel, const STATUS &vStatus, const int &vSignalLevel) {
+        _macAddress = vMacAddress;
         _ssid = vSSID;
         _security = vSecurityLevel;
         _status = vStatus;
+        _signalLevel = convertSignalLevel(vSignalLevel);
     }
 
 private:
-    QString _ssid = "";
+    QString _macAddress;
+    QString _ssid;
     SECURITY_LEVEL _security = UNSUPPORTED;
+    SIGNAL_LEVEL _signalLevel = NO_SIGNAL;
     STATUS _status = NOT_CONNECTED;
 
 };