From 49683b3396a2e93cf49ac1726eafca6e8798be81 Mon Sep 17 00:00:00 2001 From: mickeyl Date: Tue, 04 Jan 2005 23:03:23 +0000 Subject: catch up with proper inclusion of OLedBox into libopieui --- (limited to 'core/applets') 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 @@ -1,4 +1,4 @@ config VOLUMEAPPLET boolean "opie-volumeapplet (set volume for microphone and speaker)" 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 @@ -20,6 +20,7 @@ #include "volume.h" +/* OPIE */ #include #include #include @@ -27,7 +28,10 @@ #include #include #include +using namespace Opie::Core; +using namespace Opie::Ui; +/* QT */ #include #include #include @@ -37,10 +41,9 @@ #include #include +/* STD */ #include -using namespace Opie::Core; - #define RATE_TIMER_INTERVAL 100 // Ten times per second is fine (RATE_TIMER_INTERVAL 100). A shorter time // results in "hanging" buttons on the iPAQ due to quite high CPU consumption. 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 @@ -29,7 +29,7 @@ class QTimer; class QSlider; class QCheckBox; class QButton; -class OLedBox; +namespace Opie { namespace Ui { class OLedBox; }; }; class VolumeApplet; @@ -86,9 +86,9 @@ private: QSlider *trebleSlider; QSlider *micSlider; QSlider *alarmSlider; - OLedBox *volLed; - OLedBox *micLed; - OLedBox *alarmLed; + Opie::Ui::OLedBox *volLed; + Opie::Ui::OLedBox *micLed; + Opie::Ui::OLedBox *alarmLed; QCheckBox *alarmBox; QCheckBox *tapBox; 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 @@ -1,13 +1,12 @@ TEMPLATE = lib CONFIG += qt plugin warn_on -HEADERS = volume.h oledbox.h -#SOURCES = volume.cpp oledbox.cpp +HEADERS = volume.h SOURCES = volume.cpp TARGET = volumeapplet DESTDIR = $(OPIEDIR)/plugins/applets -INCLUDEPATH += $(OPIEDIR)/include +INCLUDEPATH += $(OPIEDIR)/include DEPENDPATH += -LIBS += -lqpe -lopiecore2 +LIBS += -lqpe -lopiecore2 -lopieui2 VERSION = 1.0.0 include( $(OPIEDIR)/include.pro ) -- cgit v0.9.0.2