code clean; applied patch for MacOS X

git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@1370 17fca916-40b9-46aa-a4ea-0a15b648b75c

56 files changed, 160 insertions, 333 deletions

diff --git a/TODO-Qt4 b/TODO-Qt4
index a135a1f98..564511837 100644
--- a/TODO-Qt4
+++ b/TODO-Qt4
@@ -43,79 +43,13 @@ src/kvilib/tal
 
 src/kvirc
 src/kvirc/kernel
-	kvi_action.cpp
-	kvi_action.h
-	kvi_actionmanager.cpp
-	kvi_actionmanager.h
 	kvi_app.cpp
-	kvi_app.h
-	kvi_app_fs.cpp
-	kvi_app_setup.cpp
-	kvi_asynchronousconnectiondata.cpp
-	kvi_asynchronousconnectiondata.h
-	kvi_coreactionnames.h
-	kvi_coreactions.cpp
-	kvi_coreactions.h
 	kvi_customtoolbardescriptor.cpp
 	kvi_customtoolbardescriptor.h
 	kvi_customtoolbarmanager.cpp
 	kvi_customtoolbarmanager.h
-	kvi_filetransfer.cpp
-	kvi_filetransfer.h
 	kvi_iconmanager.cpp
 	kvi_iconmanager.h
-	kvi_internalcmd.cpp
-	kvi_internalcmd.h
-	kvi_ipc.cpp
-	kvi_ipc.h
-	kvi_ircconnection.cpp
-	kvi_ircconnection.h
-	kvi_ircconnectionantictcpflooddata.cpp
-	kvi_ircconnectionantictcpflooddata.h
-	kvi_ircconnectionasyncwhoisdata.cpp
-	kvi_ircconnectionasyncwhoisdata.h
-	kvi_ircconnectionnetsplitdetectordata.cpp
-	kvi_ircconnectionnetsplitdetectordata.h
-	kvi_ircconnectionserverinfo.cpp
-	kvi_ircconnectionserverinfo.h
-	kvi_ircconnectionstatedata.cpp
-	kvi_ircconnectionstatedata.h
-	kvi_ircconnectionstatistics.cpp
-	kvi_ircconnectionstatistics.h
-	kvi_ircconnectiontarget.cpp
-	kvi_ircconnectiontarget.h
-	kvi_ircconnectiontargetresolver.cpp
-	kvi_ircconnectiontargetresolver.h
-	kvi_ircconnectionuserinfo.cpp
-	kvi_ircconnectionuserinfo.h
-	kvi_irccontext.cpp
-	kvi_irccontext.h
-	kvi_ircdatastreammonitor.cpp
-	kvi_ircdatastreammonitor.h
-	kvi_irclink.cpp
-	kvi_irclink.h
-	kvi_ircsocket.cpp
-	kvi_ircsocket.h
-	kvi_ircurl.cpp
-	kvi_ircurl.h
-	kvi_lagmeter.cpp
-	kvi_lagmeter.h
-	kvi_main.cpp
-	kvi_notifylist.cpp
-	kvi_notifylist.h
-	kvi_options.cpp
-	kvi_options.h
-	kvi_out.h
-	kvi_sslmaster.cpp
-	kvi_sslmaster.h
-	kvi_texticonmanager.cpp
-	kvi_texticonmanager.h
-	kvi_theme.cpp
-	kvi_theme.h
-	kvi_useraction.cpp
-	kvi_useraction.h
-	kvi_userinput.cpp
-	kvi_userinput.h
 src/kvirc/ui
 	kvi_actiondrawer.cpp
 	kvi_actiondrawer.h
diff --git a/src/kvirc/kernel/kvi_action.cpp b/src/kvirc/kernel/kvi_action.cpp
index 50c26280f..724436681 100644
--- a/src/kvirc/kernel/kvi_action.cpp
+++ b/src/kvirc/kernel/kvi_action.cpp
@@ -36,10 +36,9 @@
 #include "kvi_console.h"
 #include "kvi_query.h"
 #include "kvi_styled_controls.h"
-
-#include <qtoolbutton.h>
 #include "kvi_tal_popupmenu.h"
 
+#include <QToolButton>
 
 KviAction::~KviAction()
 {
@@ -418,9 +417,8 @@ QWidget * KviAction::addToCustomToolBar(KviCustomToolBar *pParentToolBar)
 			visibleName(),
 			visibleName(),
 			this,SLOT(activate()),pParentToolBar,m_szName);
-#ifdef COMPILE_USE_QT4
+
 	pParentToolBar->addWidget(b);
-#endif
 	if(!isEnabled())b->setEnabled(false);
 	registerWidget(b);
 	return b;
@@ -431,4 +429,3 @@ void KviAction::activate()
 	if(isEnabled())
 		emit activated();
 }
-
diff --git a/src/kvirc/kernel/kvi_action.h b/src/kvirc/kernel/kvi_action.h
index 609d434a1..242028eb3 100644
--- a/src/kvirc/kernel/kvi_action.h
+++ b/src/kvirc/kernel/kvi_action.h
@@ -27,8 +27,8 @@
 #include "kvi_settings.h"
 #include "kvi_pointerlist.h"
 
-#include <qobject.h>
-#include <qstring.h>
+#include <QObject>
+#include <QString>
 
 // The action name is INTERNAL: it should be never shown to the user
 // if it contains a dot then the part before the dot is considered to
diff --git a/src/kvirc/kernel/kvi_actionmanager.cpp b/src/kvirc/kernel/kvi_actionmanager.cpp
index 0a3dc7e12..869cf9fd7 100644
--- a/src/kvirc/kernel/kvi_actionmanager.cpp
+++ b/src/kvirc/kernel/kvi_actionmanager.cpp
@@ -318,4 +318,3 @@ void KviActionManager::listActionsByCategory(const QString &szCatName,KviPointer
 		++it;
 	}
 }
-
diff --git a/src/kvirc/kernel/kvi_actionmanager.h b/src/kvirc/kernel/kvi_actionmanager.h
index 9daad5c4d..0e2c1b5a4 100644
--- a/src/kvirc/kernel/kvi_actionmanager.h
+++ b/src/kvirc/kernel/kvi_actionmanager.h
@@ -26,10 +26,10 @@
 
 #include "kvi_settings.h"
 #include "kvi_action.h"
-
-#include <qobject.h>
 #include "kvi_pointerhashtable.h"
 
+#include <QObject>
+
 class KviActionDrawer;
 class KviCustomToolBar;
 
diff --git a/src/kvirc/kernel/kvi_app.cpp b/src/kvirc/kernel/kvi_app.cpp
index 9361ab1fa..8f1a15c96 100644
--- a/src/kvirc/kernel/kvi_app.cpp
+++ b/src/kvirc/kernel/kvi_app.cpp
@@ -84,29 +84,26 @@
 #include "kvi_kvs_object_controller.h"
 #include "kvi_kvs_eventtriggers.h"
 #include "kvi_sourcesdate.h"
-
-#include "kvi_tal_popupmenu.h"
-#include <qsplitter.h>
-#include <qstringlist.h>
 #include "kvi_pointerhashtable.h"
-#include <qmime.h>
-#ifdef COMPILE_USE_QT4
-	#include <q3mimefactory.h>
-#endif
+#include "kvi_tal_popupmenu.h"
 #include "kvi_tal_listbox.h"
-#include <qclipboard.h>
-#include <qmessagebox.h>
-#include <qtextcodec.h>
-#include <qmetaobject.h>
+
+#include <QSplitter>
+#include <QStringList>
+#include <QClipboard>
+#include <QMessageBox>
+#include <QTextCodec>
+#include <QMetaObject>
+
+// FIXME: Qt4 #include <QMimeData>
+#include <q3mimefactory.h>
 
 #ifdef COMPILE_SSL_SUPPORT
 	#include "kvi_ssl.h"
 #endif
 
-#ifdef COMPILE_USE_QT4
 #ifdef COMPILE_ON_WINDOWS
-#include <QPluginLoader>
-#endif
+	#include <QPluginLoader>
 #endif
 
 KVIRC_API KviApp                       * g_pApp                    = 0; // global application pointer
