author | mickeyl <mickeyl> | 2004-04-09 15:00:06 (UTC) |
---|---|---|
committer | mickeyl <mickeyl> | 2004-04-09 15:00:06 (UTC) |
commit | fb2f09533c7476a266a877c351007c2706b2da0d (patch) (unidiff) | |
tree | 9742d4cb8fd07fd5530c3c29b5f049dcecd46ef4 /noncore/settings/networksettings/wlan/wlanimp2.cpp | |
parent | 39547839995c9f72ca9216ba5c2127246428ece8 (diff) | |
download | opie-fb2f09533c7476a266a877c351007c2706b2da0d.zip opie-fb2f09533c7476a266a877c351007c2706b2da0d.tar.gz opie-fb2f09533c7476a266a877c351007c2706b2da0d.tar.bz2 |
- eliminate cylic dependency
- complete using opie debugging framework
- sanitize #include order
Diffstat (limited to 'noncore/settings/networksettings/wlan/wlanimp2.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/settings/networksettings/wlan/wlanimp2.cpp | 26 |
1 files changed, 14 insertions, 12 deletions
diff --git a/noncore/settings/networksettings/wlan/wlanimp2.cpp b/noncore/settings/networksettings/wlan/wlanimp2.cpp index e4aa2f9..4294b12 100644 --- a/noncore/settings/networksettings/wlan/wlanimp2.cpp +++ b/noncore/settings/networksettings/wlan/wlanimp2.cpp | |||
@@ -1,13 +1,22 @@ | |||
1 | #include "wlanimp2.h" | 1 | #include "wlanimp2.h" |
2 | #include "keyedit.h" | 2 | #include "keyedit.h" |
3 | #include "interfacesetupimp.h" | 3 | #include "interfacesetupimp.h" |
4 | |||
5 | #include "../interfaces/interface.h" | 4 | #include "../interfaces/interface.h" |
6 | 5 | ||
7 | #include <assert.h> | 6 | #include <assert.h> |
8 | #include <errno.h> | 7 | #include <errno.h> |
9 | #include <string.h> | 8 | #include <string.h> |
10 | 9 | ||
10 | /* OPIE */ | ||
11 | #include <opie2/odebug.h> | ||
12 | #include <opie2/oprocess.h> | ||
13 | #include <opie2/onetwork.h> | ||
14 | #include <opie2/opcap.h> | ||
15 | #include <qpe/resource.h> | ||
16 | using namespace Opie::Core; | ||
17 | using namespace Opie::Net; | ||
18 | |||
19 | /* QT */ | ||
11 | #include <qapplication.h> | 20 | #include <qapplication.h> |
12 | #include <qfile.h> | 21 | #include <qfile.h> |
13 | #include <qdir.h> | 22 | #include <qdir.h> |
@@ -26,15 +35,10 @@ | |||
26 | #include <qvbox.h> | 35 | #include <qvbox.h> |
27 | #include <qprogressbar.h> | 36 | #include <qprogressbar.h> |
28 | 37 | ||
29 | #ifdef QWS | 38 | /* STD */ |
30 | #include <qpe/resource.h> | 39 | #include <assert.h> |
31 | #include <opie2/oprocess.h> | 40 | #include <errno.h> |
32 | #include <opie2/onetwork.h> | 41 | #include <string.h> |
33 | #include <opie2/opcap.h> | ||
34 | #else | ||
35 | #define OProcess KProcess | ||
36 | #include <kprocess.h> | ||
37 | #endif | ||
38 | 42 | ||
39 | #define WIRELESS_OPTS "/etc/pcmcia/wireless.opts" | 43 | #define WIRELESS_OPTS "/etc/pcmcia/wireless.opts" |
40 | #define PREUP "/etc/network/if-pre-up.d/wireless-tools" | 44 | #define PREUP "/etc/network/if-pre-up.d/wireless-tools" |
@@ -42,8 +46,6 @@ | |||
42 | /** | 46 | /** |
43 | * Constructor, read in the wireless.opts file for parsing later. | 47 | * Constructor, read in the wireless.opts file for parsing later. |
44 | */ | 48 | */ |
45 | using namespace Opie::Net; | ||
46 | using namespace Opie::Core; | ||
47 | WLANImp::WLANImp( QWidget* parent, const char* name, Interface *i, bool modal, WFlags fl) : WLAN(parent, name, modal, fl), interface(i), currentProfile("*") { | 49 | WLANImp::WLANImp( QWidget* parent, const char* name, Interface *i, bool modal, WFlags fl) : WLAN(parent, name, modal, fl), interface(i), currentProfile("*") { |
48 | interfaces = new Interfaces(); | 50 | interfaces = new Interfaces(); |
49 | interfaceSetup = new InterfaceSetupImp(tabWidget, "InterfaceSetupImp", i, interfaces); | 51 | interfaceSetup = new InterfaceSetupImp(tabWidget, "InterfaceSetupImp", i, interfaces); |