summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/applets/volumeapplet/config.in2
-rw-r--r--core/applets/volumeapplet/volume.cpp7
-rw-r--r--core/applets/volumeapplet/volume.h8
-rw-r--r--core/applets/volumeapplet/volumeapplet.pro7
-rw-r--r--noncore/settings/networksettings2/opietooth2/Opietooth.cpp2
-rw-r--r--noncore/settings/networksettings2/opietooth2/Opietooth.h4
6 files changed, 17 insertions, 13 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
@@ -2,3 +2,3 @@
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
@@ -21,4 +21,5 @@
#include "volume.h"
+/* OPIE */
#include <opie2/oledbox.h>
#include <opie2/odevice.h>
@@ -28,5 +29,8 @@
#include <qpe/config.h>
#include <qpe/qcopenvelope_qws.h>
+using namespace Opie::Core;
+using namespace Opie::Ui;
+/* QT */
#include <qpainter.h>
#include <qcheckbox.h>
@@ -38,8 +42,7 @@
#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
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
@@ -30,5 +30,5 @@ class QSlider;
class QCheckBox;
class QButton;
-class OLedBox;
+namespace Opie { namespace Ui { class OLedBox; }; };
class VolumeApplet;
@@ -87,7 +87,7 @@ private:
QSlider *micSlider;
QSlider *alarmSlider;
- OLedBox *volLed;
- OLedBox *micLed;
- OLedBox *alarmLed;
+ Opie::Ui::OLedBox *volLed;
+ Opie::Ui::OLedBox *micLed;
+ Opie::Ui::OLedBox *alarmLed;
QCheckBox *alarmBox;
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,12 +1,11 @@
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
diff --git a/noncore/settings/networksettings2/opietooth2/Opietooth.cpp b/noncore/settings/networksettings2/opietooth2/Opietooth.cpp
index 8d71f32..8ea3a48 100644
--- a/noncore/settings/networksettings2/opietooth2/Opietooth.cpp
+++ b/noncore/settings/networksettings2/opietooth2/Opietooth.cpp
@@ -1,4 +1,6 @@
#include <opie2/odebug.h>
#include <opie2/oledbox.h>
+using namespace Opie::Core;
+using namespace Opie::Ui;
#include <qpe/resource.h>
diff --git a/noncore/settings/networksettings2/opietooth2/Opietooth.h b/noncore/settings/networksettings2/opietooth2/Opietooth.h
index 9e53fcb..16a22d6 100644
--- a/noncore/settings/networksettings2/opietooth2/Opietooth.h
+++ b/noncore/settings/networksettings2/opietooth2/Opietooth.h
@@ -5,5 +5,5 @@
#include <OTPairingGUI.h>
-class OLedBox;
+namespace Opie { namespace Ui { class OLedBox; }; };
namespace Opietooth2 {
@@ -110,5 +110,5 @@ private :
UUIDVector Filter;
- OLedBox * Paired_Led;
+ Opie::Ui::OLedBox * Paired_Led;
QTimer * StrengthTimer;
PeerLVI * Current;