-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 @@ -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 @@ -11,45 +11,48 @@ ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. ** ** See http://www.trolltech.com/gpl/ for GPL licensing information. ** ** Contact info@trolltech.com if any conditions of this licensing are ** not clear to you. ** **********************************************************************/ #include "volume.h" +/* OPIE */ #include <opie2/oledbox.h> #include <opie2/odevice.h> #include <opie2/otaskbarapplet.h> #include <qpe/resource.h> #include <qpe/applnk.h> #include <qpe/config.h> #include <qpe/qcopenvelope_qws.h> +using namespace Opie::Core; +using namespace Opie::Ui; +/* QT */ #include <qpainter.h> #include <qcheckbox.h> #include <qslider.h> #include <qlayout.h> #include <qvbox.h> #include <qlabel.h> #include <qpushbutton.h> #include <qtimer.h> +/* STD */ #include <stdio.h> -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. /* XPM */ using namespace Opie::Ui; static const char * vol_xpm[] = { "20 20 3 1", " c None", ". c #0000FF", "+ c #000000", 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 @@ -20,25 +20,25 @@ #ifndef __VOLUME_APPLET_H__ #define __VOLUME_APPLET_H__ #include <qframe.h> class QPixmap; class QTimer; class QSlider; class QCheckBox; class QButton; -class OLedBox; +namespace Opie { namespace Ui { class OLedBox; }; }; class VolumeApplet; class VolumeControl : public QFrame { Q_OBJECT public: VolumeControl ( VolumeApplet *icon, bool showMic = false, QWidget *parent=0, const char *name=0 ); bool volMuted ( ) const; int volPercent ( ) const; @@ -77,27 +77,27 @@ private: UPD_Bass, UPD_Treble }; void writeConfigEntry ( const char *entry, int val, eUpdate upd ); private: QSlider *volSlider; QSlider *bassSlider; 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; QCheckBox *keyBox; QPushButton *upButton; QPushButton *downButton; QTimer *rateTimer; int m_vol_percent; int m_mic_percent; int m_alarm_percent; int m_bass_percent; 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,14 +1,13 @@ 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 ) target.path = $$prefix/plugins/applets |