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
@@ -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
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
@@ -2,2 +2,4 @@
 #include <opie2/oledbox.h>
+using namespace Opie::Core;
+using namespace Opie::Ui;
 
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
@@ -6,3 +6,3 @@
 #include <OTPairingGUI.h>
-class OLedBox;
+namespace Opie { namespace Ui { class OLedBox; }; };
 
@@ -111,3 +111,3 @@ private :
 
-      OLedBox *         Paired_Led;
+      Opie::Ui::OLedBox *         Paired_Led;
       QTimer *          StrengthTimer;