@@ -158,7 +155,7 @@ QPixmap                             * g_pActivityMeterPixmap    = 0;
 		KSharedPixmap         * g_pKdeDesktopBackground             = 0; // the shared pixmap that we get from KWin
 	#endif
 
-	#include <qimage.h>
+	#include <QImage>
 
 	KVIRC_API QPixmap               * g_pShadedParentGlobalDesktopBackground = 0; // the pixmap that we use for MdiManager
 	KVIRC_API QPixmap               * g_pShadedChildGlobalDesktopBackground  = 0; // the pixmap that we use for MdiChild
@@ -217,7 +214,6 @@ void KviApp::setup()
 	loadDirectories();
 	KviStringConversion::init(m_szGlobalKvircDir,m_szLocalKvircDir);
 
-#ifdef COMPILE_USE_QT4
 #ifdef COMPILE_ON_WINDOWS
 	//need to load image plugins:(
 	QString szPluginsDir;
@@ -226,7 +222,6 @@ void KviApp::setup()
 	//KviMessageBox::information(libraryPaths().join(";"));
 	//debug("%1",loader.isLoaded());
 #endif
-#endif
 
 	// check if we want to permanently disable the splash screen
 	// we do it once for every version: the user should see the new splash screens at least once
@@ -263,11 +258,7 @@ void KviApp::setup()
 	list.append(tmp);
 	getGlobalKvircDirectory(tmp,HelpNoIntl);
 	list.append(tmp);
-#ifdef COMPILE_USE_QT4
 	Q3MimeSourceFactory::defaultFactory()->setFilePath(list);
-#else
-	QMimeSourceFactory::defaultFactory()->setFilePath(list);
-#endif
 
 	KVI_SPLASH_SET_PROGRESS(1)
 
@@ -469,7 +460,6 @@ void KviApp::setup()
 
 	KviDoubleBuffer::init();
 
-#ifdef COMPILE_USE_QT4
 	QString szStylesheetFile;
 	getGlobalKvircDirectory(szStylesheetFile,Config,"style.css");
 	if(KviFileUtils::fileExists(szStylesheetFile))
@@ -480,7 +470,6 @@ void KviApp::setup()
 		szStyleData.replace("local://",m_szLocalKvircDir);
 		setStyleSheet(szStyleData);
 	}
-#endif
 
 	// create the frame window, we're almost up and running...
 	createFrame();
@@ -529,8 +518,6 @@ void KviApp::frameDestructorCallback()
 	}
 }
 
-
-
 KviApp::~KviApp()
 {
 	// Another critical phase.
@@ -1107,12 +1094,12 @@ void KviApp::fileDownloadTerminated(bool bSuccess,const QString &szRemoteUrl,con
 #endif
 			rinfo.activate();
 
-		    QString name = QString("DESKTOP%1").arg(rinfo.currentDesktop());
+			QString name = QString("DESKTOP%1").arg(rinfo.currentDesktop());
 
 			g_pKdeDesktopBackground = new KSharedPixmap();
 			connect(g_pKdeDesktopBackground,SIGNAL(done(bool)),this,SLOT(kdeRootPixmapDownloadComplete(bool)));
 
-		    if(!(g_pKdeDesktopBackground->isAvailable(name)))
+			if(!(g_pKdeDesktopBackground->isAvailable(name)))
 			{
 				// Pixmap not available!!!
 				delete g_pKdeDesktopBackground;
@@ -1293,7 +1280,7 @@ void KviApp::kdeRootPixmapDownloadComplete(bool bSuccess)
 	#ifdef COMPILE_KDE_SUPPORT
 		if(!bSuccess)
 		{
-			debug("Failed to download the KDE root background image...");
+			qDebug("Failed to download the KDE root background image...");
 		} else {
 			// downloaded!
 			// create shaded copies...
@@ -1572,7 +1559,7 @@ void KviApp::autoConnectToServers()
 
 void KviApp::createFrame()
 {
-	if(g_pFrame)debug("WARNING: Creating the main frame twice!");
+	if(g_pFrame)qDebug("WARNING: Creating the main frame twice!");
 	g_pFrame = new KviFrame();
 	g_pFrame->createNewConsole(true);
 
diff --git a/src/kvirc/kernel/kvi_app_fs.cpp b/src/kvirc/kernel/kvi_app_fs.cpp
index 31309ddea..2c299ecef 100644
--- a/src/kvirc/kernel/kvi_app_fs.cpp
+++ b/src/kvirc/kernel/kvi_app_fs.cpp
@@ -35,9 +35,9 @@
 #include "kvi_defaults.h"
 #include "kvi_iconmanager.h"
 
-#include <qdir.h>
-#include <qfileinfo.h>
-#include <qdatetime.h>
+#include <QDir>
+#include <QFileInfo>
+#include <QDateTime>
 
 extern KviMediaManager * g_pMediaManager;
 
diff --git a/src/kvirc/kernel/kvi_app_setup.cpp b/src/kvirc/kernel/kvi_app_setup.cpp
index 502861dc1..94179947a 100644
--- a/src/kvirc/kernel/kvi_app_setup.cpp
+++ b/src/kvirc/kernel/kvi_app_setup.cpp
@@ -27,16 +27,11 @@
 //#define _KVI_DEBUG_CHECK_RANGE_
 //#include "kvi_debug.h"
 
-#include <qtextcodec.h>
-
 #include "kvi_settings.h"
 #include "kvi_defaults.h"
-
 #include "kvi_window.h"
 #include "kvi_frame.h"
-
 #include "kvi_app.h"
-
 #include "kvi_fileutils.h"
 #include "kvi_locale.h"
 #include "kvi_msgbox.h"
@@ -62,11 +57,10 @@
 
 #endif //COMPILE_ON_WINDOWS
 
-#include <qfile.h>
-#include <qtextstream.h>
-#include <qdir.h>
-
-
+#include <QTextCodec>
+#include <QFile>
+#include <QTextStream>
+#include <QDir>
 
 
 //
@@ -626,18 +620,18 @@ void KviApp::findGlobalKvircDirectory()
 				"shipped with the kvirc source dirstribution.\n"\
 				"Trying to run anyway...");
 	#elif defined(Q_OS_MACX)
-		KviMessageBox::warning("Unable to find the shared Kvirc directory.\n"\
+		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)
-		KviMessageBox::warning("Unable to find the shared Kvirc directory.\n"\
+		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"\
 				"Please make sure that you have the read permission to that directory.\n"\
 				"You may also need to rerun 'make install'.\n"\
-				"A detailed explaination of the Kvirc directory system is in the INSTALL document\n"\
+				"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
diff --git a/src/kvirc/kernel/kvi_asynchronousconnectiondata.h b/src/kvirc/kernel/kvi_asynchronousconnectiondata.h
index b4790d920..8fa4e3d7a 100644
--- a/src/kvirc/kernel/kvi_asynchronousconnectiondata.h
+++ b/src/kvirc/kernel/kvi_asynchronousconnectiondata.h
@@ -47,7 +47,7 @@ public:
 	QString            szLinkFilter;
 	QString            szPass;
 	QString            szNick;
-    QString            szInitUMode;
+	QString            szInitUMode;
 	KviIrcServerReconnectInfo * m_pReconnectInfo;
 };
 
diff --git a/src/kvirc/kernel/kvi_coreactions.cpp b/src/kvirc/kernel/kvi_coreactions.cpp
index 131e21163..25a027a1c 100644
--- a/src/kvirc/kernel/kvi_coreactions.cpp
+++ b/src/kvirc/kernel/kvi_coreactions.cpp
@@ -43,11 +43,10 @@
 #include "kvi_coreactionnames.h"
 #include "kvi_ircconnectionserverinfo.h"
 #include "kvi_styled_controls.h"
-
 #include "kvi_kvs_script.h"
-
 #include "kvi_tal_popupmenu.h"
-#include <qobject.h>
+
+#include <QObject>
 
 
 // Ctrl+Alt+A : KviGoAwayAction
@@ -467,12 +466,6 @@ void KviIrcContextDisplayAction::setup()
 bool KviIrcContextDisplayAction::addToPopupMenu(KviTalPopupMenu *p)
 {
 	// QT4SUX: Widgets can be no longer added to popup menus.. what about labels ?
-#ifndef COMPILE_USE_QT4
-	if(!setupDone())setup();
-	KviIrcContextDisplay * w = new KviIrcContextDisplay(p,"kvirc.irccontextdisplay");
-	registerWidget(w);
-	p->insertItem(w);
-#endif
 	return true;
 }
 
@@ -480,9 +473,7 @@ QWidget * KviIrcContextDisplayAction::addToCustomToolBar(KviCustomToolBar *t)
 {
 	if(!setupDone())setup();
 	KviIrcContextDisplay * w = new KviIrcContextDisplay(t,"kvirc.irccontextdisplay");
-#ifdef COMPILE_USE_QT4
 	t->addWidget(w);
-#endif
 	registerWidget(w);
 	return w;
 }
@@ -538,16 +529,11 @@ QWidget * KviSeparatorAction::addToCustomToolBar(KviCustomToolBar *t)
 	if(!setupDone())setup();
 	QWidget * w = new KviCustomToolBarSeparator(t,"kvirc.separator");
 	registerWidget(w);
-#ifdef COMPILE_USE_QT4
 	t->addWidget(w);
-#endif
 	return w;
 }
 
 
-
-
-
 KviConnectAction::KviConnectAction(QObject * pParent)
 : KviAction(pParent,
 	QString(KVI_COREACTION_CONNECT),
@@ -689,19 +675,12 @@ QWidget * KviConnectAction::addToCustomToolBar(KviCustomToolBar *t)
 			m_szConnectString,
 			this,SLOT(activate()),t,name());
 	registerWidget(b);
-#ifdef COMPILE_USE_QT4
 	t->addWidget(b);
-#endif
 	activeContextStateChanged();
 	return b;
 }
 
 
-
-
-
-
-
 KviSubmenuAction::KviSubmenuAction(QObject * pParent,
 		const QString &szName,
 		const QString &szScriptCode,
@@ -766,23 +745,14 @@ QWidget * KviSubmenuAction::addToCustomToolBar(KviCustomToolBar *t)
 			this,SLOT(activate()),t,name());
 	b->setPopup(m_pPopup);
 	
-#ifdef COMPILE_USE_QT4
 	b->setPopupMode( scriptCode().isEmpty() ? QToolButton::InstantPopup :  QToolButton::MenuButtonPopup);
 	t->addWidget(b);
-#else
-	b->setShowSubmenuIndicator(true);
-	b->setPopupDelay(1);
-#endif
 	registerWidget(b);
 	if(!isEnabled())b->setEnabled(false);
 	return b;
 }
 
 
-
-
-
-
 KviJoinChannelAction::KviJoinChannelAction(QObject * pParent)
 : KviSubmenuAction(pParent,
 	QString(KVI_COREACTION_CHANNELMENU),
@@ -872,10 +842,6 @@ void KviChangeNickAction::popupActivated(int id)
 }
 
 
-
-
-
-
 KviConnectToServerAction::KviConnectToServerAction(QObject * pParent)
 : KviSubmenuAction(pParent,
 	QString(KVI_COREACTION_SERVERMENU),
@@ -919,9 +885,6 @@ void KviConnectToServerAction::popupActivated(int id)
 }
 
 
-
-
-
 KviChangeUserModeAction::KviChangeUserModeAction(QObject * pParent)
 : KviSubmenuAction(pParent,
 	QString(KVI_COREACTION_USERMODEMENU),
@@ -1111,23 +1074,12 @@ QWidget * KviGoAwayAction::addToCustomToolBar(KviCustomToolBar *t)
 			m_szAwayString,
 			this,SLOT(activate()),t,name());
 	registerWidget(b);
-#ifdef COMPILE_USE_QT4
 	t->addWidget(b);
-#endif
 	activeContextStateChanged();
 	return b;
 }
 
 
