summaryrefslogtreecommitdiff
authormickeyl <mickeyl>2005-01-04 23:03:23 (UTC)
committer mickeyl <mickeyl>2005-01-04 23:03:23 (UTC)
commit49683b3396a2e93cf49ac1726eafca6e8798be81 (patch) (unidiff)
tree6aaa08205dbf55a214655c275c11cd7ef8a27bdd
parentb41e4499d41fc92cc1ed4ed487e57d0a002c1a02 (diff)
downloadopie-49683b3396a2e93cf49ac1726eafca6e8798be81.zip
opie-49683b3396a2e93cf49ac1726eafca6e8798be81.tar.gz
opie-49683b3396a2e93cf49ac1726eafca6e8798be81.tar.bz2
catch up with proper inclusion of OLedBox into libopieui
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
@@ -3,2 +3,2 @@
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
@@ -22,2 +22,3 @@
22 22
23/* OPIE */
23#include <opie2/oledbox.h> 24#include <opie2/oledbox.h>
@@ -29,3 +30,6 @@
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>
@@ -39,6 +43,5 @@
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
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;
31class QButton; 31class QButton;
32class OLedBox; 32namespace Opie { namespace Ui { class OLedBox; }; };
33 33
@@ -88,5 +88,5 @@ private:
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
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
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
@@ -7,5 +6,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
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 @@
2#include <opie2/oledbox.h> 2#include <opie2/oledbox.h>
3using namespace Opie::Core;
4using namespace Opie::Ui;
3 5
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 @@
6#include <OTPairingGUI.h> 6#include <OTPairingGUI.h>
7class OLedBox; 7namespace Opie { namespace Ui { class OLedBox; }; };
8 8
@@ -111,3 +111,3 @@ private :
111 111
112 OLedBox * Paired_Led; 112 Opie::Ui::OLedBox * Paired_Led;
113 QTimer * StrengthTimer; 113 QTimer * StrengthTimer;