Index: sources/wifi/WifiInterface.cpp
===================================================================
diff -u -r08ab5b3dbe26b4c7b7bb2ac539b1cfd62a4676c7 -rfdda01b86e25893f54de3d25e83ad0e8f5484a57
--- sources/wifi/WifiInterface.cpp	(.../WifiInterface.cpp)	(revision 08ab5b3dbe26b4c7b7bb2ac539b1cfd62a4676c7)
+++ sources/wifi/WifiInterface.cpp	(.../WifiInterface.cpp)	(revision fdda01b86e25893f54de3d25e83ad0e8f5484a57)
@@ -51,15 +51,15 @@
  * Gets the last network we connected to from settings
  * \return (Network) the network we last connected to
  */
-Network WifiInterface::getLastWifiNetworkConnectedTo()
+WifiNetworkData WifiInterface::getLastWifiNetworkConnectedTo()
 {
     QString macAddress = WifiSettings.value(WifiSettings_MacAddress).toString();
     QString ssid = WifiSettings.value(WifiSettings_SSID).toString();
     QList<QVariant> securityTypesVar = WifiSettings.value(WifiSettings_Security_Types).toList();
-    Network::STATUS status = Network::STATUS::NOT_CONNECTED;
-    Network::SIGNAL_LEVEL signalLevel = Network::SIGNAL_LEVEL::NO_SIGNAL;
+    WifiNetworkData::STATUS status = WifiNetworkData::STATUS::NOT_CONNECTED;
+    WifiNetworkData::SIGNAL_LEVEL signalLevel = WifiNetworkData::SIGNAL_LEVEL::NO_SIGNAL;
     _useDHCP = WifiSettings.value(WifiSettings_UseDHCP).toBool();
-    return Network(macAddress, ssid, variantListToSecurityTypes(securityTypesVar), status, signalLevel);
+    return WifiNetworkData(macAddress, ssid, variantListToSecurityTypes(securityTypesVar), status, signalLevel);
 }
 
 /*!
@@ -326,9 +326,9 @@
  *
  * \param vOutput - (QString) output collected from QProcess execution
  */
-QList<Network> WifiInterface::parseWifiScan(const QString &vOutput)
+QList<WifiNetworkData> WifiInterface::parseWifiScan(const QString &vOutput)
 {
-    QList<Network> networks;
+    QList<WifiNetworkData> networks;
     QString outputNoReturns = vOutput;
     outputNoReturns = outputNoReturns.replace("\r", "");
     QStringList temp = outputNoReturns.split("Cell");
@@ -345,7 +345,7 @@
                 continue;
             QString macAddress = getTextBetweenDelimiters(cell, searchTermMacAddress, "\n").trimmed();
             int signalLevel = getTextBetweenDelimiters(cell, searchTermSignalLevel, "dBm").trimmed().toInt();
-            QList<Network::SECURITY_TYPE> securityTypes;
+            QList<WifiNetworkData::SECURITY_TYPE> securityTypes;
             bool requiresKey = QRegularExpression("Encryption key:on").match(cell).hasMatch();
 
             QStringList infoElement = cell.split("IE: ");
@@ -358,24 +358,24 @@
                 bool requiresPSK = QRegularExpression("Authentication Suites.*PSK").match(element).hasMatch();
                 bool supportsTKIP = QRegularExpression("Pairwise Ciphers.*TKIP").match(element).hasMatch();
 
-                Network::SECURITY_TYPE securityType = Network::SECURITY_TYPE::UNSUPPORTED;
+                WifiNetworkData::SECURITY_TYPE securityType = WifiNetworkData::SECURITY_TYPE::UNSUPPORTED;
 
                 if (isWPA2 && requiresPSK && supportsAES && !supportsTKIP)
-                    securityType = Network::SECURITY_TYPE::WPA2_AES;
+                    securityType = WifiNetworkData::SECURITY_TYPE::WPA2_AES;
                 else if (isWPA && requiresPSK && supportsAES && supportsTKIP)
-                    securityType = Network::SECURITY_TYPE::WPA_TKIP_AES;
+                    securityType = WifiNetworkData::SECURITY_TYPE::WPA_TKIP_AES;
                 else if (isWPA && requiresPSK && supportsTKIP)
-                    securityType = Network::SECURITY_TYPE::WPA_TKIP;
+                    securityType = WifiNetworkData::SECURITY_TYPE::WPA_TKIP;
                 else if (isWPA && requiresPSK && supportsAES)
-                    securityType = Network::SECURITY_TYPE::WPA_AES;
+                    securityType = WifiNetworkData::SECURITY_TYPE::WPA_AES;
                 else if (!isWPA && !isWPA2 && !requiresPSK && !supportsAES && !supportsTKIP && requiresKey)
-                    securityType = Network::SECURITY_TYPE::WEP;
+                    securityType = WifiNetworkData::SECURITY_TYPE::WEP;
 
-                if (securityType != Network::SECURITY_TYPE::UNSUPPORTED)
+                if (securityType != WifiNetworkData::SECURITY_TYPE::UNSUPPORTED)
                     securityTypes.append(securityType);
             }
 
