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

9 files changed, 16 insertions, 16 deletions

diff --git a/src/modules/math/libkvimath.cpp b/src/modules/math/libkvimath.cpp
index 917ec558d..8a60d18e4 100644
--- a/src/modules/math/libkvimath.cpp
+++ b/src/modules/math/libkvimath.cpp
@@ -30,7 +30,7 @@
 
 // Workaround for lost isnan and isinf definitions after
 // inclusion of iostream.h on some MacOS X systems
-#ifdef Q_OS_MACX
+#ifdef COMPILE_ON_MAC
 	#ifndef isnan
 		extern "C" int isnan (double);
 	#endif
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"
 
diff --git a/src/modules/my/idle_mac.cpp b/src/modules/my/idle_mac.cpp
index 5234df5cc..05207fd06 100644
--- a/src/modules/my/idle_mac.cpp
+++ b/src/modules/my/idle_mac.cpp
@@ -18,7 +18,7 @@
  *
  */
 
-#ifdef Q_OS_MACX
+#ifdef COMPILE_ON_MAC
 
 	#include "idle.h"
 	#include <Carbon/Carbon.h>
diff --git a/src/modules/my/idle_x11.cpp b/src/modules/my/idle_x11.cpp
index 7b80f4377..d7a133ad9 100644
--- a/src/modules/my/idle_x11.cpp
+++ b/src/modules/my/idle_x11.cpp
@@ -17,7 +17,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
  */
-#ifndef Q_OS_MACX
+#ifndef COMPILE_ON_MAC
 #ifndef COMPILE_ON_WINDOWS
 
 #include"idle.h"
diff --git a/src/modules/notifier/notifierwindow.cpp b/src/modules/notifier/notifierwindow.cpp
index 2236f73f2..ed02067ec 100644
--- a/src/modules/notifier/notifierwindow.cpp
+++ b/src/modules/notifier/notifierwindow.cpp
@@ -66,7 +66,7 @@ KviNotifierWindow::KviNotifierWindow()
 #else
 			Qt::WStyle_Customize |
 			Qt::WStyle_NoBorder |
-#ifndef Q_OS_MACX
+#ifndef COMPILE_ON_MAC
 			Qt::WStyle_Tool |
 			Qt::WX11BypassWM |
 #endif
@@ -310,7 +310,7 @@ void KviNotifierWindow::doShow(bool bDoAnimate)
 			m_bNextDown = false;
 			m_bWriteDown = false;
 			m_bBlinkOn = false;
-		#if (!defined COMPILE_USE_QT4) || !(defined(COMPILE_USE_QT4) && (defined(COMPILE_ON_WINDOWS) || defined(Q_OS_MACX)))
+		#if (!defined COMPILE_USE_QT4) || !(defined(COMPILE_USE_QT4) && (defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MAC)))
 			m_imgDesktop = QPixmap::grabWindow(
 						QApplication::desktop()->winId(),
 						m_wndRect.x(),
@@ -329,11 +329,11 @@ void KviNotifierWindow::doShow(bool bDoAnimate)
 				m_dOpacity = OPACITY_STEP;
 				m_eState = Showing;
 				m_bCrashShowWorkAround=true;
-				#if (defined(COMPILE_ON_WINDOWS) || defined(Q_OS_MACX))
+				#if (defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MAC))
 				setWindowOpacity(m_dOpacity);
 				#endif
 				show();
-				#if (defined(COMPILE_ON_WINDOWS) || defined(Q_OS_MACX))
+				#if (defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MAC))
 					m_pShowHideTimer->start(40);
 				#else
 					m_pShowHideTimer->start(100);
@@ -398,7 +398,7 @@ void KviNotifierWindow::heartbeat()
 
 				if(!isVisible())show(); //!!!
 				if(m_pLineEdit->isVisible())m_pLineEdit->hide();
-				#if (defined(COMPILE_ON_WINDOWS) || defined(Q_OS_MACX))
+				#if (defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MAC))
 					setWindowOpacity(m_dOpacity);
 				#endif
 				update();
@@ -441,7 +441,7 @@ void KviNotifierWindow::heartbeat()
 			break;
 		case Hiding:
 			m_dOpacity -= OPACITY_STEP;
-			#if (defined(COMPILE_ON_WINDOWS) || defined(Q_OS_MACX))
+			#if (defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MAC))
 				setWindowOpacity(m_dOpacity);
 			#endif
 			if(m_pLineEdit->isVisible())m_pLineEdit->hide();
@@ -505,7 +505,7 @@ void KviNotifierWindow::doHide(bool bDoAnimate)
 			connect(m_pShowHideTimer,SIGNAL(timeout()),this,SLOT(heartbeat()));
 			m_dOpacity = 1.0 - OPACITY_STEP;
 			m_eState = Hiding;
-			#if (defined(COMPILE_ON_WINDOWS) || defined(Q_OS_MACX))
+			#if (defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MAC))
 				setWindowOpacity(m_dOpacity);
 				update();
 				m_pShowHideTimer->start(40);
@@ -646,7 +646,7 @@ void KviNotifierWindow::paintEvent(QPaintEvent * e)
 	{
 			QPainter px(this);
 	
-	#if (defined(COMPILE_ON_WINDOWS) || defined(Q_OS_MACX))
+	#if (defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MAC))
 		px.drawPixmap(0,0,m_pixForeground);
 	#else
 		QImage temp_image = m_pixForeground.convertToImage();
diff --git a/src/modules/reguser/dialog.cpp b/src/modules/reguser/dialog.cpp
index 4c23c5338..09a800be8 100644
--- a/src/modules/reguser/dialog.cpp
+++ b/src/modules/reguser/dialog.cpp
@@ -280,7 +280,7 @@ KviRegisteredUsersDialog::KviRegisteredUsersDialog(QWidget * par)
 

 KviRegisteredUsersDialog::~KviRegisteredUsersDialog()

 {

-#ifndef Q_OS_MACX

+#ifndef COMPILE_ON_MAC

 	if(!parent())KVI_OPTION_RECT(KviOption_rectRegisteredUsersDialogGeometry) = QRect(pos().x(),pos().y(),size().width(),size().height());

 #else

 	if(!parent())KVI_OPTION_RECT(KviOption_rectRegisteredUsersDialogGeometry) = geometry();