Index: sources/model/MWifiNetwork.h
===================================================================
diff -u -rfdda01b86e25893f54de3d25e83ad0e8f5484a57 -r14a47d3069da79c18dea8b3e817957f5ec2a865a
--- sources/model/MWifiNetwork.h	(.../MWifiNetwork.h)	(revision fdda01b86e25893f54de3d25e83ad0e8f5484a57)
+++ sources/model/MWifiNetwork.h	(.../MWifiNetwork.h)	(revision 14a47d3069da79c18dea8b3e817957f5ec2a865a)
@@ -20,43 +20,108 @@
  */
 class MWifiNetwork {
 public:
-    struct Data
+
+    enum SECURITY_TYPE {
+        UNSUPPORTED,
+        WEP,
+        WPA_TKIP,
+        WPA_TKIP_AES,
+        WPA_AES,
+        WPA2_AES
+    };
+
+    enum SIGNAL_LEVEL
     {
+        NO_SIGNAL,
+        LVL_1,
+        LVL_2,
+        LVL_3,
+        LVL_4,
+        LVL_5
+    };
 
-    public:
-        enum SECURITY_TYPE {
-            UNSUPPORTED,
-            WEP,
-            WPA_TKIP,
-            WPA_TKIP_AES,
-            WPA_AES,
-            WPA2_AES
-        };
+    enum STATUS {
+        NOT_CONNECTED,
+        CONNECTING,
+        CONNECTED,
+        DISCONNECTING
+    };
 
-        enum SIGNAL_LEVEL
+    struct IPSettings {
+        QString mIPAddress;
+        QString mGateway;
+        QString mSubnetMask;
+        QString mBroadcast;
+        QString mDNS;
+    };
+
+    static 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;
+     }
+
+    static QStringList securityTypesToStringList(QList<SECURITY_TYPE> vSecurityTypes)
+    {
+        QStringList result;
+        for (const SECURITY_TYPE &type : vSecurityTypes)
         {
-            NO_SIGNAL,
-            LVL_1,
-            LVL_2,
-            LVL_3,
-            LVL_4,
-            LVL_5
-        };
+            switch (type) {
+                case WEP:
+                {
+                    result.append("WEP");
+                    break;
+                }
+                case WPA_TKIP:
+                {
+                    result.append("WPA_TKIP");
+                    break;
+                }
+                case WPA_TKIP_AES:
+                {
+                    result.append("WPA_TKIP_AES");
+                    break;
+                }
+                case WPA_AES:
+                {
+                    result.append("WPA_AES");
+                    break;
+                }
+                case WPA2_AES:
+                {
+                    result.append("WPA2_AES");
+                    break;
+                }
+                case UNSUPPORTED:
+                {
+                    result.append("UNSUPPORTED");
+                    break;
+                }
+                default:
+                {
+                    result.append("UNKNOWN");
+                    break;
+                }
+            }
+        }
+        return result;
+    }
 
-        enum STATUS {
-            NOT_CONNECTED,
-            CONNECTING,
-            CONNECTED,
-            DISCONNECTING
-        };
+    struct Data
+    {
 
-        struct IPSettings {
-            QString mIPAddress;
-            QString mGateway;
-            QString mSubnetMask;
-            QString mBroadcast;
-            QString mDNS;
-        };
+    public:
 
         IPSettings mIPSettings;
 
@@ -66,113 +131,46 @@
             return false;
         }
 
-        bool operator>(const Data &d1) {
-            if (signalLevel() > d1.signalLevel())
-                return true;
-            return false;
-        }
-
-        bool operator<(const Data &d1) {
-            if (signalLevel() < d1.signalLevel())
-                return true;
-            return false;
-        }
-
         QString ssid() const {
             return _ssid;
         }
+
         void ssid(const QString &vSSID) {
             _ssid = vSSID;
         }
 
-        static QStringList securityTypesToStringList(QList<SECURITY_TYPE> vSecurityTypes)
-        {
-            QStringList result;
-            for (const SECURITY_TYPE &type : vSecurityTypes)
-            {
-                switch (type) {
-                    case WEP:
-                    {
-                        result.append("WEP");
-                        break;
-                    }
-                    case WPA_TKIP:
-                    {
-                        result.append("WPA_TKIP");
-                        break;
-                    }
-                    case WPA_TKIP_AES:
-                    {
-                        result.append("WPA_TKIP_AES");
-                        break;
-                    }
-                    case WPA_AES:
-                    {
-                        result.append("WPA_AES");
-                        break;
-                    }
-                    case WPA2_AES:
-                    {
-                        result.append("WPA2_AES");
-                        break;
-                    }
-                    case UNSUPPORTED:
-                    {
-                        result.append("UNSUPPORTED");
-                        break;
-                    }
-                    default:
-                    {
-                        result.append("UNKNOWN");
-                        break;
-                    }
-                }
-            }
-            return result;
-        }
-
         QList<SECURITY_TYPE> securityTypes() const {
             return _securityTypes;
         }
+
         void securityTypes(const QList<SECURITY_TYPE> &vSecurityTypes) {
             _securityTypes = vSecurityTypes;
         }
+
         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;
         }
 
-        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 Data() {}
         explicit Data(const QString &vMacAddress) {_macAddress = vMacAddress; }
         explicit Data(const QString &vMacAddress, const QString &vSSID, const QList<SECURITY_TYPE> &vSecurityTypes, const STATUS &vStatus, const int &vSignalLevel) {