- eliminate cylic dependency

- complete using opie debugging framework
- sanitize #include order

6 files changed, 31 insertions, 18 deletions

diff --git a/noncore/settings/networksettings/wlan/config.in b/noncore/settings/networksettings/wlan/config.in
index d4661cb..233764e 100644
--- a/noncore/settings/networksettings/wlan/config.in
+++ b/noncore/settings/networksettings/wlan/config.in
@@ -2,5 +2,5 @@
     boolean "opie-networksettingsplugin-wlan (wireless LAN module)"
-    default "n" if NETWORKSETUP
+    default "y"
     depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2UI && NETWORKSETUP && NETWORKSETUP-CORE && INTERFACES && LIBOPIE2NET
     #comment "opie-networksettingsplugin-wlan needs libopie2ui, libopie2net and networksetup"
-    #depends !( LIBOPIE2NET && NETWORKSETUP)
\ No newline at end of file
+    #depends !( LIBOPIE2NET && NETWORKSETUP)
diff --git a/noncore/settings/networksettings/wlan/infoimp.cpp b/noncore/settings/networksettings/wlan/infoimp.cpp
index c558f5e..273bed8 100644
--- a/noncore/settings/networksettings/wlan/infoimp.cpp
+++ b/noncore/settings/networksettings/wlan/infoimp.cpp
@@ -3,2 +3,7 @@
 
+/* OPIE */
+#include <opie2/odebug.h>
+using namespace Opie::Core;
+
+/* QT */
 #include <qtimer.h>
diff --git a/noncore/settings/networksettings/wlan/wextensions.cpp b/noncore/settings/networksettings/wlan/wextensions.cpp
index 9c64323..fe21f02 100644
--- a/noncore/settings/networksettings/wlan/wextensions.cpp
+++ b/noncore/settings/networksettings/wlan/wextensions.cpp
@@ -2,2 +2,7 @@
 
+/* OPIE */
+#include <opie2/odebug.h>
+using namespace Opie::Core;
+
+/* QT */
 #include <qfile.h>
@@ -5,2 +10,3 @@
 
+/* STD */
 #include <arpa/inet.h>
@@ -8,3 +14,2 @@
 #include <sys/ioctl.h>
-
 #include <math.h>
@@ -15,2 +20,4 @@
 
+#warning This is duplicated code. Use libopienet2!
+
 /**
diff --git a/noncore/settings/networksettings/wlan/wlan.pro b/noncore/settings/networksettings/wlan/wlan.pro
index 89867ae..c94dc0e 100644
--- a/noncore/settings/networksettings/wlan/wlan.pro
+++ b/noncore/settings/networksettings/wlan/wlan.pro
@@ -1,6 +1,3 @@
-#
 TEMPLATE        = lib
-#TEMPLATE        = app
 CONFIG          += qt plugin warn_on 
-#CONFIG		+= qt plugin warn_on 
 DESTDIR         = $(OPIEDIR)/plugins/networksettings
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("*") {
diff --git a/noncore/settings/networksettings/wlan/wlanmodule.cpp b/noncore/settings/networksettings/wlan/wlanmodule.cpp
index 886af10..ba89fa4 100644
--- a/noncore/settings/networksettings/wlan/wlanmodule.cpp
+++ b/noncore/settings/networksettings/wlan/wlanmodule.cpp
@@ -8,3 +8,5 @@
 /* OPIE */
+#include <opie2/odebug.h>
 #include <qpe/qpeapplication.h>
+using namespace Opie::Core;