-
-
-
-
-
-
-
-
-
 KviIrcToolsAction::KviIrcToolsAction(QObject * pParent)
 : KviSubmenuAction(pParent,
 	QString(KVI_COREACTION_IRCTOOLS),
@@ -1160,10 +1112,6 @@ void KviIrcToolsAction::popupActivated(int id)
 }
 
 
-
-
-
-
 KviIrcOperationsAction::KviIrcOperationsAction(QObject * pParent)
 : KviSubmenuAction(pParent,
 	QString(KVI_COREACTION_IRCACTIONS),
@@ -1200,5 +1148,3 @@ void KviIrcOperationsAction::popupAboutToShow()
 void KviIrcOperationsAction::popupActivated(int id)
 {
 }
-
-
diff --git a/src/kvirc/kernel/kvi_coreactions.h b/src/kvirc/kernel/kvi_coreactions.h
index e92de9601..832438cc9 100644
--- a/src/kvirc/kernel/kvi_coreactions.h
+++ b/src/kvirc/kernel/kvi_coreactions.h
@@ -29,7 +29,7 @@
 #include "kvi_kvs_action.h"
 #include "kvi_pointerlist.h"
 
-#include <qtoolbutton.h>
+#include <QToolButton>
 
 class KviConnectAction : public KviAction
 {
diff --git a/src/kvirc/kernel/kvi_customtoolbarmanager.cpp b/src/kvirc/kernel/kvi_customtoolbarmanager.cpp
index 034c086ea..7446306b7 100644
--- a/src/kvirc/kernel/kvi_customtoolbarmanager.cpp
+++ b/src/kvirc/kernel/kvi_customtoolbarmanager.cpp
@@ -215,7 +215,7 @@ void KviCustomToolBarManager::save(const QString &szFileName)
 // THIS IS A COMPATIBILITY ENTRY ADDED AT 3.0.2 TIME THAT SHOULD BE DROPPED IN A COUPLE OF VERSION BUMPS!
 #ifdef SCRIPTTOOLBAR_COMPAT
 
-#include <qdir.h>
+#include <QDir>
 void KviCustomToolBarManager::loadScripttoolbarsCompat(const QString &szFileName)
 {
 	KviConfig cfg(szFileName,KviConfig::Read);
diff --git a/src/kvirc/kernel/kvi_filetransfer.h b/src/kvirc/kernel/kvi_filetransfer.h
index 135a8c5a4..85c70a472 100644
--- a/src/kvirc/kernel/kvi_filetransfer.h
+++ b/src/kvirc/kernel/kvi_filetransfer.h
@@ -26,12 +26,11 @@
 //=============================================================================
 
 #include "kvi_settings.h"
-
-#include <qobject.h>
-
 #include "kvi_pointerlist.h"
 #include "kvi_tal_listview.h"
 
+#include <QObject>
+
 class KviFileTransfer;
 class KviWindow;
 class KviTalPopupMenu;
diff --git a/src/kvirc/kernel/kvi_iconmanager.h b/src/kvirc/kernel/kvi_iconmanager.h
index e50244397..f68e92df3 100644
--- a/src/kvirc/kernel/kvi_iconmanager.h
+++ b/src/kvirc/kernel/kvi_iconmanager.h
@@ -29,13 +29,11 @@
 #include "kvi_string.h"
 #include "kvi_avatar.h"
 #include "kvi_time.h"
-
-#include <qpixmap.h>
-#include <qobject.h>
-#include <qwidget.h>
 #include "kvi_pointerhashtable.h"
 
-
+#include <QPixmap>
+#include <QObject>
+#include <QWidget>
 
 #define KVI_SMALLICON_NONE 0
 #define KVI_SMALLICON_CLOSE 1
diff --git a/src/kvirc/kernel/kvi_ipc.cpp b/src/kvirc/kernel/kvi_ipc.cpp
index 109e91bba..1d9980fb8 100644
--- a/src/kvirc/kernel/kvi_ipc.cpp
+++ b/src/kvirc/kernel/kvi_ipc.cpp
@@ -54,14 +54,10 @@
 		#include <unistd.h>    // for getuid
 		#include <sys/types.h> // for getuid
 
-		#ifdef COMPILE_USE_QT4
-			#include <qx11info_x11.h>
-			#define kvi_ipc_get_xdisplay QX11Info::display
-			#define kvi_ipc_get_xrootwin QX11Info::appRootWindow
-		#else
-			#define kvi_ipc_get_xdisplay qt_xdisplay
-			#define kvi_ipc_get_xrootwin qt_xrootwin
-		#endif
+		//#include <qx11info_x11.h>
+		#include <QX11Info>
+		#define kvi_ipc_get_xdisplay QX11Info::display
+		#define kvi_ipc_get_xrootwin QX11Info::appRootWindow
 
 		static Atom kvi_atom_ipc_sentinel_window;
 		static Atom kvi_atom_ipc_remote_command;
diff --git a/src/kvirc/kernel/kvi_ipc.h b/src/kvirc/kernel/kvi_ipc.h
index dbc87a884..da566d4ca 100644
--- a/src/kvirc/kernel/kvi_ipc.h
+++ b/src/kvirc/kernel/kvi_ipc.h
@@ -31,18 +31,14 @@
 
 	#include "kvi_string.h"
 
-	#include <qwidget.h>
+	#include <QWidget>
 
 #ifdef COMPILE_ON_WINDOWS
  #include <winsock2.h>
 	#include <windows.h>
 #else //!COMPILE_ON_WINDOWS
 	#ifdef COMPILE_X11_SUPPORT
-		#ifdef COMPILE_USE_QT4
-			// We need this to be included BEFORE X11/Xlib.h
-			// because of preprocessor constant collisions...
-			#include <qcoreevent.h>
-		#endif
+		#include <qcoreevent.h>
 		#include "kvi_xlib.h" // for XEvent
 	#endif //!COMPILE_X11_SUPPORT
 #endif //!COMPILE_ON_WINDOWS
diff --git a/src/kvirc/kernel/kvi_ircconnection.cpp b/src/kvirc/kernel/kvi_ircconnection.cpp
index ded8088be..fc0f6f293 100644
--- a/src/kvirc/kernel/kvi_ircconnection.cpp
+++ b/src/kvirc/kernel/kvi_ircconnection.cpp
@@ -66,8 +66,8 @@
 #include "kvi_mirccntrl.h"
 #include "kvi_useridentity.h"
 
-#include <qtimer.h>
-#include <qtextcodec.h>
+#include <QTimer>
+#include <QTextCodec>
 
 extern KVIRC_API KviIrcServerDataBase           * g_pIrcServerDataBase;
 extern KVIRC_API KviProxyDataBase               * g_pProxyDataBase;
@@ -186,7 +186,7 @@ void KviIrcConnection::setupTextCodec()
 	if(!m_pTarget->server()->encoding().isEmpty())
 	{
 		m_pTextCodec = KviLocale::codecForName(m_pTarget->server()->encoding().latin1());
-		if(!m_pTextCodec)debug("KviIrcConnection: can't find QTextCodec for encoding %s",m_pTarget->server()->encoding().utf8().data());
+		if(!m_pTextCodec)qDebug("KviIrcConnection: can't find QTextCodec for encoding %s",m_pTarget->server()->encoding().utf8().data());
 	}
 	if(!m_pTextCodec)
 	{
@@ -194,7 +194,7 @@ void KviIrcConnection::setupTextCodec()
 		if(!m_pTarget->network()->encoding().isEmpty())
 		{
 			m_pTextCodec = KviLocale::codecForName(m_pTarget->network()->encoding().latin1());
-			if(!m_pTextCodec)debug("KviIrcConnection: can't find QTextCodec for encoding %s",m_pTarget->network()->encoding().utf8().data());
+			if(!m_pTextCodec)qDebug("KviIrcConnection: can't find QTextCodec for encoding %s",m_pTarget->network()->encoding().utf8().data());
 		}
 	}
 	if(!m_pTextCodec)
@@ -832,7 +832,7 @@ void KviIrcConnection::hostNameLookupTerminated(KviDns *pDns)
 	//
 	if(!m_pLocalhostDns)
 	{
-		debug("Something weird is happening: pDns != 0 but m_pLocalhostDns == 0 :/");
+		qDebug("Something weird is happening: pDns != 0 but m_pLocalhostDns == 0 :/");
 		return;
 	}
 
diff --git a/src/kvirc/kernel/kvi_ircconnection.h b/src/kvirc/kernel/kvi_ircconnection.h
index 4227c971b..b4ebc8b43 100644
--- a/src/kvirc/kernel/kvi_ircconnection.h
+++ b/src/kvirc/kernel/kvi_ircconnection.h
@@ -29,7 +29,8 @@
 #include "kvi_qcstring.h"
 #include "kvi_pointerlist.h"
 #include "kvi_time.h"
-#include <qobject.h>
+
+#include <QObject>
 
 class KviConsole;
 class KviIrcNetworkData;
diff --git a/src/kvirc/kernel/kvi_ircconnectiontargetresolver.cpp b/src/kvirc/kernel/kvi_ircconnectiontargetresolver.cpp
index e33def078..6cc1c1ab6 100644
--- a/src/kvirc/kernel/kvi_ircconnectiontargetresolver.cpp
+++ b/src/kvirc/kernel/kvi_ircconnectiontargetresolver.cpp
@@ -50,7 +50,7 @@
 #define __KVI_DEBUG__
 #include "kvi_debug.h"
 
-#include <qtimer.h>
+#include <QTimer>
 
 extern KVIRC_API KviIrcServerDataBase           * g_pIrcServerDataBase;
 extern KVIRC_API KviProxyDataBase               * g_pProxyDataBase;
diff --git a/src/kvirc/kernel/kvi_ircconnectiontargetresolver.h b/src/kvirc/kernel/kvi_ircconnectiontargetresolver.h
index c2646919a..ad9d10a2c 100644
--- a/src/kvirc/kernel/kvi_ircconnectiontargetresolver.h
+++ b/src/kvirc/kernel/kvi_ircconnectiontargetresolver.h
@@ -26,7 +26,8 @@
 
 #include "kvi_settings.h"
 #include "kvi_qstring.h"
-#include <qobject.h>
+
+#include <QObject>
 
 class KviConsole;
 class KviDns;
diff --git a/src/kvirc/kernel/kvi_irccontext.cpp b/src/kvirc/kernel/kvi_irccontext.cpp
index 107c93080..b4a8f47ba 100644
--- a/src/kvirc/kernel/kvi_irccontext.cpp
+++ b/src/kvirc/kernel/kvi_irccontext.cpp
@@ -56,7 +56,7 @@
 #define __KVI_DEBUG__
 #include "kvi_debug.h"
 
-#include <qtimer.h>
+#include <QTimer>
 
 // the irc context identifiers start from 1
 static unsigned int g_uNextIrcContextId = 1;
diff --git a/src/kvirc/kernel/kvi_irccontext.h b/src/kvirc/kernel/kvi_irccontext.h
index ab3baba12..e50340811 100644
--- a/src/kvirc/kernel/kvi_irccontext.h
+++ b/src/kvirc/kernel/kvi_irccontext.h
@@ -26,7 +26,7 @@
 
 #include "kvi_settings.h"
 #include "kvi_pointerlist.h"
-#include <qobject.h>
+#include <QObject>
 
 class KviChannel;
 class KviQuery;
diff --git a/src/kvirc/kernel/kvi_irclink.cpp b/src/kvirc/kernel/kvi_irclink.cpp
index 03c361d39..43d643a21 100644
--- a/src/kvirc/kernel/kvi_irclink.cpp
+++ b/src/kvirc/kernel/kvi_irclink.cpp
@@ -50,7 +50,7 @@
 #define __KVI_DEBUG__
 #include "kvi_debug.h"
 
-#include <qtimer.h>
+#include <QTimer>
 
 extern KVIRC_API KviIrcServerDataBase           * g_pIrcServerDataBase;
 extern KVIRC_API KviProxyDataBase               * g_pProxyDataBase;
diff --git a/src/kvirc/kernel/kvi_irclink.h b/src/kvirc/kernel/kvi_irclink.h
index 9d1595847..54ae8e035 100644
--- a/src/kvirc/kernel/kvi_irclink.h
+++ b/src/kvirc/kernel/kvi_irclink.h
@@ -26,7 +26,7 @@
 
 #include "kvi_settings.h"
 #include "kvi_qstring.h"
-#include <qobject.h>
+#include <QObject>
 
 class KviConsole;
 class KviIrcServer;
diff --git a/src/kvirc/kernel/kvi_ircsocket.cpp b/src/kvirc/kernel/kvi_ircsocket.cpp
index df449e91b..ff8417429 100644
--- a/src/kvirc/kernel/kvi_ircsocket.cpp
+++ b/src/kvirc/kernel/kvi_ircsocket.cpp
@@ -47,8 +47,8 @@
 	#include "kvi_sslmaster.h"
 #endif
 
-#include <qtimer.h>
-#include <qsocketnotifier.h>
+#include <QTimer>
+#include <QSocketNotifier>
 
 #ifndef COMPILE_ON_WINDOWS
 	#include <unistd.h> //for gettimeofday()
@@ -442,7 +442,7 @@ void KviIrcSocket::connectionEstabilished()
 
 void KviIrcSocket::connectedToProxy()
 {
-	if(!m_pProxy)debug("WARNING: connectedToProxy() without a m_pProxy!");
+	if(!m_pProxy)qDebug("WARNING: connectedToProxy() without a m_pProxy!");
 
 	// FIXME: Do we want to support SSL proxies ?
 	//        it would be just a matter of SSL handshaking
@@ -1254,7 +1254,7 @@ void KviIrcSocket::doSSLHandshake(int)
 
 	if(!m_pSSL)
 	{
-		debug("Ops... I've lost the SSL class ?");
+		qDebug("Ops... I've lost the SSL class ?");
 		reset();
 		return; // ops ?
 	}
@@ -1311,7 +1311,7 @@ void KviIrcSocket::doSSLHandshake(int)
 	}
 
 #else  //!COMPILE_SSL_SUPPORT
-	debug("Ops.. ssl handshake without ssl support!...aborting!");
+	qDebug("Ops.. ssl handshake without ssl support!...aborting!");
 	exit(-1);
 #endif //!COMPILE_SSL_SUPPORT
 }
diff --git a/src/kvirc/kernel/kvi_ircsocket.h b/src/kvirc/kernel/kvi_ircsocket.h
index 0b45cfedb..cb03039a8 100644
--- a/src/kvirc/kernel/kvi_ircsocket.h
+++ b/src/kvirc/kernel/kvi_ircsocket.h
@@ -30,7 +30,7 @@
 #include "kvi_time.h"
 #include "kvi_pointerlist.h"
 
-#include <qobject.h>
+#include <QObject>
 
 class KviIrcServer;
 class KviProxy;
diff --git a/src/kvirc/kernel/kvi_ircurl.h b/src/kvirc/kernel/kvi_ircurl.h
index b0c568607..bbf8f4631 100644
--- a/src/kvirc/kernel/kvi_ircurl.h
+++ b/src/kvirc/kernel/kvi_ircurl.h
@@ -30,7 +30,7 @@
 class KviIrcServer;
 class KviConsole;
 
-#include <qstringlist.h>
+#include <QStringList>
 
 // Create /server -u <server> commands (first free context)
 #define KVI_IRCURL_CONTEXT_FIRSTFREE 0
diff --git a/src/kvirc/kernel/kvi_lagmeter.cpp b/src/kvirc/kernel/kvi_lagmeter.cpp
index ab5eb4763..ef59f5c2d 100644
--- a/src/kvirc/kernel/kvi_lagmeter.cpp
+++ b/src/kvirc/kernel/kvi_lagmeter.cpp
@@ -66,9 +66,6 @@ KviLagMeter::KviLagMeter(KviIrcConnection * c)
 KviLagMeter::~KviLagMeter()
 {
 	if(m_pDeletionSignal)*m_pDeletionSignal = true;
-#ifndef COMPILE_USE_QT4
-	killTimers();
-#endif
 	delete m_pCheckList;
 }
 
diff --git a/src/kvirc/kernel/kvi_lagmeter.h b/src/kvirc/kernel/kvi_lagmeter.h
index 77adc533b..ccaaa337b 100644
--- a/src/kvirc/kernel/kvi_lagmeter.h
+++ b/src/kvirc/kernel/kvi_lagmeter.h
@@ -28,7 +28,7 @@
 #include "kvi_string.h"
 #include "kvi_pointerlist.h"
 
-#include <qobject.h>
+#include <QObject>
 
 class KviIrcConnection;
 
diff --git a/src/kvirc/kernel/kvi_main.cpp b/src/kvirc/kernel/kvi_main.cpp
index f480d1628..a1b6c5c03 100644
--- a/src/kvirc/kernel/kvi_main.cpp
+++ b/src/kvirc/kernel/kvi_main.cpp
@@ -38,7 +38,7 @@
 
 #include <qglobal.h> //for debug()
 
-#include <qmessagebox.h>
+#include <QMessageBox>
 
 #define KVI_ARGS_RETCODE_OK 0
 #define KVI_ARGS_RETCODE_ERROR 1
@@ -407,6 +407,6 @@ int main(int argc,char ** argv)
 	// :)
 
 	delete theApp;
-    theApp = 0;
+	theApp = 0;
 	return retVal;
 }
diff --git a/src/kvirc/kernel/kvi_notifylist.cpp b/src/kvirc/kernel/kvi_notifylist.cpp
index 9ae384a6b..2732f8df7 100644
--- a/src/kvirc/kernel/kvi_notifylist.cpp
+++ b/src/kvirc/kernel/kvi_notifylist.cpp
@@ -47,7 +47,7 @@
 #include "kvi_kvs_eventtriggers.h"
 #include "kvi_qcstring.h"
 
-#include <qstringlist.h>
+#include <QStringList>
 
 // FIXME: #warning "Finish this doc!"
 
@@ -1101,7 +1101,7 @@ void KviWatchNotifyListManager::buildRegUserDict()
 			}
 		}
 		++it;
