summaryrefslogtreecommitdiff
authormickeyl <mickeyl>2006-05-13 11:47:05 (UTC)
committer mickeyl <mickeyl>2006-05-13 11:47:05 (UTC)
commit89efebff8f5a00089f02397aa0778dd0dbbacdbb (patch) (side-by-side diff)
tree6562aa181606465f3776e552974961465a0c5943
parente847e13515267ae9dc32648c3a427794a9449dfd (diff)
downloadopie-89efebff8f5a00089f02397aa0778dd0dbbacdbb.zip
opie-89efebff8f5a00089f02397aa0778dd0dbbacdbb.tar.gz
opie-89efebff8f5a00089f02397aa0778dd0dbbacdbb.tar.bz2
don't use hand cooked #ifdef versions for conditional compiling, this breaks OE
I added a numerical version code in OPIE_VERSION which you can use. fixed all tests in bluezapplet.cpp
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/net/opietooth/applet/bluezapplet.cpp9
1 files changed, 4 insertions, 5 deletions
diff --git a/noncore/net/opietooth/applet/bluezapplet.cpp b/noncore/net/opietooth/applet/bluezapplet.cpp
index 6351d4e..f7774f0 100644
--- a/noncore/net/opietooth/applet/bluezapplet.cpp
+++ b/noncore/net/opietooth/applet/bluezapplet.cpp
@@ -37,2 +37,3 @@
#include <opie2/oprocess.h>
+#include <qpe/version.h>
#include <qpe/applnk.h>
@@ -57,4 +58,2 @@ using namespace Opie::Core;
-#define OPIE120 // undefine it fo the latest OPIE
-
namespace OpieTooth {
@@ -63,3 +62,3 @@ namespace OpieTooth {
setFixedWidth( AppLnk::smallIconSize() );
-#ifdef OPIE120
+#if OPIE_VERSION < 102010
bluezOnPixmap = Resource::loadPixmap( "bluetoothapplet/bluezon" );
@@ -322,3 +321,3 @@ namespace OpieTooth {
if (bluezactive) {
-#ifdef OPIE120
+#if OPIE_VERSION < 102010
p.drawPixmap( 0, -1, bluezOnPixmap );
@@ -328,3 +327,3 @@ namespace OpieTooth {
} else {
-#ifdef OPIE120
+#if OPIE_VERSION < 102010
p.drawPixmap( 0, -1, bluezOffPixmap );