Index: sources/view/VNetworkModel.cpp
===================================================================
diff -u -r08ab5b3dbe26b4c7b7bb2ac539b1cfd62a4676c7 -rfdda01b86e25893f54de3d25e83ad0e8f5484a57
--- sources/view/VNetworkModel.cpp	(.../VNetworkModel.cpp)	(revision 08ab5b3dbe26b4c7b7bb2ac539b1cfd62a4676c7)
+++ sources/view/VNetworkModel.cpp	(.../VNetworkModel.cpp)	(revision fdda01b86e25893f54de3d25e83ad0e8f5484a57)
@@ -16,17 +16,17 @@
 void VNetworkModel::initConnections()
 {
     // incoming
-    connect(&_WifiInterface, SIGNAL(didAddNetwork(const Network)),
-            this,            SLOT(onAddNetwork(const Network)));
+    connect(&_WifiInterface, SIGNAL(didAddNetwork(const WifiNetworkData)),
+            this,            SLOT(onAddNetwork(const WifiNetworkData)));
 
     connect(&_WifiInterface, SIGNAL(didScanStatusChanged(const bool)),
             this,            SLOT(onScanStatusChanged(const bool)));
 
-    connect(&_WifiInterface, SIGNAL(didConnectToNetwork(const Network)),
-            this,            SLOT(onConnectedToNetwork(const Network)));
+    connect(&_WifiInterface, SIGNAL(didConnectToNetwork(const WifiNetworkData)),
+            this,            SLOT(onConnectedToNetwork(const WifiNetworkData)));
 
-    connect(&_WifiInterface, SIGNAL(didDisconnectNetwork(Network)),
-            this,            SLOT(onDisconnectedNetwork(const Network)));
+    connect(&_WifiInterface, SIGNAL(didDisconnectNetwork(WifiNetworkData)),
+            this,            SLOT(onDisconnectedNetwork(const WifiNetworkData)));
 
     connect(&_WifiInterface, SIGNAL(didError(const QString)),
             this,            SLOT(onStatusChanged(const QString)));
@@ -51,11 +51,11 @@
     connect(this,            SIGNAL(didScan()),
             &_WifiInterface, SLOT(doScan()));
 
-    connect(this,            SIGNAL(didJoinNetwork(const Network, const QString)),
-            &_WifiInterface, SLOT(doJoinNetwork(const Network, const QString)));
+    connect(this,            SIGNAL(didJoinNetwork(const WifiNetworkData, const QString)),
+            &_WifiInterface, SLOT(doJoinNetwork(const WifiNetworkData, const QString)));
 
-    connect(this,            SIGNAL(didDisconnectNetwork(Network)),
-            &_WifiInterface, SLOT(doDisconnectNetwork(const Network)));
+    connect(this,            SIGNAL(didDisconnectNetwork(WifiNetworkData)),
+            &_WifiInterface, SLOT(doDisconnectNetwork(const WifiNetworkData)));
 
     connect(this,            SIGNAL(didRequestIPSettings()),
             &_WifiInterface, SLOT(doRequestIPSettings()));
@@ -81,7 +81,7 @@
  * Adds a network to the network model
  * \param network (Network) - the network to add to the model
  */
-void VNetworkModel::addNetwork(const Network &vNetwork)
+void VNetworkModel::addNetwork(const WifiNetworkData &vNetwork)
 {
     LOG_DEBUG(QString("Adding network with SSID: %1").arg(vNetwork.ssid()));
     beginInsertRows(QModelIndex(), rowCount(), rowCount());
@@ -126,7 +126,7 @@
     if (index.row() < 0 || index.row() >= _networks.count())
         return QVariant();
 
-    const Network &network = _networks[index.row()];
+    const WifiNetworkData &network = _networks[index.row()];
 
     switch (role)
     {
@@ -176,7 +176,7 @@
  * Slot that receives a request to add a new network
  * \param vNetwork - (Network) the new network to add
  */
-void VNetworkModel::onAddNetwork(const Network &vNetwork)
+void VNetworkModel::onAddNetwork(const WifiNetworkData &vNetwork)
 {
     if (!_networks.contains(vNetwork))
     {
@@ -223,7 +223,7 @@
 void VNetworkModel::doJoinNetwork(const QString &vMacAddress, const QString &vPassword)
 {
     clearSelectedNetwork();
-    for (const Network &network : _networks)
+    for (const WifiNetworkData &network : _networks)
     {
         if (network.macAddress() == vMacAddress)
         {
@@ -241,7 +241,7 @@
  */
 void VNetworkModel::doDisconnectNetwork(const QString &vMacAddress)
 {
-    for (const Network &network : _networks)
+    for (const WifiNetworkData &network : _networks)
     {
         if (network.macAddress() == vMacAddress)
         {
@@ -257,7 +257,7 @@
  * Called when we have connected to a network.
  * \param vNetwork - (Network) the network we have connected to
  */
-void VNetworkModel::onConnectedToNetwork(const Network &vNetwork)
+void VNetworkModel::onConnectedToNetwork(const WifiNetworkData &vNetwork)
 {
     LOG_DEBUG(QString("Connected to %1.").arg(vNetwork.ssid()));
     ipAddress(vNetwork.mIPSettings.mIPAddress);
@@ -274,7 +274,7 @@
  * Called when we have disconnected from a network.
  * \param vNetwork - (Network) the network we have disconnected from
  */
-void VNetworkModel::onDisconnectedNetwork(const Network &vNetwork)
+void VNetworkModel::onDisconnectedNetwork(const WifiNetworkData &vNetwork)
 {
     LOG_DEBUG(QString("Disconnected from %1.").arg(vNetwork.ssid()));
     clearSelectedNetwork();