author | kergoth <kergoth> | 2002-10-15 22:23:31 (UTC) |
---|---|---|
committer | kergoth <kergoth> | 2002-10-15 22:23:31 (UTC) |
commit | fcc5702d6c6b4d6ecba51451ea491bcc4799b88a (patch) (unidiff) | |
tree | 71f1c6b6e12400ee6c23a6223ed8d68562728c50 | |
parent | 7d5423828f77d2584a5fe3924c226ce3f565baf2 (diff) | |
download | opie-fcc5702d6c6b4d6ecba51451ea491bcc4799b88a.zip opie-fcc5702d6c6b4d6ecba51451ea491bcc4799b88a.tar.gz opie-fcc5702d6c6b4d6ecba51451ea491bcc4799b88a.tar.bz2 |
Ugly hack, not a solution, but should at least be usable
-rw-r--r-- | noncore/net/networksetup/wlan/wlanmodule.cpp | 2 | ||||
-rw-r--r-- | noncore/settings/networksettings/wlan/wlanmodule.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/noncore/net/networksetup/wlan/wlanmodule.cpp b/noncore/net/networksetup/wlan/wlanmodule.cpp index 70b1f7a..321fa11 100644 --- a/noncore/net/networksetup/wlan/wlanmodule.cpp +++ b/noncore/net/networksetup/wlan/wlanmodule.cpp | |||
@@ -1,84 +1,84 @@ | |||
1 | #include "wlanmodule.h" | 1 | #include "wlanmodule.h" |
2 | #include <qpe/config.h> | 2 | #include <qpe/config.h> |
3 | #include "wlanimp.h" | 3 | #include "wlanimp.h" |
4 | 4 | ||
5 | /** | 5 | /** |
6 | * Constructor, find all of the possible interfaces | 6 | * Constructor, find all of the possible interfaces |
7 | */ | 7 | */ |
8 | WLANModule::WLANModule() : Module() { | 8 | WLANModule::WLANModule() : Module() { |
9 | // get output from iwconfig | 9 | // get output from iwconfig |
10 | } | 10 | } |
11 | 11 | ||
12 | /** | 12 | /** |
13 | * get the icon name for this device. | 13 | * get the icon name for this device. |
14 | * @param Interface* can be used in determining the icon. | 14 | * @param Interface* can be used in determining the icon. |
15 | * @return QString the icon name (minus .png, .gif etc) | 15 | * @return QString the icon name (minus .png, .gif etc) |
16 | */ | 16 | */ |
17 | QString WLANModule::getPixmapName(Interface* ){ | 17 | QString WLANModule::getPixmapName(Interface* ){ |
18 | return "wlan"; | 18 | return "wlan"; |
19 | } | 19 | } |
20 | 20 | ||
21 | /** | 21 | /** |
22 | * Check to see if the interface i is owned by this module. | 22 | * Check to see if the interface i is owned by this module. |
23 | * @param Interface* interface to check against | 23 | * @param Interface* interface to check against |
24 | * @return bool true if i is owned by this module, false otherwise. | 24 | * @return bool true if i is owned by this module, false otherwise. |
25 | */ | 25 | */ |
26 | bool WLANModule::isOwner(Interface *i){ | 26 | bool WLANModule::isOwner(Interface *i){ |
27 | if(i->getInterfaceName() == "eth0") | 27 | if(i->getInterfaceName() == "eth0" || i->getInterfaceName() == "wlan0") |
28 | return true; | 28 | return true; |
29 | return false; | 29 | return false; |
30 | } | 30 | } |
31 | 31 | ||
32 | /** | 32 | /** |
33 | * Create, set tabWiget and return the WLANConfigure Module | 33 | * Create, set tabWiget and return the WLANConfigure Module |
34 | * @param tabWidget a pointer to the tab widget that this configure has. | 34 | * @param tabWidget a pointer to the tab widget that this configure has. |
35 | * @return QWidget* pointer to the tab widget in this modules configure. | 35 | * @return QWidget* pointer to the tab widget in this modules configure. |
36 | */ | 36 | */ |
37 | QWidget *WLANModule::configure(QTabWidget **tabWidget){ | 37 | QWidget *WLANModule::configure(QTabWidget **tabWidget){ |
38 | Config cfg("wireless"); | 38 | Config cfg("wireless"); |
39 | WLANImp *wlanconfig = new WLANImp(cfg); | 39 | WLANImp *wlanconfig = new WLANImp(cfg); |
40 | (*tabWidget) = wlanconfig->tabWidget; | 40 | (*tabWidget) = wlanconfig->tabWidget; |
41 | return wlanconfig; | 41 | return wlanconfig; |
42 | } | 42 | } |
43 | 43 | ||
44 | /** | 44 | /** |
45 | * Create, set tabWiget and return the Information Module | 45 | * Create, set tabWiget and return the Information Module |
46 | * @param tabWidget a pointer to the tab widget that this information has. | 46 | * @param tabWidget a pointer to the tab widget that this information has. |
47 | * @return QWidget* pointer to the tab widget in this modules info. | 47 | * @return QWidget* pointer to the tab widget in this modules info. |
48 | */ | 48 | */ |
49 | QWidget *WLANModule::information(QTabWidget **tabWidget){ | 49 | QWidget *WLANModule::information(QTabWidget **tabWidget){ |
50 | return NULL; | 50 | return NULL; |
51 | } | 51 | } |
52 | 52 | ||
53 | /** | 53 | /** |
54 | * Get all active (up or down) interfaces | 54 | * Get all active (up or down) interfaces |
55 | * @return QList<Interface> A list of interfaces that exsist that havn't | 55 | * @return QList<Interface> A list of interfaces that exsist that havn't |
56 | * been called by isOwner() | 56 | * been called by isOwner() |
57 | */ | 57 | */ |
58 | QList<Interface> WLANModule::getInterfaces(){ | 58 | QList<Interface> WLANModule::getInterfaces(){ |
59 | return list; | 59 | return list; |
60 | } | 60 | } |
61 | 61 | ||
62 | /** | 62 | /** |
63 | * Attempt to add a new interface as defined by name | 63 | * Attempt to add a new interface as defined by name |
64 | * @param name the name of the type of interface that should be created given | 64 | * @param name the name of the type of interface that should be created given |
65 | * by possibleNewInterfaces(); | 65 | * by possibleNewInterfaces(); |
66 | * @return Interface* NULL if it was unable to be created. | 66 | * @return Interface* NULL if it was unable to be created. |
67 | */ | 67 | */ |
68 | Interface *WLANModule::addNewInterface(QString ){ | 68 | Interface *WLANModule::addNewInterface(QString ){ |
69 | // We can't add a 802.11 interface, either the hardware will be there | 69 | // We can't add a 802.11 interface, either the hardware will be there |
70 | // or it wont. | 70 | // or it wont. |
71 | return NULL; | 71 | return NULL; |
72 | } | 72 | } |
73 | 73 | ||
74 | /** | 74 | /** |
75 | * Attempts to remove the interface, doesn't delete i | 75 | * Attempts to remove the interface, doesn't delete i |
76 | * @return bool true if successfull, false otherwise. | 76 | * @return bool true if successfull, false otherwise. |
77 | */ | 77 | */ |
78 | bool WLANModule::remove(Interface*){ | 78 | bool WLANModule::remove(Interface*){ |
79 | // Can't remove a hardware device, you can stop it though. | 79 | // Can't remove a hardware device, you can stop it though. |
80 | return false; | 80 | return false; |
81 | } | 81 | } |
82 | 82 | ||
83 | // wlanmodule.cpp | 83 | // wlanmodule.cpp |
84 | 84 | ||
diff --git a/noncore/settings/networksettings/wlan/wlanmodule.cpp b/noncore/settings/networksettings/wlan/wlanmodule.cpp index 70b1f7a..321fa11 100644 --- a/noncore/settings/networksettings/wlan/wlanmodule.cpp +++ b/noncore/settings/networksettings/wlan/wlanmodule.cpp | |||
@@ -1,84 +1,84 @@ | |||
1 | #include "wlanmodule.h" | 1 | #include "wlanmodule.h" |
2 | #include <qpe/config.h> | 2 | #include <qpe/config.h> |
3 | #include "wlanimp.h" | 3 | #include "wlanimp.h" |
4 | 4 | ||
5 | /** | 5 | /** |
6 | * Constructor, find all of the possible interfaces | 6 | * Constructor, find all of the possible interfaces |
7 | */ | 7 | */ |
8 | WLANModule::WLANModule() : Module() { | 8 | WLANModule::WLANModule() : Module() { |
9 | // get output from iwconfig | 9 | // get output from iwconfig |
10 | } | 10 | } |
11 | 11 | ||
12 | /** | 12 | /** |
13 | * get the icon name for this device. | 13 | * get the icon name for this device. |
14 | * @param Interface* can be used in determining the icon. | 14 | * @param Interface* can be used in determining the icon. |
15 | * @return QString the icon name (minus .png, .gif etc) | 15 | * @return QString the icon name (minus .png, .gif etc) |
16 | */ | 16 | */ |
17 | QString WLANModule::getPixmapName(Interface* ){ | 17 | QString WLANModule::getPixmapName(Interface* ){ |
18 | return "wlan"; | 18 | return "wlan"; |
19 | } | 19 | } |
20 | 20 | ||
21 | /** | 21 | /** |
22 | * Check to see if the interface i is owned by this module. | 22 | * Check to see if the interface i is owned by this module. |
23 | * @param Interface* interface to check against | 23 | * @param Interface* interface to check against |
24 | * @return bool true if i is owned by this module, false otherwise. | 24 | * @return bool true if i is owned by this module, false otherwise. |
25 | */ | 25 | */ |
26 | bool WLANModule::isOwner(Interface *i){ | 26 | bool WLANModule::isOwner(Interface *i){ |
27 | if(i->getInterfaceName() == "eth0") | 27 | if(i->getInterfaceName() == "eth0" || i->getInterfaceName() == "wlan0") |
28 | return true; | 28 | return true; |
29 | return false; | 29 | return false; |
30 | } | 30 | } |
31 | 31 | ||
32 | /** | 32 | /** |
33 | * Create, set tabWiget and return the WLANConfigure Module | 33 | * Create, set tabWiget and return the WLANConfigure Module |
34 | * @param tabWidget a pointer to the tab widget that this configure has. | 34 | * @param tabWidget a pointer to the tab widget that this configure has. |
35 | * @return QWidget* pointer to the tab widget in this modules configure. | 35 | * @return QWidget* pointer to the tab widget in this modules configure. |
36 | */ | 36 | */ |
37 | QWidget *WLANModule::configure(QTabWidget **tabWidget){ | 37 | QWidget *WLANModule::configure(QTabWidget **tabWidget){ |
38 | Config cfg("wireless"); | 38 | Config cfg("wireless"); |
39 | WLANImp *wlanconfig = new WLANImp(cfg); | 39 | WLANImp *wlanconfig = new WLANImp(cfg); |
40 | (*tabWidget) = wlanconfig->tabWidget; | 40 | (*tabWidget) = wlanconfig->tabWidget; |
41 | return wlanconfig; | 41 | return wlanconfig; |
42 | } | 42 | } |
43 | 43 | ||
44 | /** | 44 | /** |
45 | * Create, set tabWiget and return the Information Module | 45 | * Create, set tabWiget and return the Information Module |
46 | * @param tabWidget a pointer to the tab widget that this information has. | 46 | * @param tabWidget a pointer to the tab widget that this information has. |
47 | * @return QWidget* pointer to the tab widget in this modules info. | 47 | * @return QWidget* pointer to the tab widget in this modules info. |
48 | */ | 48 | */ |
49 | QWidget *WLANModule::information(QTabWidget **tabWidget){ | 49 | QWidget *WLANModule::information(QTabWidget **tabWidget){ |
50 | return NULL; | 50 | return NULL; |
51 | } | 51 | } |
52 | 52 | ||
53 | /** | 53 | /** |
54 | * Get all active (up or down) interfaces | 54 | * Get all active (up or down) interfaces |
55 | * @return QList<Interface> A list of interfaces that exsist that havn't | 55 | * @return QList<Interface> A list of interfaces that exsist that havn't |
56 | * been called by isOwner() | 56 | * been called by isOwner() |
57 | */ | 57 | */ |
58 | QList<Interface> WLANModule::getInterfaces(){ | 58 | QList<Interface> WLANModule::getInterfaces(){ |
59 | return list; | 59 | return list; |
60 | } | 60 | } |
61 | 61 | ||
62 | /** | 62 | /** |
63 | * Attempt to add a new interface as defined by name | 63 | * Attempt to add a new interface as defined by name |
64 | * @param name the name of the type of interface that should be created given | 64 | * @param name the name of the type of interface that should be created given |
65 | * by possibleNewInterfaces(); | 65 | * by possibleNewInterfaces(); |
66 | * @return Interface* NULL if it was unable to be created. | 66 | * @return Interface* NULL if it was unable to be created. |
67 | */ | 67 | */ |
68 | Interface *WLANModule::addNewInterface(QString ){ | 68 | Interface *WLANModule::addNewInterface(QString ){ |
69 | // We can't add a 802.11 interface, either the hardware will be there | 69 | // We can't add a 802.11 interface, either the hardware will be there |
70 | // or it wont. | 70 | // or it wont. |
71 | return NULL; | 71 | return NULL; |
72 | } | 72 | } |
73 | 73 | ||
74 | /** | 74 | /** |
75 | * Attempts to remove the interface, doesn't delete i | 75 | * Attempts to remove the interface, doesn't delete i |
76 | * @return bool true if successfull, false otherwise. | 76 | * @return bool true if successfull, false otherwise. |
77 | */ | 77 | */ |
78 | bool WLANModule::remove(Interface*){ | 78 | bool WLANModule::remove(Interface*){ |
79 | // Can't remove a hardware device, you can stop it though. | 79 | // Can't remove a hardware device, you can stop it though. |
80 | return false; | 80 | return false; |
81 | } | 81 | } |
82 | 82 | ||
83 | // wlanmodule.cpp | 83 | // wlanmodule.cpp |
84 | 84 | ||