-	}	
+	}
 }
 
 void KviWatchNotifyListManager::start()
diff --git a/src/kvirc/kernel/kvi_notifylist.h b/src/kvirc/kernel/kvi_notifylist.h
index e3ffffd10..e39f59271 100644
--- a/src/kvirc/kernel/kvi_notifylist.h
+++ b/src/kvirc/kernel/kvi_notifylist.h
@@ -27,13 +27,12 @@
 
 
 #include "kvi_settings.h"
-
-#include <qobject.h>
+#include "kvi_qstring.h"
 #include "kvi_pointerlist.h"
 #include "kvi_pointerhashtable.h"
-#include <qtimer.h>
 
-#include "kvi_qstring.h"
+#include <QObject>
+#include <QTimer>
 
 class KviConsole;
 class KviIrcMessage;
diff --git a/src/kvirc/kernel/kvi_options.cpp b/src/kvirc/kernel/kvi_options.cpp
index a40c05607..335cdbe34 100644
--- a/src/kvirc/kernel/kvi_options.cpp
+++ b/src/kvirc/kernel/kvi_options.cpp
@@ -42,21 +42,20 @@
 #include "kvi_frame.h"
 #include "kvi_internalcmd.h"
 #include "kvi_theme.h"
-#include <qmessagebox.h>
-#include <qregexp.h>
+#include "kvi_fileutils.h"
 //#include "kvi_textencoding.h"
 
