Diffstat (limited to 'noncore/settings/networksettings/wlan') (more/less context) (show whitespace changes)
-rw-r--r-- | noncore/settings/networksettings/wlan/wlan.ui | 4 | ||||
-rw-r--r-- | noncore/settings/networksettings/wlan/wlanmodule.cpp | 21 | ||||
-rw-r--r-- | noncore/settings/networksettings/wlan/wlanmodule.h | 2 |
3 files changed, 13 insertions, 14 deletions
diff --git a/noncore/settings/networksettings/wlan/wlan.ui b/noncore/settings/networksettings/wlan/wlan.ui index dcacbe8..9f33559 100644 --- a/noncore/settings/networksettings/wlan/wlan.ui +++ b/noncore/settings/networksettings/wlan/wlan.ui @@ -11,7 +11,7 @@ <rect> <x>0</x> <y>0</y> - <width>254</width> + <width>250</width> <height>286</height> </rect> </property> @@ -53,7 +53,7 @@ </property> <attribute> <name>title</name> - <string>Config</string> + <string>WLAN General</string> </attribute> <vbox> <property stdset="1"> diff --git a/noncore/settings/networksettings/wlan/wlanmodule.cpp b/noncore/settings/networksettings/wlan/wlanmodule.cpp index 632f7e4..70b1f7a 100644 --- a/noncore/settings/networksettings/wlan/wlanmodule.cpp +++ b/noncore/settings/networksettings/wlan/wlanmodule.cpp @@ -20,6 +20,7 @@ QString WLANModule::getPixmapName(Interface* ){ /** * Check to see if the interface i is owned by this module. + * @param Interface* interface to check against * @return bool true if i is owned by this module, false otherwise. */ bool WLANModule::isOwner(Interface *i){ @@ -50,17 +51,12 @@ QWidget *WLANModule::information(QTabWidget **tabWidget){ } /** - * + * Get all active (up or down) interfaces + * @return QList<Interface> A list of interfaces that exsist that havn't + * been called by isOwner() */ QList<Interface> WLANModule::getInterfaces(){ - return list -} - -/** - * Return a list of possible new interfaces - */ -QMap<QString, QString> WLANModule::possibleNewInterfaces(){ - //return list; + return list; } /** @@ -69,7 +65,9 @@ QMap<QString, QString> WLANModule::possibleNewInterfaces(){ * by possibleNewInterfaces(); * @return Interface* NULL if it was unable to be created. */ -Interface *WLANModule::addNewInterface(QString name){ +Interface *WLANModule::addNewInterface(QString ){ + // We can't add a 802.11 interface, either the hardware will be there + // or it wont. return NULL; } @@ -77,7 +75,8 @@ Interface *WLANModule::addNewInterface(QString name){ * Attempts to remove the interface, doesn't delete i * @return bool true if successfull, false otherwise. */ -bool WLANModule::remove(Interface* i){ +bool WLANModule::remove(Interface*){ + // Can't remove a hardware device, you can stop it though. return false; } diff --git a/noncore/settings/networksettings/wlan/wlanmodule.h b/noncore/settings/networksettings/wlan/wlanmodule.h index 1fbf6a9..7ebe129 100644 --- a/noncore/settings/networksettings/wlan/wlanmodule.h +++ b/noncore/settings/networksettings/wlan/wlanmodule.h @@ -15,7 +15,7 @@ public: virtual QWidget *configure(QTabWidget **tabWidget); virtual QWidget *information(QTabWidget **tabWidget); virtual QList<Interface> getInterfaces(); - virtual QMap<QString, QString> possibleNewInterfaces(); + virtual void possibleNewInterfaces(QMap<QString, QString> &list){}; virtual Interface *addNewInterface(QString name); virtual bool remove(Interface* i); virtual QString getPixmapName(Interface* i); |