Diffstat (limited to 'noncore/applets/wirelessapplet') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/applets/wirelessapplet/wireless.cpp | 9 | ||||
-rw-r--r-- | noncore/applets/wirelessapplet/wireless.h | 9 |
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 | |||
@@ -23,12 +23,13 @@ | |||
23 | #include "nowireless.xpm" | 23 | #include "nowireless.xpm" |
24 | 24 | ||
25 | /* OPIE */ | 25 | /* OPIE */ |
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> |
32 | #include <qpushbutton.h> | 33 | #include <qpushbutton.h> |
33 | #include <qpainter.h> | 34 | #include <qpainter.h> |
34 | #include <qlabel.h> | 35 | #include <qlabel.h> |
@@ -45,12 +46,14 @@ | |||
45 | #define STYLE_BARS 0 | 46 | #define STYLE_BARS 0 |
46 | #define STYLE_ANTENNA 1 | 47 | #define STYLE_ANTENNA 1 |
47 | 48 | ||
48 | //#define MDEBUG | 49 | //#define MDEBUG |
49 | #undef MDEBUG | 50 | #undef MDEBUG |
50 | 51 | ||
52 | using namespace Opie::Ui; | ||
53 | using namespace Opie::Net; | ||
51 | WirelessControl::WirelessControl( WirelessApplet *applet, QWidget *parent, const char *name ) | 54 | WirelessControl::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 | { |
54 | 57 | ||
55 | readConfig(); | 58 | readConfig(); |
56 | writeConfigEntry( "UpdateFrequency", updateFrequency ); | 59 | writeConfigEntry( "UpdateFrequency", updateFrequency ); |
@@ -547,12 +550,8 @@ void WirelessApplet::paintEvent( QPaintEvent* ) | |||
547 | 550 | ||
548 | int WirelessApplet::position() | 551 | int WirelessApplet::position() |
549 | { | 552 | { |
550 | return 6; | 553 | return 6; |
551 | } | 554 | } |
552 | 555 | ||
553 | 556 | EXPORT_OPIE_APPLET_v1( WirelessApplet ) | |
554 | Q_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 | |||
@@ -16,13 +16,16 @@ | |||
16 | #define __WIRELESS_APPLET_H__ | 16 | #define __WIRELESS_APPLET_H__ |
17 | 17 | ||
18 | #include <qwidget.h> | 18 | #include <qwidget.h> |
19 | #include <qframe.h> | 19 | #include <qframe.h> |
20 | #include <qpixmap.h> | 20 | #include <qpixmap.h> |
21 | 21 | ||
22 | class OWirelessNetworkInterface; | 22 | namespace Opie {namespace Net { |
23 | class OWirelessNetworkInterface; | ||
24 | } | ||
25 | } | ||
23 | class Y; | 26 | class Y; |
24 | class QLabel; | 27 | class QLabel; |
25 | class WirelessApplet; | 28 | class WirelessApplet; |
26 | class MGraph; | 29 | class MGraph; |
27 | 30 | ||
28 | class WirelessControl : public QFrame | 31 | class WirelessControl : public QFrame |
@@ -83,17 +86,17 @@ class WirelessApplet : public QWidget | |||
83 | 86 | ||
84 | private: | 87 | private: |
85 | QPixmap snapshotPixmap; | 88 | QPixmap snapshotPixmap; |
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; |
97 | 100 | ||
98 | QString oldESSID; | 101 | QString oldESSID; |
99 | QString oldAP; | 102 | QString oldAP; |