summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--noncore/applets/wirelessapplet/wireless.cpp55
-rw-r--r--noncore/applets/wirelessapplet/wireless.h1
-rw-r--r--noncore/applets/wirelessapplet/wirelessapplet.pro8
-rw-r--r--noncore/applets/wirelessapplet/wirelessappletimpl.cpp66
-rw-r--r--noncore/applets/wirelessapplet/wirelessappletimpl.h43
5 files changed, 39 insertions, 134 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,7 +1,5 @@
/**********************************************************************
-** 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
** GNU General Public License version 2 as published by the Free Software
@@ -14,11 +12,23 @@
**********************************************************************/
#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>
#include <qpushbutton.h>
@@ -33,22 +43,10 @@
#include <qfile.h>
#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
@@ -226,6 +224,7 @@ void WirelessApplet::checkInterface()
#ifdef MDEBUG
qDebug( "WIFIAPPLET: using interface '%s'", (const char*) interface->getName() );
#endif
+
}
else
{
@@ -314,8 +313,7 @@ void WirelessApplet::displayStyleChange( int style )
}
WirelessApplet::~WirelessApplet()
-{
-}
+{}
void WirelessApplet::timerEvent( QTimerEvent* )
{
@@ -329,7 +327,8 @@ void WirelessApplet::timerEvent( QTimerEvent* )
interface = 0;
mustRepaint();
return;
- } else
+ }
+ else
if ( mustRepaint() )
{
//qDebug( "WIFIAPPLET: A value has changed -> repainting." );
@@ -338,7 +337,8 @@ void WirelessApplet::timerEvent( QTimerEvent* )
if ( status->isVisible() )
updatePopupWindow();
- } else checkInterface();
+ }
+ else checkInterface();
}
void WirelessApplet::mousePressEvent( QMouseEvent *)
@@ -537,3 +537,16 @@ void WirelessApplet::paintEvent( QPaintEvent* )
}
}
}
+
+
+int WirelessApplet::position()
+{
+ return 6;
+}
+
+
+Q_EXPORT_INTERFACE()
+{
+ Q_CREATE_INSTANCE( OTaskbarAppletWrapper<WirelessApplet> );
+}
+
diff --git a/noncore/applets/wirelessapplet/wireless.h b/noncore/applets/wirelessapplet/wireless.h
index 51a3fab..644be26 100644
--- a/noncore/applets/wirelessapplet/wireless.h
+++ b/noncore/applets/wirelessapplet/wireless.h
@@ -65,6 +65,7 @@ class WirelessApplet : public QWidget
public:
WirelessApplet( QWidget *parent = 0, const char *name=0 );
~WirelessApplet();
+ static int position();
WirelessControl* status;
virtual void timerEvent( QTimerEvent* );
diff --git a/noncore/applets/wirelessapplet/wirelessapplet.pro b/noncore/applets/wirelessapplet/wirelessapplet.pro
index 411a039..38cb475 100644
--- a/noncore/applets/wirelessapplet/wirelessapplet.pro
+++ b/noncore/applets/wirelessapplet/wirelessapplet.pro
@@ -1,13 +1,13 @@
TEMPLATE = lib
CONFIG += qt plugin warn_on release
-HEADERS = wireless.h wirelessappletimpl.h networkinfo.h mgraph.h advancedconfig.h
-SOURCES = wireless.cpp wirelessappletimpl.cpp networkinfo.cpp mgraph.cpp advancedconfig.cpp
+HEADERS = wireless.h networkinfo.h mgraph.h advancedconfig.h
+SOURCES = wireless.cpp networkinfo.cpp mgraph.cpp advancedconfig.cpp
INTERFACES = advancedconfigbase.ui
TARGET = wirelessapplet
DESTDIR = $(OPIEDIR)/plugins/applets
INCLUDEPATH += $(OPIEDIR)/include
-DEPENDPATH += ../$(OPIEDIR)/include
+DEPENDPATH += $(OPIEDIR)/include
LIBS += -lqpe
-VERSION = 0.1.0
+VERSION = 0.1.1
include ( $(OPIEDIR)/include.pro )
diff --git a/noncore/applets/wirelessapplet/wirelessappletimpl.cpp b/noncore/applets/wirelessapplet/wirelessappletimpl.cpp
deleted file mode 100644
index de70714..0000000
--- a/noncore/applets/wirelessapplet/wirelessappletimpl.cpp
+++ b/dev/null
@@ -1,66 +0,0 @@
-/**********************************************************************
-** Copyright (C) 2000 Trolltech AS. All rights reserved.
-**
-** This file is part of Qtopia Environment.
-**
-** This file may be distributed and/or modified under the terms of the
-** GNU General Public License version 2 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.
-**
-** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
-** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-**
-** See http://www.trolltech.com/gpl/ for GPL licensing information.
-**
-** Contact info@trolltech.com if any conditions of this licensing are
-** not clear to you.
-**
-**********************************************************************/
-#include "wireless.h"
-#include "wirelessappletimpl.h"
-
-
-WirelessAppletImpl::WirelessAppletImpl()
- : wireless(0)
-{
-}
-
-WirelessAppletImpl::~WirelessAppletImpl()
-{
- delete wireless;
-}
-
-QWidget *WirelessAppletImpl::applet( QWidget *parent )
-{
- if ( !wireless )
- wireless = new WirelessApplet( parent );
- return wireless;
-}
-
-int WirelessAppletImpl::position() const
-{
- return 6;
-}
-
-QRESULT WirelessAppletImpl::queryInterface( const QUuid &uuid, QUnknownInterface **iface )
-{
- *iface = 0;
- if ( uuid == IID_QUnknown )
- *iface = this;
- else if ( uuid == IID_TaskbarApplet )
- *iface = this;
- else
- return QS_FALSE;
-
- if ( *iface )
- (*iface)->addRef();
- return QS_OK;
-}
-
-Q_EXPORT_INTERFACE()
-{
- Q_CREATE_INSTANCE( WirelessAppletImpl )
-}
-
-
diff --git a/noncore/applets/wirelessapplet/wirelessappletimpl.h b/noncore/applets/wirelessapplet/wirelessappletimpl.h
deleted file mode 100644
index 1bf4507..0000000
--- a/noncore/applets/wirelessapplet/wirelessappletimpl.h
+++ b/dev/null
@@ -1,43 +0,0 @@
-/**********************************************************************
-** Copyright (C) 2000 Trolltech AS. All rights reserved.
-**
-** This file is part of Qtopia Environment.
-**
-** This file may be distributed and/or modified under the terms of the
-** GNU General Public License version 2 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.
-**
-** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
-** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-**
-** See http://www.trolltech.com/gpl/ for GPL licensing information.
-**
-** Contact info@trolltech.com if any conditions of this licensing are
-** not clear to you.
-**
-**********************************************************************/
-#ifndef WIRELESSAPPLETIMPL_H
-#define WIRELESSAPPLETIMPL_H
-
-#include <qpe/taskbarappletinterface.h>
-
-class WirelessApplet;
-
-class WirelessAppletImpl : public TaskbarAppletInterface
-{
-public:
- WirelessAppletImpl();
- virtual ~WirelessAppletImpl();
-
- QRESULT queryInterface( const QUuid&, QUnknownInterface** );
- Q_REFCOUNT
-
- virtual QWidget *applet( QWidget *parent );
- virtual int position() const;
-
-private:
- WirelessApplet *wireless;
-};
-
-#endif