diff options
| author |  Elvio Basello | 2008-04-20 03:01:40 +0000 |
|---|---|---|
| committer | Elvio Basello | 2008-04-20 03:01:40 +0000 |
| commit | a10bff05fcbe6835ff596f002d97d25495cbf4cc (patch) | |
| tree | c2903f48f88e83e7f9dd47c4017593f9c34e7787 /src/modules/mediaplayer | |
| parent | quick fix for win32. test it (diff) | |
| download | KVIrc-a10bff05fcbe6835ff596f002d97d25495cbf4cc.tar.gz KVIrc-a10bff05fcbe6835ff596f002d97d25495cbf4cc.tar.bz2 KVIrc-a10bff05fcbe6835ff596f002d97d25495cbf4cc.zip | |
defined COMPILE_ON_MAC and removed ugly Q_OS_MACX
git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@1528 17fca916-40b9-46aa-a4ea-0a15b648b75c
Diffstat (limited to 'src/modules/mediaplayer')
| -rw-r--r-- | src/modules/mediaplayer/libkvimediaplayer.cpp | 2 | ||||
| -rw-r--r-- | src/modules/mediaplayer/mp_audaciousinterface.cpp | 2 | ||||
| -rw-r--r-- | src/modules/mediaplayer/mp_audaciousinterface.h | 2 | ||||
| -rw-r--r-- | src/modules/mediaplayer/mp_xmmsinterface.cpp | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/src/modules/mediaplayer/libkvimediaplayer.cpp b/src/modules/mediaplayer/libkvimediaplayer.cpp index 53a325edd..14931574d 100644 --- a/src/modules/mediaplayer/libkvimediaplayer.cpp +++ b/src/modules/mediaplayer/libkvimediaplayer.cpp @@ -1604,7 +1604,7 @@ static bool mediaplayer_module_init( KviModule * m ) g_pDescriptorList = new KviPointerList<KviMediaPlayerInterfaceDescriptor>; g_pDescriptorList->setAutoDelete(true); -#if (!defined(COMPILE_ON_WINDOWS) && !defined(Q_OS_MACX)) +#if (!defined(COMPILE_ON_WINDOWS) && !defined(COMPILE_ON_MAC)) g_pDescriptorList->append(MP_CREATE_DESCRIPTOR(KviXmmsInterface)); g_pDescriptorList->append(MP_CREATE_DESCRIPTOR(KviAudaciousClassicInterface)); g_pDescriptorList->append(MP_CREATE_DESCRIPTOR(KviAudaciousInterface)); diff --git a/src/modules/mediaplayer/mp_audaciousinterface.cpp b/src/modules/mediaplayer/mp_audaciousinterface.cpp index 835a92348..89980e425 100644 --- a/src/modules/mediaplayer/mp_audaciousinterface.cpp +++ b/src/modules/mediaplayer/mp_audaciousinterface.cpp @@ -23,7 +23,7 @@ //============================================================================= #include "mp_audaciousinterface.h" -#if (!defined(COMPILE_ON_WINDOWS) && !defined(Q_OS_MACX)) +#if (!defined(COMPILE_ON_WINDOWS) && !defined(COMPILE_ON_MAC)) #include "kvi_locale.h" MP_IMPLEMENT_DESCRIPTOR( diff --git a/src/modules/mediaplayer/mp_audaciousinterface.h b/src/modules/mediaplayer/mp_audaciousinterface.h index 66b51817d..e7216da43 100644 --- a/src/modules/mediaplayer/mp_audaciousinterface.h +++ b/src/modules/mediaplayer/mp_audaciousinterface.h @@ -27,7 +27,7 @@ #include "kvi_settings.h" #include "mp_interface.h" -#if (!defined(COMPILE_ON_WINDOWS) && !defined(Q_OS_MACX)) +#if (!defined(COMPILE_ON_WINDOWS) && !defined(COMPILE_ON_MAC)) #include <QtDBus/QtDBus> class KviAudaciousInterface : public KviMediaPlayerInterface diff --git a/src/modules/mediaplayer/mp_xmmsinterface.cpp b/src/modules/mediaplayer/mp_xmmsinterface.cpp index a5042f8fa..69ef09f44 100644 --- a/src/modules/mediaplayer/mp_xmmsinterface.cpp +++ b/src/modules/mediaplayer/mp_xmmsinterface.cpp @@ -27,7 +27,7 @@ #include "mp_xmmsinterface.h" -#if (!defined(COMPILE_ON_WINDOWS) && !defined(Q_OS_MACX)) +#if (!defined(COMPILE_ON_WINDOWS) && !defined(COMPILE_ON_MAC)) #include "kvi_locale.h" |