-            Network network(macAddress, ssid, securityTypes, Network::STATUS::NOT_CONNECTED, signalLevel);
+            WifiNetworkData network(macAddress, ssid, securityTypes, WifiNetworkData::STATUS::NOT_CONNECTED, signalLevel);
             networks.append(network);
             emit didAddNetwork(network);
         }
@@ -400,7 +400,7 @@
  * \param vMacAddress - (QString) the mac address of the network to join
  * \param vPassword - (QString) the password for the network provided by the user
  */
-void WifiInterface::doJoinNetwork(const Network &vNetwork, const QString &vPassword)
+void WifiInterface::doJoinNetwork(const WifiNetworkData &vNetwork, const QString &vPassword)
 {
     _network = vNetwork;
     _useDHCP = true;
@@ -414,13 +414,13 @@
         return;
     }
     QString securityType;
-    if (vNetwork.securityTypes().contains(Network::SECURITY_TYPE::WPA2_AES))
+    if (vNetwork.securityTypes().contains(WifiNetworkData::SECURITY_TYPE::WPA2_AES))
         securityType = "wpa2";
-    else if (vNetwork.securityTypes().contains(Network::SECURITY_TYPE::WPA_TKIP_AES)
-             || vNetwork.securityTypes().contains(Network::SECURITY_TYPE::WPA_AES)
-             || vNetwork.securityTypes().contains(Network::SECURITY_TYPE::WPA_TKIP))
+    else if (vNetwork.securityTypes().contains(WifiNetworkData::SECURITY_TYPE::WPA_TKIP_AES)
+             || vNetwork.securityTypes().contains(WifiNetworkData::SECURITY_TYPE::WPA_AES)
+             || vNetwork.securityTypes().contains(WifiNetworkData::SECURITY_TYPE::WPA_TKIP))
         securityType = "wpa";
-    else if (vNetwork.securityTypes().contains(Network::SECURITY_TYPE::WEP))
+    else if (vNetwork.securityTypes().contains(WifiNetworkData::SECURITY_TYPE::WEP))
         securityType = "wep";
     else
     {
@@ -626,7 +626,7 @@
  * Disconnects from the specified network
  * \param vNetwork - (Network) the network to disconnect from
  */
-void WifiInterface::doDisconnectNetwork(const Network &vNetwork)
+void WifiInterface::doDisconnectNetwork(const WifiNetworkData &vNetwork)
 {
     LOG_DEBUG(QString("Disconnecting from Network %1").arg(vNetwork.ssid()));
     if (_processDisconnectNetwork.state() != QProcess::NotRunning)
@@ -887,10 +887,10 @@
  * \param securityTypes (QList<Network::SECURITY_TYPE>) the list of security type
  * \return (QStringList) the security types as a string list
  */
-QStringList WifiInterface::securityTypesToStringList(const QList<Network::SECURITY_TYPE> &securityTypes)
+QStringList WifiInterface::securityTypesToStringList(const QList<WifiNetworkData::SECURITY_TYPE> &securityTypes)
 {
     QStringList securityTypesStrList;
-    for (const Network::SECURITY_TYPE &type : securityTypes)
+    for (const WifiNetworkData::SECURITY_TYPE &type : securityTypes)
     {
         securityTypesStrList.append(QString("%1").arg(type));
     }
@@ -903,13 +903,13 @@
  * \param securityTypesVar (QVariantList) security types
  * \return (QList<Network::SECURITY_TYPE>) the list of network security types
  */
-QList<Network::SECURITY_TYPE> WifiInterface::variantListToSecurityTypes(const QList<QVariant> &securityTypesVar)
+QList<WifiNetworkData::SECURITY_TYPE> WifiInterface::variantListToSecurityTypes(const QList<QVariant> &securityTypesVar)
 {
-    QList<Network::SECURITY_TYPE> securityTypes;
+    QList<WifiNetworkData::SECURITY_TYPE> securityTypes;
     for (const QVariant &type : securityTypesVar)
     {
         bool ok = false;
-        Network::SECURITY_TYPE val = Network::SECURITY_TYPE(type.toInt(&ok));
+        WifiNetworkData::SECURITY_TYPE val = WifiNetworkData::SECURITY_TYPE(type.toInt(&ok));
         if (ok)
             securityTypes.append(val);
     }