summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/applets/autorotateapplet/autorotate.cpp8
-rw-r--r--noncore/applets/memoryapplet/memorymeter.cpp26
-rw-r--r--noncore/applets/memoryapplet/memorystatus.cpp1
-rw-r--r--noncore/applets/memoryapplet/memorystatus.h4
-rw-r--r--noncore/applets/networkapplet/networkapplet.cpp7
-rw-r--r--noncore/applets/networkapplet/networkapplet.h18
-rw-r--r--noncore/applets/notesapplet/notes.cpp8
-rw-r--r--noncore/applets/wirelessapplet/wireless.cpp9
-rw-r--r--noncore/applets/wirelessapplet/wireless.h9
-rw-r--r--noncore/applets/zkbapplet/zkbwidget.cpp11
10 files changed, 51 insertions, 50 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
@@ -22,8 +22,7 @@
22/* QT */ 22/* QT */
23#include <qpainter.h> 23#include <qpainter.h>
24 24
25using namespace Opie; 25using namespace Opie::Ui;
26
27AutoRotate::AutoRotate(QWidget * parent):QWidget(parent) 26AutoRotate::AutoRotate(QWidget * parent):QWidget(parent)
28{ 27{
29 setFixedWidth( AppLnk::smallIconSize() ); 28 setFixedWidth( AppLnk::smallIconSize() );
@@ -94,8 +93,5 @@ bool AutoRotate::isRotateEnabled()
94 return res; 93 return res;
95} 94}
96 95
97Q_EXPORT_INTERFACE() 96EXPORT_OPIE_APPLET_v1( AutoRotate )
98{
99 Q_CREATE_INSTANCE( OTaskbarAppletWrapper<AutoRotate> );
100}
101 97
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
@@ -31,16 +31,17 @@
31 31
32#include <qtopia/applnk.h> 32#include <qtopia/applnk.h>
33 33
34using namespace Opie::Ui;
34MemoryMeter::MemoryMeter( QWidget *parent ) 35MemoryMeter::MemoryMeter( QWidget *parent )
35 : QWidget( parent ), memoryView(0) 36 : QWidget( parent ), memoryView(0)
36{ 37{
37 bvsz = QSize(); 38 bvsz = QSize();
38 if ( qApp->desktop()->height() >= 300 ) 39 if ( qApp->desktop()->height() >= 300 )
39 { 40 {
40 memoryView = new MemoryStatus( 0, WStyle_StaysOnTop | WType_Popup ); 41 memoryView = new MemoryStatus( 0, WStyle_StaysOnTop | WType_Popup );
41 memoryView->setFrameStyle( QFrame::Panel | QFrame::Raised ); 42 memoryView->setFrameStyle( QFrame::Panel | QFrame::Raised );
42 } 43 }
43 else 44 else
44 { 45 {
45 memoryView = new MemoryStatus( 0 ); 46 memoryView = new MemoryStatus( 0 );
46 memoryView->showMaximized(); 47 memoryView->showMaximized();
@@ -79,11 +80,11 @@ bool MemoryMeter::updateMemoryViewGeometry()
79 if (memoryView != 0) 80 if (memoryView != 0)
80 { 81 {
81 QSize sz = memoryView->sizeHint(); 82 QSize sz = memoryView->sizeHint();
82 if ( sz != bvsz ) 83 if ( sz != bvsz )
83 { 84 {
84 bvsz = sz; 85 bvsz = sz;
85 QRect r(memoryView->pos(), memoryView->sizeHint()); 86 QRect r(memoryView->pos(), memoryView->sizeHint());
86 if ( qApp->desktop()->height() >= 300 ) 87 if ( qApp->desktop()->height() >= 300 )
87 { 88 {
88 QPoint curPos = mapToGlobal( rect().topLeft() ); 89 QPoint curPos = mapToGlobal( rect().topLeft() );
89 int lp = qApp->desktop()->width() - memoryView->sizeHint().width(); 90 int lp = qApp->desktop()->width() - memoryView->sizeHint().width();
@@ -100,11 +101,11 @@ bool MemoryMeter::updateMemoryViewGeometry()
100 101
101void MemoryMeter::mousePressEvent( QMouseEvent *) 102void MemoryMeter::mousePressEvent( QMouseEvent *)
102{ 103{
103 if ( memoryView->isVisible() ) 104 if ( memoryView->isVisible() )
104 { 105 {
105 memoryView->hide(); 106 memoryView->hide();
106 } 107 }
107 else 108 else
108 { 109 {
109 bvsz = QSize(); 110 bvsz = QSize();
110 updateMemoryViewGeometry(); 111 updateMemoryViewGeometry();
@@ -206,7 +207,7 @@ void MemoryMeter::paintEvent( QPaintEvent* )
206 // 207 //
207 // Drained section. 208 // Drained section.
208 // 209 //
209 if (used_height != 0) 210 if (used_height != 0)
210 { 211 {
211 p.setPen(NoPen); 212 p.setPen(NoPen);
212 p.setBrush(gray); 213 p.setBrush(gray);
@@ -223,7 +224,7 @@ void MemoryMeter::paintEvent( QPaintEvent* )
223 // 224 //
224 // Unused section. 225 // Unused section.
225 // 226 //
226 if ( batt_height - used_height > 0 ) 227 if ( batt_height - used_height > 0 )
227 { 228 {
228 int unused_offset = used_height + batt_yoffset; 229 int unused_offset = used_height + batt_yoffset;
229 int unused_height = batt_height - used_height; 230 int unused_height = batt_height - used_height;
@@ -240,8 +241,5 @@ void MemoryMeter::paintEvent( QPaintEvent* )
240 } 241 }
241} 242}
242 243
243Q_EXPORT_INTERFACE() 244EXPORT_OPIE_APPLET_v1( MemoryMeter )
244{
245 Q_CREATE_INSTANCE( OTaskbarAppletWrapper<MemoryMeter> );
246}
247 245
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
@@ -28,6 +28,7 @@
28 28
29#include <qlayout.h> 29#include <qlayout.h>
30 30
31using namespace Opie::Ui;
31MemoryStatus::MemoryStatus(QWidget *parent, WFlags f ) 32MemoryStatus::MemoryStatus(QWidget *parent, WFlags f )
32 : QFrame(parent, 0, f), mi(0), sf(0) 33 : QFrame(parent, 0, f), mi(0), sf(0)
33{ 34{
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
@@ -26,7 +26,7 @@
26 26
27class MemoryInfo; 27class MemoryInfo;
28class Swapfile; 28class Swapfile;
29using Opie::OTabWidget; 29
30 30
31class MemoryStatus : public QFrame 31class MemoryStatus : public QFrame
32{ 32{
@@ -42,7 +42,7 @@ public:
42 int percent(); 42 int percent();
43 43
44private: 44private:
45 OTabWidget *tab; 45 Opie::Ui::OTabWidget *tab;
46}; 46};
47 47
48#endif 48#endif
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
@@ -45,6 +45,8 @@
45 45
46#include <assert.h> 46#include <assert.h>
47 47
48using namespace Opie::Ui;
49using namespace Opie::Net;
48IfaceUpDownButton::IfaceUpDownButton( QWidget* parent, const char* name ) 50IfaceUpDownButton::IfaceUpDownButton( QWidget* parent, const char* name )
49 :QToolButton( parent, name ) 51 :QToolButton( parent, name )
50{ 52{
@@ -246,9 +248,6 @@ void NetworkApplet::mousePressEvent( QMouseEvent* )
246 } 248 }
247} 249}
248 250
251EXPORT_OPIE_APPLET_v1( NetworkApplet )
249 252
250Q_EXPORT_INTERFACE()
251{
252 Q_CREATE_INSTANCE( OTaskbarAppletWrapper<NetworkApplet> );
253}
254 253
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
@@ -38,7 +38,13 @@
38#include <qlineedit.h> 38#include <qlineedit.h>
39#include <qpixmap.h> 39#include <qpixmap.h>
40 40
41class ONetworkInterface; 41
42namespace Opie {
43namespace Net {
44 class ONetwork;
45 class ONetworkInterface;
46}
47}
42class QShowEvent; 48class QShowEvent;
43class QHideEvent; 49class QHideEvent;
44class QVBoxLayout; 50class QVBoxLayout;
@@ -55,7 +61,7 @@ class IfaceUpDownButton : public QToolButton
55 virtual void clicked(); 61 virtual void clicked();
56 62
57 private: 63 private:
58 ONetworkInterface* _iface; 64 Opie::Net::ONetworkInterface* _iface;
59}; 65};
60 66
61 67
@@ -71,13 +77,13 @@ class IfaceIPAddress : public QLineEdit
71 virtual void returnPressed(); 77 virtual void returnPressed();
72 78
73 private: 79 private:
74 ONetworkInterface* _iface; 80 Opie::Net::ONetworkInterface* _iface;
75}; 81};
76 82
77class NetworkAppletControl : public QFrame 83class NetworkAppletControl : public QFrame
78{ 84{
79 public: 85 public:
80 NetworkAppletControl( OTaskbarApplet* parent, const char* name = 0 ); 86 NetworkAppletControl( Opie::Ui::OTaskbarApplet* parent, const char* name = 0 );
81 ~NetworkAppletControl(); 87 ~NetworkAppletControl();
82 88
83 virtual QSize sizeHint() const; 89 virtual QSize sizeHint() const;
@@ -85,7 +91,7 @@ class NetworkAppletControl : public QFrame
85 protected: 91 protected:
86 virtual void showEvent( QShowEvent* ); 92 virtual void showEvent( QShowEvent* );
87 virtual void hideEvent( QHideEvent* ); 93 virtual void hideEvent( QHideEvent* );
88 QString guessDevice( ONetworkInterface* iface ); 94 QString guessDevice( Opie::Net::ONetworkInterface* iface );
89 void build(); 95 void build();
90 96
91 private: 97 private:
@@ -94,7 +100,7 @@ class NetworkAppletControl : public QFrame
94}; 100};
95 101
96 102
97class NetworkApplet : public OTaskbarApplet 103class NetworkApplet : public Opie::Ui::OTaskbarApplet
98{ 104{
99 public: 105 public:
100 NetworkApplet( QWidget* parent = 0, const char* name = 0 ); 106 NetworkApplet( QWidget* parent = 0, const char* name = 0 );
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
@@ -46,6 +46,7 @@
46#include <qtimer.h> 46#include <qtimer.h>
47 47
48/* XPM */ 48/* XPM */
49using namespace Opie::Ui;
49static char * notes_xpm[] = { 50static char * notes_xpm[] = {
50"16 16 11 1", 51"16 16 11 1",
51" c None", 52" c None",
@@ -508,7 +509,6 @@ void NotesApplet::paintEvent( QPaintEvent* ) {
508 p.drawPixmap( 0, 1, ( const char** ) notes_xpm ); 509 p.drawPixmap( 0, 1, ( const char** ) notes_xpm );
509} 510}
510 511
511Q_EXPORT_INTERFACE() 512
512{ 513EXPORT_OPIE_APPLET_v1( NotesApplet )
513 Q_CREATE_INSTANCE( OTaskbarAppletWrapper<NotesApplet> ); 514
514}
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
@@ -26,6 +26,7 @@
26#include <opie2/onetwork.h> 26#include <opie2/onetwork.h>
27#include <opie2/otaskbarapplet.h> 27#include <opie2/otaskbarapplet.h>
28#include <qpe/config.h> 28#include <qpe/config.h>
29#include <qpe/qpeapplication.h>
29 30
30/* QT */ 31/* QT */
31#include <qradiobutton.h> 32#include <qradiobutton.h>
@@ -48,6 +49,8 @@
48//#define MDEBUG 49//#define MDEBUG
49#undef MDEBUG 50#undef MDEBUG
50 51
52using namespace Opie::Ui;
53using namespace Opie::Net;
51WirelessControl::WirelessControl( WirelessApplet *applet, QWidget *parent, const char *name ) 54WirelessControl::WirelessControl( WirelessApplet *applet, QWidget *parent, const char *name )
52 : QFrame( parent, name, WStyle_StaysOnTop | WType_Popup ), applet( applet ) 55 : QFrame( parent, name, WStyle_StaysOnTop | WType_Popup ), applet( applet )
53{ 56{
@@ -550,9 +553,5 @@ int WirelessApplet::position()
550 return 6; 553 return 6;
551} 554}
552 555
553 556EXPORT_OPIE_APPLET_v1( WirelessApplet )
554Q_EXPORT_INTERFACE()
555{
556 Q_CREATE_INSTANCE( OTaskbarAppletWrapper<WirelessApplet> );
557}
558 557
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
@@ -19,7 +19,10 @@
19#include <qframe.h> 19#include <qframe.h>
20#include <qpixmap.h> 20#include <qpixmap.h>
21 21
22class OWirelessNetworkInterface; 22namespace Opie {namespace Net {
23 class OWirelessNetworkInterface;
24}
25}
23class Y; 26class Y;
24class QLabel; 27class QLabel;
25class WirelessApplet; 28class WirelessApplet;
@@ -86,11 +89,11 @@ class WirelessApplet : public QWidget
86 int visualStyle; 89 int visualStyle;
87 int timer; 90 int timer;
88 91
89 OWirelessNetworkInterface* interface; 92 Opie::Net::OWirelessNetworkInterface* interface;
90 93
91 private: 94 private:
92 const char** oldpixmap; 95 const char** oldpixmap;
93 OWirelessNetworkInterface* oldiface; 96 Opie::Net::OWirelessNetworkInterface* oldiface;
94 int oldqualityH; 97 int oldqualityH;
95 int oldsignalH; 98 int oldsignalH;
96 int oldnoiseH; 99 int oldnoiseH;
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
@@ -8,11 +8,12 @@
8#include "zkbwidget.h" 8#include "zkbwidget.h"
9#include "zkbcfg.h" 9#include "zkbcfg.h"
10 10
11using namespace Opie::Ui;
11ZkbWidget::ZkbWidget(QWidget* parent):QLabel(parent),keymap(0), 12ZkbWidget::ZkbWidget(QWidget* parent):QLabel(parent),keymap(0),
12 disabled(Resource::loadPixmap("zkb-disabled")) { 13 disabled(Resource::loadPixmap("zkb-disabled")) {
13 14
14 labels = new QPopupMenu(); 15 labels = new QPopupMenu();
15 connect(labels, SIGNAL(activated(int)), this, 16 connect(labels, SIGNAL(activated(int)), this,
16 SLOT(labelChanged(int))); 17 SLOT(labelChanged(int)));
17 18
18 loadKeymap(); 19 loadKeymap();
@@ -68,7 +69,7 @@ bool ZkbWidget::loadKeymap() {
68 labels->insertItem(disabled, 0, 0); 69 labels->insertItem(disabled, 0, 0);
69 int n = 1; 70 int n = 1;
70 w = 0; 71 w = 0;
71 for(QStringList::Iterator it = l.begin(); it != l.end(); 72 for(QStringList::Iterator it = l.begin(); it != l.end();
72 ++it, n++) { 73 ++it, n++) {
73 74
74 // printf("label: %s\n", (const char*) (*it).utf8()); 75 // printf("label: %s\n", (const char*) (*it).utf8());
@@ -155,8 +156,6 @@ void ZkbWidget::reload() {
155 QCopEnvelope("QPE/System", "notBusy()"); 156 QCopEnvelope("QPE/System", "notBusy()");
156} 157}
157 158
158Q_EXPORT_INTERFACE() 159EXPORT_OPIE_APPLET_v1( ZkbWidget )
159{ 160
160 Q_CREATE_INSTANCE( OTaskbarAppletWrapper<ZkbWidget> );
161}
162 161