Index: sources/view/VNetworkModel.h =================================================================== diff -u -r08ab5b3dbe26b4c7b7bb2ac539b1cfd62a4676c7 -rfdda01b86e25893f54de3d25e83ad0e8f5484a57 --- sources/view/VNetworkModel.h (.../VNetworkModel.h) (revision 08ab5b3dbe26b4c7b7bb2ac539b1cfd62a4676c7) +++ sources/view/VNetworkModel.h (.../VNetworkModel.h) (revision fdda01b86e25893f54de3d25e83ad0e8f5484a57) @@ -7,7 +7,7 @@ // Project #include "main.h" #include "VView.h" -#include "Network.h" +#include "MWifiNetwork.h" // forward declarations @@ -48,14 +48,14 @@ SignalLevelRole, }; - void addNetwork (const Network &network); + void addNetwork (const WifiNetworkData &network); int rowCount (const QModelIndex &parent = QModelIndex()) const; QVariant data (const QModelIndex &index, int role = Qt::DisplayRole) const; void removeAllRows(); signals: void didScan(); - void didJoinNetwork(const Network, const QString); - void didDisconnectNetwork(const Network); + void didJoinNetwork(const WifiNetworkData, const QString); + void didDisconnectNetwork(const WifiNetworkData); void didRequestIPSettings(); // set IP addresses @@ -83,14 +83,14 @@ void initConnections(); void clearSelectedNetwork(); - QList _networks; + QList _networks; private slots: - void onAddNetwork(const Network &vNetwork); + void onAddNetwork(const WifiNetworkData &vNetwork); void onScanStatusChanged(const bool &vScanning); void onStatusChanged(const QString &vNewStatus); - void onConnectedToNetwork(const Network &vNetwork); - void onDisconnectedNetwork(const Network &vNetwork); + void onConnectedToNetwork(const WifiNetworkData &vNetwork); + void onDisconnectedNetwork(const WifiNetworkData &vNetwork); // static IP address assignment confirmation void onSetIPAddressSuccess();