+#include <QMessageBox>
+#include <QRegExp>
+#include <QTextCodec>
+#include <QDir>
+#include <QStringList>
+
 //xml parser
-#include <qdom.h>
+//#include <qdom.h>
 //!xml parser
 
 #include <zlib.h>
-#include <qtextcodec.h>
-
-#include "kvi_fileutils.h"
-
-#include <qdir.h>
-#include <qstringlist.h>
 
 // kvi_app.cpp
 extern KVIRC_API int g_iIdentDaemonRunningUsers;
@@ -642,23 +641,13 @@ KviFontOption g_fontOptionsTable[KVI_NUM_FONT_OPTIONS]=
 	FONT_OPTION("IrcToolBarApplet","Arial",9,KviOption_sectFlagIrcToolBar | KviOption_resetUpdateGui),
 	FONT_OPTION("Taskbar","Arial",9,KviOption_sectFlagTaskBar | KviOption_resetUpdateTaskBar)
 #else
-	#if QT_VERSION >= 300
-		FONT_OPTION("IrcView","Monospace",10,KviOption_sectFlagIrcView | KviOption_resetUpdateGui),
-		FONT_OPTION("Input","Sans Serif",12,KviOption_sectFlagInput | KviOption_resetUpdateGui),
-		FONT_OPTION("UserListView","Sans Serif",10,KviOption_sectFlagUserListView | KviOption_resetUpdateGui),
-		FONT_OPTION("Label","Sans Serif",10,KviOption_sectFlagLabel | KviOption_resetUpdateGui),
-		FONT_OPTION("Application","Sans Serif",10,KviOption_sectFlagGui | KviOption_resetUpdateAppFont),
-		FONT_OPTION("IrcToolBarApplet","Sans Serif",10,KviOption_sectFlagIrcToolBar | KviOption_resetUpdateGui),
-		FONT_OPTION("Taskbar","Sans Serif",10,KviOption_sectFlagTaskBar | KviOption_resetUpdateTaskBar)
-	#else
-		FONT_OPTION("IrcView","Monospace",12,KviOption_sectFlagIrcView | KviOption_resetUpdateGui),
-		FONT_OPTION("Input","Sans Serif",16,KviOption_sectFlagInput | KviOption_resetUpdateGui),
-		FONT_OPTION("UserListView","Sans Serif",12,KviOption_sectFlagUserListView | KviOption_resetUpdateGui),
-		FONT_OPTION("Label","Sans Serif",12,KviOption_sectFlagLabel | KviOption_resetUpdateGui),
-		FONT_OPTION("Application","Sans Serif",12,KviOption_sectFlagGui | KviOption_resetUpdateAppFont),
-		FONT_OPTION("IrcToolBarApplet","Sans Serif",10,KviOption_sectFlagIrcToolBar | KviOption_resetUpdateGui),
-		FONT_OPTION("Taskbar","Sans Serif",10,KviOption_sectFlagTaskBar | KviOption_resetUpdateTaskBar)
-	#endif
+	FONT_OPTION("IrcView","Monospace",10,KviOption_sectFlagIrcView | KviOption_resetUpdateGui),
+	FONT_OPTION("Input","Sans Serif",12,KviOption_sectFlagInput | KviOption_resetUpdateGui),
+	FONT_OPTION("UserListView","Sans Serif",10,KviOption_sectFlagUserListView | KviOption_resetUpdateGui),
+	FONT_OPTION("Label","Sans Serif",10,KviOption_sectFlagLabel | KviOption_resetUpdateGui),
+	FONT_OPTION("Application","Sans Serif",10,KviOption_sectFlagGui | KviOption_resetUpdateAppFont),
+	FONT_OPTION("IrcToolBarApplet","Sans Serif",10,KviOption_sectFlagIrcToolBar | KviOption_resetUpdateGui),
+	FONT_OPTION("Taskbar","Sans Serif",10,KviOption_sectFlagTaskBar | KviOption_resetUpdateTaskBar)
 #endif
 };
 
