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

19 files changed, 38 insertions, 35 deletions

diff --git a/src/kvilib/config/kvi_settings.h b/src/kvilib/config/kvi_settings.h
index 5d9bd2217..ed8e4dc82 100644
--- a/src/kvilib/config/kvi_settings.h
+++ b/src/kvilib/config/kvi_settings.h
@@ -57,6 +57,9 @@
 	#endif
 
 #else
+	#ifdef Q_OS_MACX
+		#define COMPILE_ON_MAC
+	#endif
 
 	#ifdef KVIRC_EXTERNAL_MODULE
 		// when compiling an external module
diff --git a/src/kvilib/config/kvi_sourcesdate.h b/src/kvilib/config/kvi_sourcesdate.h
index e8265dd35..7b78f3917 100644
--- a/src/kvilib/config/kvi_sourcesdate.h
+++ b/src/kvilib/config/kvi_sourcesdate.h
@@ -28,8 +28,8 @@
 
 #include "kvi_settings.h"
 
-#define KVI_SOURCES_DATE "20080412"
-#define KVI_SOURCES_DATE_NUMERIC 0x20080412
+#define KVI_SOURCES_DATE "20080420"
+#define KVI_SOURCES_DATE_NUMERIC 0x20080420
 
 // this is the date of the sources before that we should force a setup
 // this is usually changed only when a setup is really needed because
diff --git a/src/kvilib/ext/kvi_osinfo.cpp b/src/kvilib/ext/kvi_osinfo.cpp
index ba2eff281..3549fbdbc 100644
--- a/src/kvilib/ext/kvi_osinfo.cpp
+++ b/src/kvilib/ext/kvi_osinfo.cpp
@@ -438,7 +438,7 @@ namespace KviOsInfo
 #ifdef COMPILE_ON_WINDOWS

 		return "Windows";

 #else

-	#ifdef Q_OS_MACX

+	#ifdef COMPILE_ON_MAC

 		return "MacOS X";

 	#else

 		struct utsname uts;

diff --git a/src/kvirc/kernel/kvi_app_setup.cpp b/src/kvirc/kernel/kvi_app_setup.cpp
index 75fe7f58e..41013b61a 100644
--- a/src/kvirc/kernel/kvi_app_setup.cpp
+++ b/src/kvirc/kernel/kvi_app_setup.cpp
@@ -568,11 +568,11 @@ void KviApp::findGlobalKvircDirectory()
 	// Non KDE compilation , or not found under $KDEDIR/share/apps/kvirc/$VERSION_BRANCH
 
 	// Check for MacOS X Bundle compilation
-	#ifdef Q_OS_MACX
+	#ifdef COMPILE_ON_MAC
 		m_szGlobalKvircDir = applicationDirPath();
 		m_szGlobalKvircDir+= "/../Resources/";
 		if(checkGlobalKvircDirectory(m_szGlobalKvircDir))return;
-	#endif //Q_OS_MACX
+	#endif //COMPILE_ON_MAC
 
 	// Check usual directories...
 	for(int j=0;usualKvircGlobalPrePath[j] != 0;j++){
@@ -623,13 +623,13 @@ void KviApp::findGlobalKvircDirectory()
 				"A detailed explaination of the Kvirc directory system is in the INSTALL document\n"\
 				"shipped with the kvirc source dirstribution.\n"\
 				"Trying to run anyway...");
-	#elif defined(Q_OS_MACX)
+	#elif defined(COMPILE_ON_MAC)
 		KviMessageBox::warning("Unable to find the shared KVIrc directory.\n"\
 				"The usual path for this directory is ./Contents/Resources/kvirc within your application bundle.\n"\
 				"Something went wrong during the bundle creation.\n"\
 				"Please read the documentation and make sure to set proper paths for --prefix, -bindir, -libdir and --datadir during the configure run.\n"\
 				"Trying to run anyway...\n");
-	#else //!defined(COMPILE_KDE_SUPPORT) && !defined(Q_OS_MACX)
+	#else //!defined(COMPILE_KDE_SUPPORT) && !defined(COMPILE_ON_MAC)
 		KviMessageBox::warning("Unable to find the shared KVIrc directory.\n"\
 				"The usual path for this directory is /usr/local/share/kvirc.\n"\
 				"Are you sure that 'make install' worked correctly ?\n"\
@@ -638,7 +638,7 @@ void KviApp::findGlobalKvircDirectory()
 				"A detailed explaination of the KVIrc directory system is in the INSTALL document\n"\
 				"shipped with the kvirc source dirstribution.\n"\
 				"Trying to run anyway...\n");
-	#endif //!Q_OS_MACX
+	#endif //!COMPILE_ON_MAC
 #endif //!COMPILE_ON_WINDOWS
 }
 
diff --git a/src/kvirc/kernel/kvi_options.cpp b/src/kvirc/kernel/kvi_options.cpp
index e16791fc8..45bf61d96 100644
--- a/src/kvirc/kernel/kvi_options.cpp
+++ b/src/kvirc/kernel/kvi_options.cpp
@@ -318,7 +318,7 @@ KviBoolOption g_boolOptionsTable[KVI_NUM_BOOL_OPTIONS]=
 	#ifdef COMPILE_KDE_SUPPORT
 		#define RUN_THE_BROWSER "run kfmclient openURL $0"
 	#else
-		#ifdef Q_OS_MACX
+		#ifdef COMPILE_ON_MAC
 			#define RUN_THE_BROWSER "run open $0"
 		#else
 			#define RUN_THE_BROWSER "run kvi_run_netscape $0"
diff --git a/src/kvirc/ui/kvi_input.cpp b/src/kvirc/ui/kvi_input.cpp
index 355cdc8e2..2ea8ed6df 100644
--- a/src/kvirc/ui/kvi_input.cpp
+++ b/src/kvirc/ui/kvi_input.cpp
@@ -1355,7 +1355,7 @@ void KviInputEditor::keyPressEvent(QKeyEvent *e)
 
 //Make CtrlKey and CommandKey ("Apple") behave equally on MacOSX.
 //This way typical X11 and Apple shortcuts can be used simultanously within the input line.
-#ifndef Q_OS_MACX
+#ifndef COMPILE_ON_MAC
 	if(e->state() & Qt::ControlButton)
 #else
 	if((e->state() & Qt::ControlButton) || (e->state() & Qt::MetaButton))
diff --git a/src/kvirc/ui/kvi_mdichild.cpp b/src/kvirc/ui/kvi_mdichild.cpp
index bc9148219..115df63ee 100644
--- a/src/kvirc/ui/kvi_mdichild.cpp
+++ b/src/kvirc/ui/kvi_mdichild.cpp
@@ -47,7 +47,7 @@
 #include <QEvent>
 #include <QMouseEvent>
 
-#ifdef Q_OS_MACX
+#ifdef COMPILE_ON_MAC
 	#include "kvi_app.h"  //Needed for g_pApp
 	#include <QDesktopWidget>
 #endif
@@ -513,7 +513,7 @@ void KviMdiChild::unsetClient()
 	setFocusProxy(0); //remove the focus proxy...
 	//Kewl...the reparent function has a small prob now..
 	//the new toplelvel widgets gets not reenabled for dnd
-#ifndef Q_OS_MACX
+#ifndef COMPILE_ON_MAC
 	m_pClient->reparent(0,m_pClient->mapToGlobal(QPoint(0,0)),true);
 #else
 	QRect r = g_pApp->desktop()->availableGeometry(m_pClient); 
diff --git a/src/kvirc/ui/kvi_mdimanager.cpp b/src/kvirc/ui/kvi_mdimanager.cpp
index 476117960..4e4ab7a39 100644
--- a/src/kvirc/ui/kvi_mdimanager.cpp
+++ b/src/kvirc/ui/kvi_mdimanager.cpp
@@ -487,7 +487,7 @@ void KviMdiManager::updateSDIMode()
 // This would result in an addictional main menu bar entry on MacOSX which would trigger a popup menu and not
 // a submenu. Due to the optical reasons it is removed here.
 // The same popup is triggered by right clicking on the window name in the channel window list.
-#ifndef Q_OS_MACX
+#ifndef COMPILE_ON_MAC
 	KviMenuBar * b = m_pFrm->mainMenuBar();
 
 	const QPixmap * pix = lpC ? lpC->icon() : 0;
@@ -506,7 +506,7 @@ void KviMdiManager::updateSDIMode()
 	} else {
 		m_pSdiIconButton->setPixmap(*pix);
 	}
-#endif //Q_OS_MACX
+#endif //COMPILE_ON_MAC
 }
 
 void KviMdiManager::activeChildSystemPopup()
diff --git a/src/kvirc/ui/kvi_menubar.cpp b/src/kvirc/ui/kvi_menubar.cpp
index de88f65b3..435324a83 100644
--- a/src/kvirc/ui/kvi_menubar.cpp
+++ b/src/kvirc/ui/kvi_menubar.cpp
@@ -52,12 +52,12 @@ KviMenuBar::KviMenuBar(KviFrame * par,const char * name)
 	
 	KviTalPopupMenu * pop = new KviTalPopupMenu(this,"KVIrc");
 	connect(pop,SIGNAL(aboutToShow()),this,SLOT(setupMainPopup()));
-#ifndef Q_OS_MACX
+#ifndef COMPILE_ON_MAC
 	addDefaultItem("&KVIrc",pop);
 #else
 	// Qt/Mac creates already a "KVirc" menu item on its own, and we don't like double entries ;-)
 	addDefaultItem("&IRC",pop);
-#endif //Q_OS_MACX
+#endif //COMPILE_ON_MAC
 	m_pRecentServersPopup = new KviTalPopupMenu(this,"recentservers");
 	connect(m_pRecentServersPopup,SIGNAL(aboutToShow()),this,SLOT(setupRecentServersPopup()));
 	connect(m_pRecentServersPopup,SIGNAL(activated(int)),this,SLOT(newConnectionToServer(int)));
@@ -244,11 +244,11 @@ void KviMenuBar::setupMainPopup()
 	}
 	
 // Qt/Mac creates a Quit item on its own
-#ifndef Q_OS_MACX
+#ifndef COMPILE_ON_MAC
 	main->insertSeparator();
 
 	main->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_QUITAPP)),__tr2qs("&Quit"),g_pApp,SLOT(quit()));
-#endif //Q_OS_MACX
+#endif //COMPILE_ON_MAC
 }
 
 
diff --git a/src/kvirc/ui/kvi_window.cpp b/src/kvirc/ui/kvi_window.cpp
index a05196233..3836db0b9 100644
--- a/src/kvirc/ui/kvi_window.cpp
+++ b/src/kvirc/ui/kvi_window.cpp
@@ -1201,7 +1201,7 @@ void KviWindow::restore()
 
 QRect KviWindow::externalGeometry()
 {
-#ifndef Q_OS_MACX
+#ifndef COMPILE_ON_MAC
 	return mdiParent() ? mdiParent()->restoredGeometry() : frameGeometry();
 #else
 	return mdiParent() ? mdiParent()->restoredGeometry() : geometry();
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();