summaryrefslogtreecommitdiff
Unidiff
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
@@ -1,4 +1,4 @@
1 config VOLUMEAPPLET 1 config VOLUMEAPPLET
2 boolean "opie-volumeapplet (set volume for microphone and speaker)" 2 boolean "opie-volumeapplet (set volume for microphone and speaker)"
3 default "y" 3 default "y"
4 depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE 4 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 @@
20 20
21#include "volume.h" 21#include "volume.h"
22 22
23/* OPIE */
23#include <opie2/oledbox.h> 24#include <opie2/oledbox.h>
24#include <opie2/odevice.h> 25#include <opie2/odevice.h>
25#include <opie2/otaskbarapplet.h> 26#include <opie2/otaskbarapplet.h>
@@ -27,7 +28,10 @@
27#include <qpe/applnk.h> 28#include <qpe/applnk.h>
28#include <qpe/config.h> 29#include <qpe/config.h>
29#include <qpe/qcopenvelope_qws.h> 30#include <qpe/qcopenvelope_qws.h>
31using namespace Opie::Core;
32using namespace Opie::Ui;
30 33
34/* QT */
31#include <qpainter.h> 35#include <qpainter.h>
32#include <qcheckbox.h> 36#include <qcheckbox.h>
33#include <qslider.h> 37#include <qslider.h>
@@ -37,10 +41,9 @@
37#include <qpushbutton.h> 41#include <qpushbutton.h>
38#include <qtimer.h> 42#include <qtimer.h>
39 43
44/* STD */
40#include <stdio.h> 45#include <stdio.h>
41 46
42using namespace Opie::Core;
43
44#define RATE_TIMER_INTERVAL 100 47#define RATE_TIMER_INTERVAL 100
45// Ten times per second is fine (RATE_TIMER_INTERVAL 100). A shorter time 48// Ten times per second is fine (RATE_TIMER_INTERVAL 100). A shorter time
46// results in "hanging" buttons on the iPAQ due to quite high CPU consumption. 49// 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;
29class QSlider; 29class QSlider;
30class QCheckBox; 30class QCheckBox;
31class QButton; 31class QButton;
32class OLedBox; 32namespace Opie { namespace Ui { class OLedBox; }; };
33 33
34class VolumeApplet; 34class VolumeApplet;
35 35
@@ -86,9 +86,9 @@ private:
86 QSlider *trebleSlider; 86 QSlider *trebleSlider;
87 QSlider *micSlider; 87 QSlider *micSlider;
88 QSlider *alarmSlider; 88 QSlider *alarmSlider;
89 OLedBox *volLed; 89 Opie::Ui::OLedBox *volLed;
90 OLedBox *micLed; 90 Opie::Ui::OLedBox *micLed;
91 OLedBox *alarmLed; 91 Opie::Ui::OLedBox *alarmLed;
92 92
93 QCheckBox *alarmBox; 93 QCheckBox *alarmBox;
94 QCheckBox *tapBox; 94 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 @@
1 TEMPLATE= lib 1 TEMPLATE= lib
2 CONFIG += qt plugin warn_on 2 CONFIG += qt plugin warn_on
3 HEADERS = volume.h oledbox.h 3 HEADERS = volume.h
4 #SOURCES= volume.cpp oledbox.cpp
5 SOURCES = volume.cpp 4 SOURCES = volume.cpp
6 TARGET = volumeapplet 5 TARGET = volumeapplet
7 DESTDIR = $(OPIEDIR)/plugins/applets 6 DESTDIR = $(OPIEDIR)/plugins/applets
8INCLUDEPATH += $(OPIEDIR)/include 7 INCLUDEPATH+= $(OPIEDIR)/include
9DEPENDPATH += 8DEPENDPATH +=
10LIBS += -lqpe -lopiecore2 9LIBS += -lqpe -lopiecore2 -lopieui2
11 VERSION = 1.0.0 10 VERSION = 1.0.0
12 11
13include( $(OPIEDIR)/include.pro ) 12include( $(OPIEDIR)/include.pro )
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,5 +1,7 @@
1#include <opie2/odebug.h> 1#include <opie2/odebug.h>
2#include <opie2/oledbox.h> 2#include <opie2/oledbox.h>
3using namespace Opie::Core;
4using namespace Opie::Ui;
3 5
4#include <qpe/resource.h> 6#include <qpe/resource.h>
5#include <qcheckbox.h> 7#include <qcheckbox.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
@@ -4,7 +4,7 @@
4#include <OTIcons.h> 4#include <OTIcons.h>
5 5
6#include <OTPairingGUI.h> 6#include <OTPairingGUI.h>
7class OLedBox; 7namespace Opie { namespace Ui { class OLedBox; }; };
8 8
9namespace Opietooth2 { 9namespace Opietooth2 {
10 10
@@ -109,7 +109,7 @@ private :
109 OTInquiry * Scanning; 109 OTInquiry * Scanning;
110 UUIDVector Filter; 110 UUIDVector Filter;
111 111
112 OLedBox * Paired_Led; 112 Opie::Ui::OLedBox * Paired_Led;
113 QTimer * StrengthTimer; 113 QTimer * StrengthTimer;
114 PeerLVI * Current; 114 PeerLVI * Current;
115 115