Introduce the namespace

and the new APPLET_EXPORT define

2 files changed, 10 insertions, 8 deletions

diff --git a/noncore/applets/wirelessapplet/wireless.cpp b/noncore/applets/wirelessapplet/wireless.cpp
index 6ef2e44..f244426 100644
--- a/noncore/applets/wirelessapplet/wireless.cpp
+++ b/noncore/applets/wirelessapplet/wireless.cpp
@@ -28,2 +28,3 @@
 #include <qpe/config.h>
+#include <qpe/qpeapplication.h>
 
@@ -50,2 +51,4 @@
 
+using namespace Opie::Ui;
+using namespace Opie::Net;
 WirelessControl::WirelessControl( WirelessApplet *applet, QWidget *parent, const char *name )
@@ -552,7 +555,3 @@ int WirelessApplet::position()
 
-
-Q_EXPORT_INTERFACE()
-{
-    Q_CREATE_INSTANCE( OTaskbarAppletWrapper<WirelessApplet> );
-}
+EXPORT_OPIE_APPLET_v1(  WirelessApplet )
 
diff --git a/noncore/applets/wirelessapplet/wireless.h b/noncore/applets/wirelessapplet/wireless.h
index 27f8c90..b475a46 100644
--- a/noncore/applets/wirelessapplet/wireless.h
+++ b/noncore/applets/wirelessapplet/wireless.h
@@ -21,3 +21,6 @@
 
-class OWirelessNetworkInterface;
+namespace Opie {namespace Net {
+    class OWirelessNetworkInterface;
+}
+}
 class Y;
@@ -88,3 +91,3 @@ class WirelessApplet : public QWidget
 
-    OWirelessNetworkInterface* interface;
+    Opie::Net::OWirelessNetworkInterface* interface;
 
@@ -92,3 +95,3 @@ class WirelessApplet : public QWidget
     const char** oldpixmap;
-    OWirelessNetworkInterface* oldiface;
+    Opie::Net::OWirelessNetworkInterface* oldiface;
     int oldqualityH;