| author | mickeyl <mickeyl> | 2005-01-04 23:03:23 (UTC) |
|---|---|---|
| committer | mickeyl <mickeyl> | 2005-01-04 23:03:23 (UTC) |
| commit | 49683b3396a2e93cf49ac1726eafca6e8798be81 (patch) (side-by-side diff) | |
| tree | 6aaa08205dbf55a214655c275c11cd7ef8a27bdd /core | |
| parent | b41e4499d41fc92cc1ed4ed487e57d0a002c1a02 (diff) | |
| download | opie-49683b3396a2e93cf49ac1726eafca6e8798be81.zip opie-49683b3396a2e93cf49ac1726eafca6e8798be81.tar.gz opie-49683b3396a2e93cf49ac1726eafca6e8798be81.tar.bz2 | |
catch up with proper inclusion of OLedBox into libopieui
| -rw-r--r-- | core/applets/volumeapplet/config.in | 2 | ||||
| -rw-r--r-- | core/applets/volumeapplet/volume.cpp | 7 | ||||
| -rw-r--r-- | core/applets/volumeapplet/volume.h | 8 | ||||
| -rw-r--r-- | core/applets/volumeapplet/volumeapplet.pro | 7 |
4 files changed, 13 insertions, 11 deletions
diff --git a/core/applets/volumeapplet/config.in b/core/applets/volumeapplet/config.in index b18cd54..7ab1a27 100644 --- a/core/applets/volumeapplet/config.in +++ b/core/applets/volumeapplet/config.in @@ -3,2 +3,2 @@ default "y" - depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE + depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE && LIBOPIE2UI diff --git a/core/applets/volumeapplet/volume.cpp b/core/applets/volumeapplet/volume.cpp index 45c106a..23c847d 100644 --- a/core/applets/volumeapplet/volume.cpp +++ b/core/applets/volumeapplet/volume.cpp @@ -22,2 +22,3 @@ +/* OPIE */ #include <opie2/oledbox.h> @@ -29,3 +30,6 @@ #include <qpe/qcopenvelope_qws.h> +using namespace Opie::Core; +using namespace Opie::Ui; +/* QT */ #include <qpainter.h> @@ -39,6 +43,5 @@ +/* STD */ #include <stdio.h> -using namespace Opie::Core; - #define RATE_TIMER_INTERVAL 100 diff --git a/core/applets/volumeapplet/volume.h b/core/applets/volumeapplet/volume.h index 454a688..958395f 100644 --- a/core/applets/volumeapplet/volume.h +++ b/core/applets/volumeapplet/volume.h @@ -31,3 +31,3 @@ class QCheckBox; class QButton; -class OLedBox; +namespace Opie { namespace Ui { class OLedBox; }; }; @@ -88,5 +88,5 @@ private: QSlider *alarmSlider; - OLedBox *volLed; - OLedBox *micLed; - OLedBox *alarmLed; + Opie::Ui::OLedBox *volLed; + Opie::Ui::OLedBox *micLed; + Opie::Ui::OLedBox *alarmLed; diff --git a/core/applets/volumeapplet/volumeapplet.pro b/core/applets/volumeapplet/volumeapplet.pro index e118dbd..3067a0f 100644 --- a/core/applets/volumeapplet/volumeapplet.pro +++ b/core/applets/volumeapplet/volumeapplet.pro @@ -2,4 +2,3 @@ TEMPLATE = lib CONFIG += qt plugin warn_on -HEADERS = volume.h oledbox.h -#SOURCES = volume.cpp oledbox.cpp +HEADERS = volume.h SOURCES = volume.cpp @@ -7,5 +6,5 @@ TARGET = volumeapplet DESTDIR = $(OPIEDIR)/plugins/applets -INCLUDEPATH += $(OPIEDIR)/include +INCLUDEPATH += $(OPIEDIR)/include DEPENDPATH += -LIBS += -lqpe -lopiecore2 +LIBS += -lqpe -lopiecore2 -lopieui2 VERSION = 1.0.0 |