| author | zecke <zecke> | 2004-03-14 17:37:48 (UTC) |
|---|---|---|
| committer | zecke <zecke> | 2004-03-14 17:37:48 (UTC) |
| commit | d69b11f67e3118f86d068c38c422984d754e13cc (patch) (side-by-side diff) | |
| tree | 9733e26ab49003bead06d820d70a14babd0c09f0 /core/applets/batteryapplet | |
| parent | 64820b76cc9d1c06a6967cd34114f3b95896aaeb (diff) | |
| download | opie-d69b11f67e3118f86d068c38c422984d754e13cc.zip opie-d69b11f67e3118f86d068c38c422984d754e13cc.tar.gz opie-d69b11f67e3118f86d068c38c422984d754e13cc.tar.bz2 | |
Updatet the applets
| -rw-r--r-- | core/applets/batteryapplet/battery.cpp | 8 | ||||
| -rw-r--r-- | core/applets/batteryapplet/batterystatus.cpp | 2 | ||||
| -rw-r--r-- | core/applets/batteryapplet/config.in | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/core/applets/batteryapplet/battery.cpp b/core/applets/batteryapplet/battery.cpp index b2cef55..18e368e 100644 --- a/core/applets/batteryapplet/battery.cpp +++ b/core/applets/batteryapplet/battery.cpp @@ -22,6 +22,8 @@ /* OPIE */ #include <opie2/otaskbarapplet.h> + +#include <qpe/qpeapplication.h> #include <qpe/applnk.h> #include <qpe/config.h> #include <qpe/power.h> @@ -31,6 +33,7 @@ #include <qtimer.h> +using namespace Opie::Ui; BatteryMeter::BatteryMeter( QWidget *parent ) : QWidget( parent ), charging(false) { @@ -175,8 +178,5 @@ int BatteryMeter::position() return 8; } -Q_EXPORT_INTERFACE() -{ - Q_CREATE_INSTANCE( OTaskbarAppletWrapper<BatteryMeter> ); -} +EXPORT_OPIE_APPLET_v1( BatteryMeter ) diff --git a/core/applets/batteryapplet/batterystatus.cpp b/core/applets/batteryapplet/batterystatus.cpp index ea11495..bd86f77 100644 --- a/core/applets/batteryapplet/batterystatus.cpp +++ b/core/applets/batteryapplet/batterystatus.cpp @@ -13,7 +13,7 @@ #include <qtextstream.h> #include <qmessagebox.h> -using namespace Opie; +using namespace Opie::Core; BatteryStatus::BatteryStatus( const PowerStatus *p, QWidget *parent ) : QWidget( parent, 0, WDestructiveClose), ps(p), bat2(false) { diff --git a/core/applets/batteryapplet/config.in b/core/applets/batteryapplet/config.in index 3067317..eca07e3 100644 --- a/core/applets/batteryapplet/config.in +++ b/core/applets/batteryapplet/config.in @@ -1,4 +1,4 @@ config BATTERYAPPLET boolean "opie-batteryapplet (Applet to monitor battery status)" default "y" - depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE + depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIECORE2 |