@@ -879,13 +868,13 @@ void KviApp::loadOptions()
 		READ_OPTIONS(KVI_NUM_ICCOLOR_OPTIONS,g_iccolorOptionsTable,readColorEntry)
 		
 		for(i=0;i<KVI_NUM_STRING_OPTIONS;i++) 
-		{ 
+		{
 			if(g_stringOptionsTable[i].flags & KviOption_encodePath)
 				KviStringConversion::decodePath(g_stringOptionsTable[i].option);
 		} 
 
 		for(i=0;i<KVI_NUM_STRINGLIST_OPTIONS;i++) 
-		{ 
+		{
 			if(g_stringlistOptionsTable[i].flags & KviOption_encodePath)
 				KviStringConversion::decodePath(g_stringlistOptionsTable[i].option);
 		}
diff --git a/src/kvirc/kernel/kvi_options.h b/src/kvirc/kernel/kvi_options.h
index 95304f972..140e51222 100644
--- a/src/kvirc/kernel/kvi_options.h
+++ b/src/kvirc/kernel/kvi_options.h
@@ -30,11 +30,11 @@
 #include "kvi_pixmap.h"
 #include "kvi_msgtype.h"
 
-#include <qrect.h>
-#include <qpixmap.h>
-#include <qcolor.h>
-#include <qfont.h>
-#include <qstringlist.h>
+#include <QRect>
+#include <QPixmap>
+#include <QColor>
+#include <QFont>
+#include <QStringList>
 
 // option structures
 
diff --git a/src/kvirc/kernel/kvi_texticonmanager.cpp b/src/kvirc/kernel/kvi_texticonmanager.cpp
index 7eabe5c42..451f114e0 100644
--- a/src/kvirc/kernel/kvi_texticonmanager.cpp
+++ b/src/kvirc/kernel/kvi_texticonmanager.cpp
@@ -35,8 +35,8 @@
 #include "kvi_app.h"
 #include "kvi_confignames.h"
 
-#include <qpixmap.h>
-#include <qfile.h>
+#include <QPixmap>
+#include <QFile>
 
 KVIRC_API KviTextIconManager * g_pTextIconManager = 0;
 
@@ -132,7 +132,7 @@ void KviTextIconManager::checkDefaultAssociations()
 		if(!m_pTextIconDict->find(default_associations[i].name))
 			insert(QString::fromUtf8(default_associations[i].name),default_associations[i].iVal);
 	}
-    emit changed();
+	emit changed();
 }
 
 // this MUST match the ConfigUpdate entry in the configuration
@@ -225,7 +225,7 @@ int KviTextIconManager::load(const QString &filename,bool bMerge)
 	}
 
 	checkDefaultAssociations();
-    emit changed();
+	emit changed();
 
 	return upd;
 }
diff --git a/src/kvirc/kernel/kvi_texticonmanager.h b/src/kvirc/kernel/kvi_texticonmanager.h
index 50d06a8e0..4a4b3185c 100644
--- a/src/kvirc/kernel/kvi_texticonmanager.h
+++ b/src/kvirc/kernel/kvi_texticonmanager.h
@@ -26,10 +26,9 @@
 //=============================================================================
 
 #include "kvi_settings.h"
-
-#include <qpixmap.h>
 #include "kvi_pointerhashtable.h"
 
