Index: sources/wifi/WifiInterface.h
===================================================================
diff -u -r08ab5b3dbe26b4c7b7bb2ac539b1cfd62a4676c7 -rfdda01b86e25893f54de3d25e83ad0e8f5484a57
--- sources/wifi/WifiInterface.h	(.../WifiInterface.h)	(revision 08ab5b3dbe26b4c7b7bb2ac539b1cfd62a4676c7)
+++ sources/wifi/WifiInterface.h	(.../WifiInterface.h)	(revision fdda01b86e25893f54de3d25e83ad0e8f5484a57)
@@ -7,7 +7,7 @@
 
 // Project
 #include "main.h"
-#include "Network.h"
+#include "MWifiNetwork.h"
 
 // define
 #define _WifiInterface WifiInterface::I()
@@ -49,7 +49,7 @@
     QProcess _processSetStaticGateway;
     QProcess _processSetStaticSubnetMask;
     QProcess _processSetDNS;
-    Network _network;
+    WifiNetworkData _network;
 
     const QString _iface                 = "wlan0";
     const QString _wpaSupplicantConfPath = "/etc/wpa_supplicant.conf";
@@ -59,7 +59,7 @@
 
 private:
     QString getTextBetweenDelimiters(const QString &vText, const QString &vLeftDelim, const QString &vRightDelim);
-    QList<Network> parseWifiScan(const QString &vOutput);
+    QList<WifiNetworkData> parseWifiScan(const QString &vOutput);
     QString parseIP(const QString &vOutput);
     QString parseBroadcast(const QString &vOutput);
     QString parseSubnetMask(const QString &vOutput);
@@ -70,10 +70,10 @@
     void initThread(QThread &vThread);
     void quitThread();
     bool hasConnectedToWifi();
-    Network getLastWifiNetworkConnectedTo();
+    WifiNetworkData getLastWifiNetworkConnectedTo();
     void rejoinLastWifiNetwork();
-    QStringList securityTypesToStringList(const QList<Network::SECURITY_TYPE> &securityTypes);
-    QList<Network::SECURITY_TYPE> variantListToSecurityTypes(const QList<QVariant> &securityTypesVar);
+    QStringList securityTypesToStringList(const QList<WifiNetworkData::SECURITY_TYPE> &securityTypes);
+    QList<WifiNetworkData::SECURITY_TYPE> variantListToSecurityTypes(const QList<QVariant> &securityTypesVar);
 
 public:
     void start();
@@ -82,8 +82,8 @@
     bool init(QThread &vThread);
     bool init();
     void doScan();
-    void doJoinNetwork(const Network &vNetwork, const QString &vPassword);
-    void doDisconnectNetwork(const Network &vNetwork);
+    void doJoinNetwork(const WifiNetworkData &vNetwork, const QString &vPassword);
+    void doDisconnectNetwork(const WifiNetworkData &vNetwork);
     void doRequestIPSettings();
 
     // static IP address assignment
@@ -94,8 +94,8 @@
 
 signals:
     void didStart(QPrivateSignal);
-    void didAddNetwork(const Network);
-    void didDisconnectNetwork(const Network);
+    void didAddNetwork(const WifiNetworkData);
+    void didDisconnectNetwork(const WifiNetworkData);
     void didRejectRequest(const QString &vFunction, const QString &vReason);
     void didBusyChanged(const bool &vBusy);
     void didStatusChanged(const QString &vNewStatus);
@@ -108,7 +108,7 @@
 
     // emitted from separate threads
     void didScanStatusChanged(const bool);
-    void didConnectToNetwork(const Network);
+    void didConnectToNetwork(const WifiNetworkData);
     void didError(const QString);
 
 private slots: