| 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/volumeapplet | |
| parent | 64820b76cc9d1c06a6967cd34114f3b95896aaeb (diff) | |
| download | opie-d69b11f67e3118f86d068c38c422984d754e13cc.zip opie-d69b11f67e3118f86d068c38c422984d754e13cc.tar.gz opie-d69b11f67e3118f86d068c38c422984d754e13cc.tar.bz2 | |
Updatet the applets
| -rw-r--r-- | core/applets/volumeapplet/config.in | 2 | ||||
| -rw-r--r-- | core/applets/volumeapplet/volume.cpp | 8 | ||||
| -rw-r--r-- | core/applets/volumeapplet/volumeapplet.pro | 2 |
3 files changed, 5 insertions, 7 deletions
diff --git a/core/applets/volumeapplet/config.in b/core/applets/volumeapplet/config.in index 1233d9f..f097591 100644 --- a/core/applets/volumeapplet/config.in +++ b/core/applets/volumeapplet/config.in @@ -1,4 +1,4 @@ config VOLUMEAPPLET boolean "opie-volumeapplet (set volume for microphone and speaker)" default "y" - depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE + depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIECORE2 diff --git a/core/applets/volumeapplet/volume.cpp b/core/applets/volumeapplet/volume.cpp index 942cebb..276f47f 100644 --- a/core/applets/volumeapplet/volume.cpp +++ b/core/applets/volumeapplet/volume.cpp @@ -39,7 +39,7 @@ #include <stdio.h> -using namespace Opie; +using namespace Opie::Core; #define RATE_TIMER_INTERVAL 100 // Ten times per second is fine (RATE_TIMER_INTERVAL 100). A shorter time @@ -47,6 +47,7 @@ using namespace Opie; /* XPM */ +using namespace Opie::Ui; static const char * vol_xpm[] = { "20 20 3 1", " c None", @@ -777,7 +778,4 @@ void VolumeApplet::paintEvent ( QPaintEvent * ) } -Q_EXPORT_INTERFACE() -{ - Q_CREATE_INSTANCE( OTaskbarAppletWrapper<VolumeApplet> ); -} +EXPORT_OPIE_APPLET_v1( VolumeApplet ) diff --git a/core/applets/volumeapplet/volumeapplet.pro b/core/applets/volumeapplet/volumeapplet.pro index b14956e..b478ed1 100644 --- a/core/applets/volumeapplet/volumeapplet.pro +++ b/core/applets/volumeapplet/volumeapplet.pro @@ -6,7 +6,7 @@ TARGET = volumeapplet DESTDIR = $(OPIEDIR)/plugins/applets INCLUDEPATH += $(OPIEDIR)/include DEPENDPATH += ../$(OPIEDIR)/include -LIBS += -lqpe +LIBS += -lqpe -lopiecore2 VERSION = 1.0.0 include ( $(OPIEDIR)/include.pro ) |