+#include <QPixmap>
 
 class KVIRC_API KviTextIcon
 {
diff --git a/src/kvirc/kernel/kvi_theme.cpp b/src/kvirc/kernel/kvi_theme.cpp
index e15e8a6a2..750430ec7 100644
--- a/src/kvirc/kernel/kvi_theme.cpp
+++ b/src/kvirc/kernel/kvi_theme.cpp
@@ -30,17 +30,14 @@
 #include "kvi_miscutils.h"
 #include "kvi_sourcesdate.h"
 
-#include <qimage.h>
+#include <QImage>
 
 #define KVI_THEME_SMALL_SCREENSHOT_NAME "screenshot_small.png"
 #define KVI_THEME_MEDIUM_SCREENSHOT_NAME "screenshot_medium.png"
 #define KVI_THEME_LARGE_SCREENSHOT_NAME "screenshot.png"
 
-#ifdef COMPILE_USE_QT4
-	#define QIMAGE_SCALE_MIN Qt::KeepAspectRatio
-#else
-	#define QIMAGE_SCALE_MIN QImage::ScaleMin
-#endif
+#define QIMAGE_SCALE_MIN Qt::KeepAspectRatio
+
 
 KviThemeInfo::KviThemeInfo()
 : KviHeapObject()
diff --git a/src/kvirc/kernel/kvi_theme.h b/src/kvirc/kernel/kvi_theme.h
index fdf75e259..94feeede6 100644
--- a/src/kvirc/kernel/kvi_theme.h
+++ b/src/kvirc/kernel/kvi_theme.h
@@ -28,10 +28,9 @@
 #include "kvi_settings.h"
 #include "kvi_qstring.h"
 #include "kvi_heapobject.h"
-
 #include "kvi_fileextensions.h"
 
-#include <qpixmap.h>
+#include <QPixmap>
 
 #define KVI_THEMEINFO_FILE_NAME "themeinfo." KVI_FILEEXTENSION_CONFIG
 #define KVI_THEMEDATA_FILE_NAME "themedata." KVI_FILEEXTENSION_CONFIG
diff --git a/src/kvirc/ui/kvi_actiondrawer.h b/src/kvirc/ui/kvi_actiondrawer.h
index bceef244a..50739c36e 100644
--- a/src/kvirc/ui/kvi_actiondrawer.h
+++ b/src/kvirc/ui/kvi_actiondrawer.h
@@ -31,14 +31,10 @@
 #include <QWidget>
 #include <QTabWidget>
 
+class KviAction;
 class KviActionDrawerPage;
 class QPixmap;
-#ifdef COMPILE_USE_QT4
-	class Q3SimpleRichText;
-#else
-	class QSimpleRichText;
-#endif
-class KviAction;
+class Q3SimpleRichText;
 
 class KVIRC_API KviActionDrawerPageListViewItem : public KviTalListViewItem
 {
@@ -47,11 +43,7 @@ public:
 	~KviActionDrawerPageListViewItem();
 protected:
 	QString m_szName;
-#ifdef COMPILE_USE_QT4
 	Q3SimpleRichText * m_pText;
-#else
-	QSimpleRichText * m_pText;
-#endif
 	QPixmap * m_pIcon;
 	KviTalListView * m_pListView;
 	QString m_szKey;
diff --git a/src/kvirc/ui/kvi_channel.cpp b/src/kvirc/ui/kvi_channel.cpp
index a755dd14c..7602c2b05 100644
--- a/src/kvirc/ui/kvi_channel.cpp
+++ b/src/kvirc/ui/kvi_channel.cpp
@@ -58,34 +58,32 @@
 #include "kvi_sparser.h"
 #include "kvi_modew.h"
 #include "kvi_mirccntrl.h"
+#include "kvi_pointerhashtable.h"
+#include "kvi_kvs_script.h"
+#include "kvi_kvs_eventtriggers.h"
+#include "kvi_tal_popupmenu.h"
+#include "kvi_tal_widgetstack.h"
 
 #ifdef COMPILE_CRYPT_SUPPORT
 	#include "kvi_crypt.h"
 	#include "kvi_cryptcontroller.h"
 #endif
 
-#include "kvi_kvs_script.h"
-#include "kvi_kvs_eventtriggers.h"
-
 #include <time.h>
 
-#include <qsplitter.h>
-#include <qtoolbutton.h>
-#include <qlabel.h>
-#include <qevent.h>
-
-#include <qpalette.h>
-#include "kvi_tal_popupmenu.h"
-#include "kvi_pointerhashtable.h"
-#include <qmessagebox.h>
-#include "kvi_tal_widgetstack.h"
+#include <QSplitter>
+#include <QToolButton>
+#include <QLabel>
+#include <QEvent>
+#include <QPalette>
+#include <QMessageBox>
+#include <QCloseEvent>
 
 #ifndef AVERAGE_CHANNEL_USERS
 	#define AVERAGE_CHANNEL_USERS 101
 #endif
 
 
-
 // FIXME: #warning "+a Anonymous channel mode!"
 // FIXME: #warning "+r channel mode (reop)"
 // FIXME: #warning "OnChannelFlood event...."
@@ -138,11 +136,7 @@ KviChannel::KviChannel(KviFrame * lpFrm,KviConsole * lpConsole,const char * name
 
 	// Central splitter
 	m_pSplitter = new QSplitter(Qt::Horizontal,this);
-	#ifdef COMPILE_USE_QT4
-		m_pSplitter->setObjectName(name);
-	#else
-		m_pSplitter->setName(name);
-	#endif
+	m_pSplitter->setObjectName(name);
 	m_pSplitter->setOpaqueResize(false);
 	// Spitted vertially on the left
 	m_pVertSplitter = new QSplitter(Qt::Vertical,m_pSplitter);
@@ -200,7 +194,7 @@ KviChannel::KviChannel(KviFrame * lpFrm,KviConsole * lpConsole,const char * name
 	connect(m_pHideToolsButton,SIGNAL(clicked()),this,SLOT(toggleToolButtons()));
 
 	m_pUserListView = new KviUserListView(m_pSplitter,m_pListViewButton,connection()->userDataBase(),this,
-								AVERAGE_CHANNEL_USERS,__tr2qs("User List"),"user_list_view");
+		AVERAGE_CHANNEL_USERS,__tr2qs("User List"),"user_list_view");
 //	m_pEditorsContainer->addWidget(m_pUserListView);
 //	m_pEditorsContainer->raiseWidget(m_pUserListView);
 	// And finally the input line on the bottom
@@ -297,15 +291,11 @@ void KviChannel::saveProperties(KviConfig *cfg)
 	KviWindow::saveProperties(cfg);
 	cfg->writeEntry("TopSplitter",m_pTopSplitter->sizes());
 	cfg->writeEntry("Splitter",m_pSplitter->sizes());
-#ifdef COMPILE_USE_QT4
 	QList<int> tmp = m_pVertSplitter->sizes();
 	KviValueList<int> tmp2;
 	for(QList<int>::Iterator it = tmp.begin();it != tmp.end();++it)
 		tmp2.append(*it);
 	cfg->writeEntry("VertSplitter",m_pMessageView ? tmp2 : m_VertSplitterSizesList);
-#else
-	cfg->writeEntry("VertSplitter",m_pMessageView ? m_pVertSplitter->sizes() : m_VertSplitterSizesList);
-#endif
 	cfg->writeEntry("PrivateBackground",m_privateBackground);
 	cfg->writeEntry("DoubleView",m_pMessageView ? true : false);
 	if(m_pUserListView)
@@ -541,19 +531,11 @@ QPixmap * KviChannel::myIconPtr()
 
 void KviChannel::resizeEvent(QResizeEvent *e)
 {
-#ifdef COMPILE_USE_QT4
 	int hght = m_pInput->heightHint();
 	int hght2 = m_pTopicWidget->sizeHint().height();
 	m_pButtonBox->setGeometry(0,0,width(),hght2);
 	m_pSplitter->setGeometry(0,hght2,width(),height() - (hght + hght2));
 	m_pInput->setGeometry(0,height() - hght,width(),hght);
-#else
-	int hght = m_pInput->heightHint();
-	int hght2 = m_pButtonBox->sizeHint().height();
-	m_pButtonBox->setGeometry(0,0,width(),hght2);
-	m_pSplitter->setGeometry(0,hght2,width(),height() - (hght + hght2));
-	m_pInput->setGeometry(0,height() - hght,width(),hght);
-#endif
 }
 
 QSize KviChannel::sizeHint() const
diff --git a/src/kvirc/ui/kvi_channel.h b/src/kvirc/ui/kvi_channel.h
index bec8f3425..603383150 100644
--- a/src/kvirc/ui/kvi_channel.h
+++ b/src/kvirc/ui/kvi_channel.h
@@ -280,10 +280,10 @@ public:
 	bool hasChannelKey() { return !m_szChannelKey.isEmpty(); };
 	QString & channelKey(){ return m_szChannelKey; };
 
-    void addHighlightedUser(const char * nick);
-    void removeHighlightedUser(const char * nick);
-    bool isHighlightedUser(const char * nick) { return m_pTmpHighLighted->find(nick); };
-    KviIrcView * messageView() const { return m_pMessageView; };
+	void addHighlightedUser(const char * nick);
+	void removeHighlightedUser(const char * nick);
+	bool isHighlightedUser(const char * nick) { return m_pTmpHighLighted->find(nick); };
+	KviIrcView * messageView() const { return m_pMessageView; };
 	virtual void lostUserFocus();
 	virtual void getTaskBarTipText(QString &buffer);
 	QString channelMode() { return m_szChannelMode; };
diff --git a/src/modules/CMakeLists.txt b/src/modules/CMakeLists.txt
index 69434fcb2..e118f6a0b 100644
--- a/src/modules/CMakeLists.txt
+++ b/src/modules/CMakeLists.txt
@@ -1,4 +1,7 @@
 # CMakeLists.txt for src/modules/
+IF(APPLE)
+	set(CMAKE_SHARED_LINKER_FLAGS "-single_module -undefined dynamic_lookup -multiply_defined suppress")
+ENDIF()
 
 INCLUDE_DIRECTORIES(
 	../kvilib/tal/
@@ -42,4 +45,4 @@ SUBDIRS(
 
 	# forgotten ?
 	# clock iograph
-)
\ No newline at end of file
+)
diff --git a/src/modules/about/CMakeLists.txt b/src/modules/about/CMakeLists.txt
index 6d0202de1..798581e92 100644
--- a/src/modules/about/CMakeLists.txt
+++ b/src/modules/about/CMakeLists.txt
@@ -1,5 +1,4 @@
 # CMakeLists for src/modules/about
-
 SET(kviabout_MOC_HDRS
 	aboutdialog.h
 	libkviabout.h
diff --git a/src/modules/channelsjoin/channelsjoinwindow.cpp b/src/modules/channelsjoin/channelsjoinwindow.cpp
index 0954e7437..8025d6c19 100644
--- a/src/modules/channelsjoin/channelsjoinwindow.cpp
+++ b/src/modules/channelsjoin/channelsjoinwindow.cpp
@@ -297,5 +297,6 @@ void KviChannelsJoinWindow::closeEvent(QCloseEvent *e)
 	e->ignore();
 	delete this;
 }
-
+#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
 #include "m_channelsjoinwindow.moc"
+#endif //!COMPILE_USE_STANDALONE_MOC_SOURCES
diff --git a/src/modules/dcc/broker.cpp b/src/modules/dcc/broker.cpp
index 0212adac4..4c081713d 100644
--- a/src/modules/dcc/broker.cpp
+++ b/src/modules/dcc/broker.cpp
@@ -895,4 +895,6 @@ bool KviDccBroker::handleResumeRequest(KviDccRequest * dcc,const char * filename
 }
 
 
+#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
 #include "m_broker.moc"
+#endif //!COMPILE_USE_STANDALONE_MOC_SOURCES
diff --git a/src/modules/dcc/chat.cpp b/src/modules/dcc/chat.cpp
index d629b3d14..ef06da588 100644
--- a/src/modules/dcc/chat.cpp
+++ b/src/modules/dcc/chat.cpp
@@ -839,4 +839,6 @@ out_of_the_loop:
 	return bRet;
 }
 
+#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
 #include "m_chat.moc"
+#endif //!COMPILE_USE_STANDALONE_MOC_SOURCES
diff --git a/src/modules/dcc/dialogs.cpp b/src/modules/dcc/dialogs.cpp
index c999e53bb..18f1f4f5c 100644
--- a/src/modules/dcc/dialogs.cpp
+++ b/src/modules/dcc/dialogs.cpp
@@ -203,4 +203,6 @@ void KviDccRenameBox::cancelClicked()
 
 
 
+#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
 #include "m_dialogs.moc"
+#endif //!COMPILE_USE_STANDALONE_MOC_SOURCES
diff --git a/src/modules/dcc/marshal.cpp b/src/modules/dcc/marshal.cpp
index 2aa383434..add48e9bc 100644
--- a/src/modules/dcc/marshal.cpp
+++ b/src/modules/dcc/marshal.cpp
@@ -644,4 +644,6 @@ void KviDccMarshal::connectionTimedOut()
 }
 
 
+#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
 #include "m_marshal.moc"
+#endif //!COMPILE_USE_STANDALONE_MOC_SOURCES
diff --git a/src/modules/dcc/send.cpp b/src/modules/dcc/send.cpp
index e88c1424b..82315fe7b 100644
--- a/src/modules/dcc/send.cpp
+++ b/src/modules/dcc/send.cpp
@@ -1894,5 +1894,6 @@ void KviDccFileTransferBandwidthDialog::closeEvent(QCloseEvent * e)
 
 
 
-
+#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
 #include "m_send.moc"
+#endif //!COMPILE_USE_STANDALONE_MOC_SOURCES
diff --git a/src/modules/dcc/voice.cpp b/src/modules/dcc/voice.cpp
index 787d43665..af0c46f44 100644
--- a/src/modules/dcc/voice.cpp
+++ b/src/modules/dcc/voice.cpp
@@ -1038,4 +1038,6 @@ void KviDccVoice::focusInEvent(QFocusEvent *e)
 	KviWindow::focusInEvent(e);
 }
 
