- eliminate cylic dependency

- complete using opie debugging framework
- sanitize #include order

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
@@ -3,3 +3,2 @@
 #include "interfacesetupimp.h"
-
 #include "../interfaces/interface.h"
@@ -10,2 +9,12 @@
 
+/* OPIE */
+#include <opie2/odebug.h>
+#include <opie2/oprocess.h>
+#include <opie2/onetwork.h>
+#include <opie2/opcap.h>
+#include <qpe/resource.h>
+using namespace Opie::Core;
+using namespace Opie::Net;
+
+/* QT */
 #include <qapplication.h>
@@ -28,11 +37,6 @@
 
-#ifdef QWS
- #include <qpe/resource.h>
- #include <opie2/oprocess.h>
- #include <opie2/onetwork.h>
- #include <opie2/opcap.h>
-#else
- #define OProcess KProcess
- #include <kprocess.h>
-#endif
+/* STD */
+#include <assert.h>
+#include <errno.h>
+#include <string.h>
 
@@ -44,4 +48,2 @@
  */
-using namespace Opie::Net;
-using namespace Opie::Core;
 WLANImp::WLANImp( QWidget* parent, const char* name, Interface *i, bool modal, WFlags fl) : WLAN(parent, name, modal, fl), interface(i), currentProfile("*") {