1 files changed, 34 insertions, 21 deletions

diff --git a/noncore/applets/wirelessapplet/wireless.cpp b/noncore/applets/wirelessapplet/wireless.cpp
index 763aab8..cbaf5d6 100644
--- a/noncore/applets/wirelessapplet/wireless.cpp
+++ b/noncore/applets/wirelessapplet/wireless.cpp
@@ -1,6 +1,4 @@
 /**********************************************************************
-** Copyright (C) 2002 Michael 'Mickey' Lauer
-**               <mickey@tm.informatik.uni-frankfurt.de>
-**               http://www.Vanille.de
+** Copyright (C) 2002-2004 Michael 'Mickey' Lauer <mickey@vanille.de>
 **
 ** This file may be distributed and/or modified under the terms of the
@@ -15,9 +13,21 @@
 
 #include "wireless.h"
+#include "networkinfo.h"
+#include "mgraph.h"
+#include "advancedconfig.h"
+#include "connect0.xpm"
+#include "connect1.xpm"
+#include "connect2.xpm"
+#include "connect3.xpm"
+#include "connect4.xpm"
+#include "connect5.xpm"
+#include "nowireless.xpm"
 
-#include <qapplication.h>
+/* OPIE */
+#include <opie2/otaskbarapplet.h>
 #include <qpe/qpeapplication.h>
 #include <qpe/config.h>
 
+/* QT */
 #include <qpoint.h>
 #include <qradiobutton.h>
@@ -34,20 +44,8 @@
 #include <qtextstream.h>
 
+/* STD */
 #include <sys/types.h>
 #include <signal.h>
 
-#include "networkinfo.h"
-#include "mgraph.h"
-
-#include "advancedconfig.h"
-
-#include "connect0.xpm"
-#include "connect1.xpm"
-#include "connect2.xpm"
-#include "connect3.xpm"
-#include "connect4.xpm"
-#include "connect5.xpm"
-#include "nowireless.xpm"
-
 #define STYLE_BARS 0
 #define STYLE_ANTENNA 1
@@ -227,4 +225,5 @@ void WirelessApplet::checkInterface()
         qDebug( "WIFIAPPLET: using interface '%s'", (const char*) interface->getName() );
 #endif
+
     }
     else
@@ -315,6 +314,5 @@ void WirelessApplet::displayStyleChange( int style )
 
 WirelessApplet::~WirelessApplet()
-{
-}
+{}
 
 void WirelessApplet::timerEvent( QTimerEvent* )
@@ -330,5 +328,6 @@ void WirelessApplet::timerEvent( QTimerEvent* )
             mustRepaint();
             return;
-        } else
+        }
+        else
         if ( mustRepaint() )
         {
@@ -339,5 +338,6 @@ void WirelessApplet::timerEvent( QTimerEvent* )
         if ( status->isVisible() )
             updatePopupWindow();
-    } else checkInterface();
+    }
+    else checkInterface();
 }
 
@@ -538,2 +538,15 @@ void WirelessApplet::paintEvent( QPaintEvent* )
     }    
 }
+
+
+int WirelessApplet::position()
+{
+    return 6;
+}
+
+
+Q_EXPORT_INTERFACE()
+{
+    Q_CREATE_INSTANCE( OTaskbarAppletWrapper<WirelessApplet> );
+}
+