author | zecke <zecke> | 2004-03-13 21:53:54 (UTC) |
---|---|---|
committer | zecke <zecke> | 2004-03-13 21:53:54 (UTC) |
commit | 2eb5c075b612498c4b65f3d49389b8612612a930 (patch) (side-by-side diff) | |
tree | a0230cd9007f71bbb387b71b8e58684937e0cf70 | |
parent | 184a0cd9935d0a249038cdbe05488c181b273d64 (diff) | |
download | opie-2eb5c075b612498c4b65f3d49389b8612612a930.zip opie-2eb5c075b612498c4b65f3d49389b8612612a930.tar.gz opie-2eb5c075b612498c4b65f3d49389b8612612a930.tar.bz2 |
Introduce the namespace
and the new APPLET_EXPORT define
-rw-r--r-- | noncore/applets/autorotateapplet/autorotate.cpp | 8 | ||||
-rw-r--r-- | noncore/applets/memoryapplet/memorymeter.cpp | 6 | ||||
-rw-r--r-- | noncore/applets/memoryapplet/memorystatus.cpp | 1 | ||||
-rw-r--r-- | noncore/applets/memoryapplet/memorystatus.h | 4 | ||||
-rw-r--r-- | noncore/applets/networkapplet/networkapplet.cpp | 7 | ||||
-rw-r--r-- | noncore/applets/networkapplet/networkapplet.h | 16 | ||||
-rw-r--r-- | noncore/applets/notesapplet/notes.cpp | 8 | ||||
-rw-r--r-- | noncore/applets/wirelessapplet/wireless.cpp | 9 | ||||
-rw-r--r-- | noncore/applets/wirelessapplet/wireless.h | 7 | ||||
-rw-r--r-- | noncore/applets/zkbapplet/zkbwidget.cpp | 7 |
10 files changed, 37 insertions, 36 deletions
diff --git a/noncore/applets/autorotateapplet/autorotate.cpp b/noncore/applets/autorotateapplet/autorotate.cpp index 94be0ae..ae7fbd0 100644 --- a/noncore/applets/autorotateapplet/autorotate.cpp +++ b/noncore/applets/autorotateapplet/autorotate.cpp @@ -24,4 +24,3 @@ -using namespace Opie; - +using namespace Opie::Ui; AutoRotate::AutoRotate(QWidget * parent):QWidget(parent) @@ -96,6 +95,3 @@ bool AutoRotate::isRotateEnabled() -Q_EXPORT_INTERFACE() -{ - Q_CREATE_INSTANCE( OTaskbarAppletWrapper<AutoRotate> ); -} +EXPORT_OPIE_APPLET_v1( AutoRotate ) diff --git a/noncore/applets/memoryapplet/memorymeter.cpp b/noncore/applets/memoryapplet/memorymeter.cpp index 9299f49..9cdeaf4 100644 --- a/noncore/applets/memoryapplet/memorymeter.cpp +++ b/noncore/applets/memoryapplet/memorymeter.cpp @@ -33,2 +33,3 @@ +using namespace Opie::Ui; MemoryMeter::MemoryMeter( QWidget *parent ) @@ -242,6 +243,3 @@ void MemoryMeter::paintEvent( QPaintEvent* ) -Q_EXPORT_INTERFACE() -{ - Q_CREATE_INSTANCE( OTaskbarAppletWrapper<MemoryMeter> ); -} +EXPORT_OPIE_APPLET_v1( MemoryMeter ) diff --git a/noncore/applets/memoryapplet/memorystatus.cpp b/noncore/applets/memoryapplet/memorystatus.cpp index c01ba28..95ae06b 100644 --- a/noncore/applets/memoryapplet/memorystatus.cpp +++ b/noncore/applets/memoryapplet/memorystatus.cpp @@ -30,2 +30,3 @@ +using namespace Opie::Ui; MemoryStatus::MemoryStatus(QWidget *parent, WFlags f ) diff --git a/noncore/applets/memoryapplet/memorystatus.h b/noncore/applets/memoryapplet/memorystatus.h index c3926db..d16787b 100644 --- a/noncore/applets/memoryapplet/memorystatus.h +++ b/noncore/applets/memoryapplet/memorystatus.h @@ -28,3 +28,3 @@ class MemoryInfo; class Swapfile; -using Opie::OTabWidget; + @@ -44,3 +44,3 @@ public: private: - OTabWidget *tab; + Opie::Ui::OTabWidget *tab; }; diff --git a/noncore/applets/networkapplet/networkapplet.cpp b/noncore/applets/networkapplet/networkapplet.cpp index 955ed2e..5eb5ad2 100644 --- a/noncore/applets/networkapplet/networkapplet.cpp +++ b/noncore/applets/networkapplet/networkapplet.cpp @@ -47,2 +47,4 @@ +using namespace Opie::Ui; +using namespace Opie::Net; IfaceUpDownButton::IfaceUpDownButton( QWidget* parent, const char* name ) @@ -248,7 +250,4 @@ void NetworkApplet::mousePressEvent( QMouseEvent* ) +EXPORT_OPIE_APPLET_v1( NetworkApplet ) -Q_EXPORT_INTERFACE() -{ - Q_CREATE_INSTANCE( OTaskbarAppletWrapper<NetworkApplet> ); -} diff --git a/noncore/applets/networkapplet/networkapplet.h b/noncore/applets/networkapplet/networkapplet.h index 8022537..1e2cac8 100644 --- a/noncore/applets/networkapplet/networkapplet.h +++ b/noncore/applets/networkapplet/networkapplet.h @@ -40,3 +40,9 @@ + +namespace Opie { +namespace Net { + class ONetwork; class ONetworkInterface; +} +} class QShowEvent; @@ -57,3 +63,3 @@ class IfaceUpDownButton : public QToolButton private: - ONetworkInterface* _iface; + Opie::Net::ONetworkInterface* _iface; }; @@ -73,3 +79,3 @@ class IfaceIPAddress : public QLineEdit private: - ONetworkInterface* _iface; + Opie::Net::ONetworkInterface* _iface; }; @@ -79,3 +85,3 @@ class NetworkAppletControl : public QFrame public: - NetworkAppletControl( OTaskbarApplet* parent, const char* name = 0 ); + NetworkAppletControl( Opie::Ui::OTaskbarApplet* parent, const char* name = 0 ); ~NetworkAppletControl(); @@ -87,3 +93,3 @@ class NetworkAppletControl : public QFrame virtual void hideEvent( QHideEvent* ); - QString guessDevice( ONetworkInterface* iface ); + QString guessDevice( Opie::Net::ONetworkInterface* iface ); void build(); @@ -96,3 +102,3 @@ class NetworkAppletControl : public QFrame -class NetworkApplet : public OTaskbarApplet +class NetworkApplet : public Opie::Ui::OTaskbarApplet { diff --git a/noncore/applets/notesapplet/notes.cpp b/noncore/applets/notesapplet/notes.cpp index 9b5e475..13f7cf3 100644 --- a/noncore/applets/notesapplet/notes.cpp +++ b/noncore/applets/notesapplet/notes.cpp @@ -48,2 +48,3 @@ /* XPM */ +using namespace Opie::Ui; static char * notes_xpm[] = { @@ -510,5 +511,4 @@ void NotesApplet::paintEvent( QPaintEvent* ) { -Q_EXPORT_INTERFACE() -{ - Q_CREATE_INSTANCE( OTaskbarAppletWrapper<NotesApplet> ); -} + +EXPORT_OPIE_APPLET_v1( NotesApplet ) + 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 @@ +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; diff --git a/noncore/applets/zkbapplet/zkbwidget.cpp b/noncore/applets/zkbapplet/zkbwidget.cpp index 0083e9b..3acff1e 100644 --- a/noncore/applets/zkbapplet/zkbwidget.cpp +++ b/noncore/applets/zkbapplet/zkbwidget.cpp @@ -10,2 +10,3 @@ +using namespace Opie::Ui; ZkbWidget::ZkbWidget(QWidget* parent):QLabel(parent),keymap(0), @@ -157,6 +158,4 @@ void ZkbWidget::reload() { -Q_EXPORT_INTERFACE() -{ - Q_CREATE_INSTANCE( OTaskbarAppletWrapper<ZkbWidget> ); -} +EXPORT_OPIE_APPLET_v1( ZkbWidget ) + |