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
@@ -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
@@ -15,37 +15,40 @@
 **
 ** 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[] = {
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
@@ -24,17 +24,17 @@
 
 #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 );
@@ -81,19 +81,19 @@ private:
 
 
 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;
 
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
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,10 +1,12 @@
 #include <opie2/odebug.h>
 #include <opie2/oledbox.h>
+using namespace Opie::Core;
+using namespace Opie::Ui;
 
 #include <qpe/resource.h>
 #include <qcheckbox.h>
 #include <qgroupbox.h>
 #include <qlabel.h>
 #include <qprogressbar.h>
 #include <qheader.h>
 #include <qmessagebox.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
@@ -1,15 +1,15 @@
 #ifndef OPIETOOTH_H
 #define OPIETOOTH_H
 
 #include <OTIcons.h>
 
 #include <OTPairingGUI.h>
-class OLedBox;
+namespace Opie { namespace Ui { class OLedBox; }; };
 
 namespace Opietooth2 {
 
 class OTGateway;
 class OTDriver;
 class OTInquiry;
 class OTPeer;
 class PeerLVI;
@@ -104,17 +104,17 @@ private :
       // load scanned devices
 
       bool              MyIcons;
       OTIcons *         Icons;
       OTGateway *       OT;
       OTInquiry *       Scanning;
       UUIDVector        Filter;
 
-      OLedBox *         Paired_Led;
+      Opie::Ui::OLedBox *         Paired_Led;
       QTimer *          StrengthTimer;
       PeerLVI *         Current;
 
       OTPeer *          SelectedPeer;
       int               SelectedChannel;
 };
 };