+#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
 #include "m_voice.moc"
+#endif //!COMPILE_USE_STANDALONE_MOC_SOURCES
diff --git a/src/modules/dcc/window.cpp b/src/modules/dcc/window.cpp
index 11fe893fd..6f9a36b60 100644
--- a/src/modules/dcc/window.cpp
+++ b/src/modules/dcc/window.cpp
@@ -50,4 +50,6 @@ const char * KviDccWindow::dccMarshalOutputContextString()
 	return static_context;
 }
 
+#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
 #include "m_window.moc"
+#endif //!COMPILE_USE_STANDALONE_MOC_SOURCES
diff --git a/src/modules/dialog/libkvidialog.cpp b/src/modules/dialog/libkvidialog.cpp
index 426580d8f..38f418578 100644
--- a/src/modules/dialog/libkvidialog.cpp
+++ b/src/modules/dialog/libkvidialog.cpp
@@ -917,4 +917,6 @@ KVIRC_MODULE(
 	dialog_module_cleanup
 )
 
+#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
 #include "libkvidialog.moc"
+#endif //!COMPILE_USE_STANDALONE_MOC_SOURCES
diff --git a/src/modules/filetransferwindow/filetransferwindow.cpp b/src/modules/filetransferwindow/filetransferwindow.cpp
index 93b8a6b33..5a768da47 100644
--- a/src/modules/filetransferwindow/filetransferwindow.cpp
+++ b/src/modules/filetransferwindow/filetransferwindow.cpp
@@ -765,4 +765,6 @@ void KviFileTransferWindow::applyOptions()
 	KviWindow::applyOptions();
 }
 
+#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
 #include "m_filetransferwindow.moc"
+#endif //!COMPILE_USE_STANDALONE_MOC_SOURCES
diff --git a/src/modules/help/helpwidget.cpp b/src/modules/help/helpwidget.cpp
index b35c1d1a0..e0068b715 100644
--- a/src/modules/help/helpwidget.cpp
+++ b/src/modules/help/helpwidget.cpp
@@ -151,4 +151,6 @@ bool KviHelpWidget::eventFilter(QObject * o, QEvent *e)
 
 
 
+#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
 #include "helpwidget.moc"
+#endif //!COMPILE_USE_STANDALONE_MOC_SOURCES
diff --git a/src/modules/help/helpwindow.cpp b/src/modules/help/helpwindow.cpp
index 8fa4cfcc1..13dcd62e3 100644
--- a/src/modules/help/helpwindow.cpp
+++ b/src/modules/help/helpwindow.cpp
@@ -326,4 +326,6 @@ void KviHelpWindow::fillCaptionBuffers()
 }
 
 
+#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
 #include "helpwindow.moc"
+#endif //!COMPILE_USE_STANDALONE_MOC_SOURCES
diff --git a/src/modules/help/index.cpp b/src/modules/help/index.cpp
index 659ff44cb..6a5440292 100755
--- a/src/modules/help/index.cpp
+++ b/src/modules/help/index.cpp
@@ -850,5 +850,6 @@ bool Index::searchForPattern( const QStringList &patterns, const QStringList &wo
 }
 
 
-
-#include "index.moc"
\ No newline at end of file
+#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
+#include "index.moc"
+#endif //!COMPILE_USE_STANDALONE_MOC_SOURCES