| author | mickeyl <mickeyl> | 2006-05-13 11:47:05 (UTC) |
|---|---|---|
| committer | mickeyl <mickeyl> | 2006-05-13 11:47:05 (UTC) |
| commit | 89efebff8f5a00089f02397aa0778dd0dbbacdbb (patch) (side-by-side diff) | |
| tree | 6562aa181606465f3776e552974961465a0c5943 /noncore | |
| parent | e847e13515267ae9dc32648c3a427794a9449dfd (diff) | |
| download | opie-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
| -rw-r--r-- | noncore/net/opietooth/applet/bluezapplet.cpp | 9 |
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 @@ -35,6 +35,7 @@ #include <opie2/odebug.h> #include <opie2/oresource.h> #include <opie2/oprocess.h> +#include <qpe/version.h> #include <qpe/applnk.h> #include <qpe/qcopenvelope_qws.h> #include <qpe/config.h> @@ -55,13 +56,11 @@ using namespace Opie::Core; /* STD */ #include <device.h> -#define OPIE120 // undefine it fo the latest OPIE - namespace OpieTooth { BluezApplet::BluezApplet( QWidget *parent, const char *name ) : QWidget( parent, name ) { setFixedHeight( AppLnk::smallIconSize() ); setFixedWidth( AppLnk::smallIconSize() ); -#ifdef OPIE120 +#if OPIE_VERSION < 102010 bluezOnPixmap = Resource::loadPixmap( "bluetoothapplet/bluezon" ); bluezOffPixmap = Resource::loadPixmap( "bluetoothapplet/bluezoff" ); bluezDiscoveryOnPixmap = Resource::loadPixmap( "bluetoothapplet/magglass.png" ); @@ -320,13 +319,13 @@ namespace OpieTooth { odebug << "paint bluetooth pixmap" << oendl; if (bluezactive) { -#ifdef OPIE120 +#if OPIE_VERSION < 102010 p.drawPixmap( 0, -1, bluezOnPixmap ); #else p.drawPixmap( 0, 0, bluezOnPixmap ); #endif } else { -#ifdef OPIE120 +#if OPIE_VERSION < 102010 p.drawPixmap( 0, -1, bluezOffPixmap ); #else p.drawPixmap( 0, 0, bluezOffPixmap ); |