qt5 support (sip): code only, no touch to build system by now

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

144 files changed, 150 insertions, 446 deletions

diff --git a/src/modules/about/AboutDialog.cpp b/src/modules/about/AboutDialog.cpp
index 081ebecca..a411b5d8c 100644
--- a/src/modules/about/AboutDialog.cpp
+++ b/src/modules/about/AboutDialog.cpp
@@ -240,7 +240,4 @@ void AboutDialog::closeButtonPressed()
 	delete this;
 }
 
-#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
-#include "AboutDialog.moc"
-#endif //!COMPILE_USE_STANDALONE_MOC_SOURCES
 
diff --git a/src/modules/addon/AddonFunctions.cpp b/src/modules/addon/AddonFunctions.cpp
index f3ccb72db..e0a762ac8 100644
--- a/src/modules/addon/AddonFunctions.cpp
+++ b/src/modules/addon/AddonFunctions.cpp
@@ -221,7 +221,7 @@ namespace AddonFunctions
 
 		// Now we have all stuff in ~/.config/KVIrc/tmp/$rand
 		KviQString::escapeKvs(&szUnpackPath, KviQString::EscapeSpace);
-		if(!KviKvsScript::run(QString::fromAscii("parse %1/install.kvs").arg(szUnpackPath), g_pActiveWindow))
+		if(!KviKvsScript::run(QString::fromLatin1("parse %1/install.kvs").arg(szUnpackPath), g_pActiveWindow))
 		{
 			// Parsing the script failed
 			// However, the user should already be notified via normal script output.
diff --git a/src/modules/addon/WebAddonInterfaceDialog.cpp b/src/modules/addon/WebAddonInterfaceDialog.cpp
index c0e69cf69..b16b1b0b8 100644
--- a/src/modules/addon/WebAddonInterfaceDialog.cpp
+++ b/src/modules/addon/WebAddonInterfaceDialog.cpp
@@ -69,9 +69,7 @@ bool WebAddonInterfaceDialog::packageIsInstalled(const QString &szId,const QStri
 	return KviMiscUtils::compareVersions(pAddon->version(),szVersion) < 0;
 }
 
-#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
-	#include "WebAddonInterfaceDialog.moc"
-#endif //!COMPILE_USE_STANDALONE_MOC_SOURCES
+
 
 #endif //COMPILE_WEBKIT_SUPPORT
 
diff --git a/src/modules/channelsjoin/ChannelsJoinDialog.cpp b/src/modules/channelsjoin/ChannelsJoinDialog.cpp
index 71f3b9eb0..ace796f4f 100644
--- a/src/modules/channelsjoin/ChannelsJoinDialog.cpp
+++ b/src/modules/channelsjoin/ChannelsJoinDialog.cpp
@@ -489,7 +489,3 @@ void ChannelsJoinDialog::closeEvent(QCloseEvent * e)
 	e->ignore();
 	delete this;
 }
-
-#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
-#include "m_ChannelsJoinDialog.moc"
-#endif //COMPILE_USE_STANDALONE_MOC_SOURCES
diff --git a/src/modules/dcc/DccBroker.cpp b/src/modules/dcc/DccBroker.cpp
index fd3abd5b5..3e6ccb1f5 100644
--- a/src/modules/dcc/DccBroker.cpp
+++ b/src/modules/dcc/DccBroker.cpp
@@ -987,7 +987,3 @@ bool DccBroker::handleResumeRequest(KviDccRequest * dcc,const char * filename,co
 
 	return DccFileTransfer::handleResumeRequest(filename,port,filePos);
 }
-
-#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
-#include "m_DccBroker.moc"
-#endif //!COMPILE_USE_STANDALONE_MOC_SOURCES
diff --git a/src/modules/dcc/DccCanvasWindow.cpp b/src/modules/dcc/DccCanvasWindow.cpp
index 969419528..8a7b4d779 100644
--- a/src/modules/dcc/DccCanvasWindow.cpp
+++ b/src/modules/dcc/DccCanvasWindow.cpp
@@ -297,5 +297,4 @@
 	//	m_pSlaveThread->start();
 	}
 
-	#include "m_DccCanvasWindow.moc"
 #endif
diff --git a/src/modules/dcc/DccChatWindow.cpp b/src/modules/dcc/DccChatWindow.cpp
index ff942d7bc..ac4180c6e 100644
--- a/src/modules/dcc/DccChatWindow.cpp
+++ b/src/modules/dcc/DccChatWindow.cpp
@@ -58,7 +58,6 @@
 #include <QEvent>
 #include <QResizeEvent>
 #include <QByteArray>
-#include <QTextDocument> //for Qt::escape
 
 #ifdef COMPILE_CRYPT_SUPPORT
 	#include "KviCryptEngine.h"
@@ -442,7 +441,7 @@ bool DccChatWindow::event(QEvent *e)
 							QString szMsg = "<b>";
 							szMsg += m_pDescriptor->szNick;
 							szMsg += "</b> ";
-							szMsg += Qt::escape(QString(d.ptr()));
+							szMsg += KviQString::toHtmlEscaped(QString(d.ptr()));
 							//qDebug("KviIrcServerParser_ctcp.cpp:975 debug: %s",szMsg.data());
 							g_pApp->notifierMessage(this,KVI_OPTION_MSGTYPE(KVI_OUT_ACTION).pixId(),szMsg,KVI_OPTION_UINT(KviOption_uintNotifierAutoHideTime));
 						}
@@ -496,7 +495,7 @@ bool DccChatWindow::event(QEvent *e)
 								}
 								if(KVI_OPTION_BOOL(KviOption_boolPopupNotifierOnNewDccChatMessages))
 								{
-									QString szMsg = Qt::escape(QString(d.ptr()));
+									QString szMsg = KviQString::toHtmlEscaped(QString(d.ptr()));
 									g_pApp->notifierMessage(this,KviIconManager::DccChatMsg,szMsg,KVI_OPTION_UINT(KviOption_uintNotifierAutoHideTime));
 								}
 							}
@@ -887,7 +886,3 @@ out_of_the_loop:
 	m_pMutex->unlock();
 	return bRet;
 }
-
-#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
-#include "m_DccChatWindow.moc"
-#endif //!COMPILE_USE_STANDALONE_MOC_SOURCES
diff --git a/src/modules/dcc/DccDialog.cpp b/src/modules/dcc/DccDialog.cpp
index 593bb4472..27f3bcbcd 100644
--- a/src/modules/dcc/DccDialog.cpp
+++ b/src/modules/dcc/DccDialog.cpp
@@ -220,7 +220,3 @@ void DccRenameDialog::cancelClicked()
 	this->deleteLater();
 	//g_pApp->collectGarbage(this);
 }
-
-#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
-#include "m_DccDialog.moc"
-#endif //!COMPILE_USE_STANDALONE_MOC_SOURCES
diff --git a/src/modules/dcc/DccFileTransfer.cpp b/src/modules/dcc/DccFileTransfer.cpp
index dcb9fc320..588d92395 100644
--- a/src/modules/dcc/DccFileTransfer.cpp
+++ b/src/modules/dcc/DccFileTransfer.cpp
@@ -2308,8 +2308,3 @@ void DccFileTransferBandwidthDialog::closeEvent(QCloseEvent * e)
 	e->ignore();
 	delete this;
 }
-
-
-#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
-#include "m_DccFileTransfer.moc"
-#endif //!COMPILE_USE_STANDALONE_MOC_SOURCES
diff --git a/src/modules/dcc/DccMarshal.cpp b/src/modules/dcc/DccMarshal.cpp
index 5e0bcc5a7..d10354251 100644
--- a/src/modules/dcc/DccMarshal.cpp
+++ b/src/modules/dcc/DccMarshal.cpp
@@ -651,8 +651,3 @@ void DccMarshal::connectionTimedOut()
 	reset();
 	emit error(KviError::ConnectionTimedOut);
 }
-
-
-#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
-#include "m_DccMarshal.moc"
-#endif //!COMPILE_USE_STANDALONE_MOC_SOURCES
diff --git a/src/modules/dcc/DccVideoWindow.cpp b/src/modules/dcc/DccVideoWindow.cpp
index 5c74ba068..e671afa5b 100644
--- a/src/modules/dcc/DccVideoWindow.cpp
+++ b/src/modules/dcc/DccVideoWindow.cpp
@@ -46,7 +46,6 @@
 #include <QToolTip>
 #include <QByteArray>
 #include <QBuffer>
-#include <QTextDocument> //for Qt::escape
 
 #ifdef COMPILE_CRYPT_SUPPORT
 	#include "KviCryptController.h"
@@ -833,7 +832,7 @@ bool DccVideoWindow::event(QEvent *e)
 							QString szMsg = "<b>";
 							szMsg += m_pDescriptor->szNick;
 							szMsg += "</b> ";
-							szMsg += Qt::escape(QString(d.ptr()));
+							szMsg += KviQString::toHtmlEscaped(QString(d.ptr()));
 							//qDebug("KviIrcServerParser_ctcp.cpp:975 debug: %s",szMsg.data());
 							g_pApp->notifierMessage(this,KVI_OPTION_MSGTYPE(KVI_OUT_ACTION).pixId(),szMsg,KVI_OPTION_UINT(KviOption_uintNotifierAutoHideTime));
 						}
@@ -887,7 +886,7 @@ bool DccVideoWindow::event(QEvent *e)
 								}
 								if(KVI_OPTION_BOOL(KviOption_boolPopupNotifierOnNewDccChatMessages))
 								{
-									QString szMsg = Qt::escape(QString(d.ptr()));
+									QString szMsg = KviQString::toHtmlEscaped(QString(d.ptr()));
 									g_pApp->notifierMessage(this,KviIconManager::DccChatMsg,szMsg,KVI_OPTION_UINT(KviOption_uintNotifierAutoHideTime));
 								}
 							}
@@ -1054,7 +1053,3 @@ void DccVideoWindow::videoInputChanged(int )
 // 	if(m_pSlaveThread)
 // 		m_pSlaveThread->restartRecording(m_pCDevices->currentIndex(), m_pCInputs->currentIndex(), m_pCStandards->currentIndex());
 }
-
-#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
-#include "m_DccVideoWindow.moc"
-#endif //!COMPILE_USE_STANDALONE_MOC_SOURCES
diff --git a/src/modules/dcc/DccVoiceCodec.cpp b/src/modules/dcc/DccVoiceCodec.cpp
index 76491d14c..b3e92215b 100644
--- a/src/modules/dcc/DccVoiceCodec.cpp
+++ b/src/modules/dcc/DccVoiceCodec.cpp
@@ -227,7 +227,7 @@ void DccVideoSJpegCodec::decode(KviDataBuffer * stream,KviDataBuffer * videoSign
 		if(!img.isNull())
 		{
 			videoSignal->clear();
-			videoSignal->append(img.bits(),img.numBytes());
+			videoSignal->append(img.bits(),img.byteCount());
 		}
 		stream->remove(len);
 	}
diff --git a/src/modules/dcc/DccVoiceWindow.cpp b/src/modules/dcc/DccVoiceWindow.cpp
index 1dd451e4a..794c0db79 100644
--- a/src/modules/dcc/DccVoiceWindow.cpp
+++ b/src/modules/dcc/DccVoiceWindow.cpp
@@ -1027,7 +1027,3 @@ void DccVoiceWindow::focusInEvent(QFocusEvent *e)
 
 	KviWindow::focusInEvent(e);
 }
-
-#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
-#include "m_DccVoiceWindow.moc"
-#endif //!COMPILE_USE_STANDALONE_MOC_SOURCES
diff --git a/src/modules/dcc/DccWindow.cpp b/src/modules/dcc/DccWindow.cpp
index d18dad460..37ab74d20 100644
--- a/src/modules/dcc/DccWindow.cpp
+++ b/src/modules/dcc/DccWindow.cpp
@@ -52,7 +52,3 @@ const char * DccWindow::dccMarshalOutputContextString()
 	static const char * static_context = "DCC";
 	return static_context;
 }
-
-#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
-#include "m_DccWindow.moc"
-#endif //!COMPILE_USE_STANDALONE_MOC_SOURCES
diff --git a/src/modules/dcc/canvaswidget.cpp b/src/modules/dcc/canvaswidget.cpp
index a7b9f58cc..1356c5f3c 100644
--- a/src/modules/dcc/canvaswidget.cpp
+++ b/src/modules/dcc/canvaswidget.cpp
@@ -30,7 +30,6 @@
 
 	#include <QCursor>
 	#include <QPainter>
-	#include <QTextDocument>
 	#include <QLineEdit>
 	#include <QComboBox>
 	#include <QValidator>
@@ -1508,5 +1507,4 @@
 		m_pSplitter->setGeometry(0,h,width(),height() - (h + h2));
 	}
 
-	#include "m_canvaswidget.moc"
 #endif
diff --git a/src/modules/dialog/libkvidialog.cpp b/src/modules/dialog/libkvidialog.cpp
index 59326dd0c..f810d4741 100644
--- a/src/modules/dialog/libkvidialog.cpp
+++ b/src/modules/dialog/libkvidialog.cpp
@@ -915,6 +915,3 @@ KVIRC_MODULE(
 	0
 )
 
-#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 a9b90b0ed..6aee2d99b 100644
--- a/src/modules/filetransferwindow/FileTransferWindow.cpp
+++ b/src/modules/filetransferwindow/FileTransferWindow.cpp
@@ -137,8 +137,13 @@ FileTransferWidget::FileTransferWidget(QWidget * pParent)
 	setHorizontalHeaderLabels(colHeaders);
 	//default column widths
 	setColumnWidth(0, FILETRANSFERW_CELLSIZE);
+#if (QT_VERSION >= 0x050000)
+	horizontalHeader()->setSectionResizeMode(0, QHeaderView::Fixed);
+	horizontalHeader()->setSectionResizeMode(1, QHeaderView::Interactive);
+#else
 	horizontalHeader()->setResizeMode(0, QHeaderView::Fixed);
 	horizontalHeader()->setResizeMode(1, QHeaderView::Interactive);
+#endif
 	setColumnWidth(1, 500);
 	horizontalHeader()->setStretchLastSection(true);
 	//focus policy
@@ -326,13 +331,15 @@ bool FileTransferWindow::eventFilter( QObject *obj, QEvent *ev )
 	return KviWindow::eventFilter( obj, ev );
 }
 
+#warning FileTransferWindow::fontChange
+/*
 void FileTransferWindow::fontChange(const QFont &oldFont)
 {
 	QFontMetrics fm(font());
 	m_iLineSpacing = fm.lineSpacing();
 	KviWindow::fontChange(oldFont);
 }
-
+*/
 void FileTransferWindow::tipRequest(KviDynamicToolTip * tip,const QPoint &pnt)
 {
 	FileTransferItem * it = (FileTransferItem *)m_pTableWidget->itemAt(pnt);
@@ -863,7 +870,3 @@ void FileTransferWindow::applyOptions()
 	m_pIrcView->applyOptions();
 	KviWindow::applyOptions();
 }
-
-#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
-#include "m_FileTransferWindow.moc"
-#endif //!COMPILE_USE_STANDALONE_MOC_SOURCES
diff --git a/src/modules/filetransferwindow/FileTransferWindow.h b/src/modules/filetransferwindow/FileTransferWindow.h
index 614054cc0..9b3bb55a2 100644
--- a/src/modules/filetransferwindow/FileTransferWindow.h
+++ b/src/modules/filetransferwindow/FileTransferWindow.h
@@ -122,7 +122,7 @@ protected:
 	FileTransferItem * findItem(KviFileTransfer * t);
 	void fillTransferView();
 	KviFileTransfer * selectedTransfer();
-	virtual void fontChange(const QFont &oldFont);
+//	virtual void fontChange(const QFont &oldFont);
 	bool eventFilter( QObject *obj, QEvent *ev );
 public:
 	virtual QSize sizeHint() const;
diff --git a/src/modules/filetransferwindow/libkvifiletransferwindow.cpp b/src/modules/filetransferwindow/libkvifiletransferwindow.cpp
index a5bef8883..07a474f5a 100644
--- a/src/modules/filetransferwindow/libkvifiletransferwindow.cpp
+++ b/src/modules/filetransferwindow/libkvifiletransferwindow.cpp
@@ -69,7 +69,7 @@ static FileTransferWindow * filetransferwindow_alloc(bool bCreateMinimized,bool
 
 static bool filetransferwindow_kvs_cmd_open(KviKvsModuleCommandCall * c)
 {
-	filetransferwindow_alloc(c->hasSwitch('m',QString::fromAscii("minimized")),c->hasSwitch('n',QString::fromAscii("noraise")));
+	filetransferwindow_alloc(c->hasSwitch('m',QString::fromLatin1("minimized")),c->hasSwitch('n',QString::fromLatin1("noraise")));
 
 	return true;
 }
diff --git a/src/modules/fish/libkvifish.cpp b/src/modules/fish/libkvifish.cpp
index fd24367d4..f37f71a7b 100644
--- a/src/modules/fish/libkvifish.cpp
+++ b/src/modules/fish/libkvifish.cpp
@@ -150,7 +150,7 @@
 		{
 			c->window()->output(KVI_OUT_SYSTEMMESSAGE,__tr2qs("FiSH: Received DH1080 public key from %1, sending mine...").arg(szNick));
 			// fish appends an 'A' to all base64 coded strings
-			szHisPubKey = szMessage.mid(12).toAscii();
+			szHisPubKey = szMessage.mid(12).toLatin1();
 			szHisPubKey.truncate(FISH_KEYLEN);
 			szHisPubKey = QByteArray::fromBase64(szHisPubKey);
 
@@ -164,7 +164,7 @@
 		if(szMessage.startsWith("DH1080_FINISH ", Qt::CaseSensitive))
 		{
 			// fish appends an 'A' to all base64 coded strings
-			szHisPubKey = szMessage.mid(14).toAscii();
+			szHisPubKey = szMessage.mid(14).toLatin1();
 			szHisPubKey.truncate(FISH_KEYLEN);
 			szHisPubKey = QByteArray::fromBase64(szHisPubKey);
 		}
@@ -318,9 +318,3 @@ KVIRC_MODULE(
 	fish_module_cleanup,
 	0
 )
-
-#ifdef COMPILE_CRYPT_SUPPORT
-	#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
-		#include "libkvifish.moc"
-	#endif //!COMPILE_USE_STANDALONE_MOC_SOURCES
-#endif
diff --git a/src/modules/help/HelpWidget.cpp b/src/modules/help/HelpWidget.cpp
index 449430289..cf809ed21 100644
--- a/src/modules/help/HelpWidget.cpp
+++ b/src/modules/help/HelpWidget.cpp
@@ -256,6 +256,3 @@ QSize HelpWidget::sizeHint() const
 	return s;
 }
 
-#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 c3602f4a9..00b2255a1 100644
--- a/src/modules/help/HelpWindow.cpp
+++ b/src/modules/help/HelpWindow.cpp
@@ -336,6 +336,3 @@ void HelpWindow::fillCaptionBuffers()
 }
 
 
-#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
-#include "HelpWindow.moc"
-#endif //!COMPILE_USE_STANDALONE_MOC_SOURCES
diff --git a/src/modules/http/HttpFileTransfer.cpp b/src/modules/http/HttpFileTransfer.cpp
index ed2e92fa8..08bb83ed2 100644
--- a/src/modules/http/HttpFileTransfer.cpp
+++ b/src/modules/http/HttpFileTransfer.cpp
@@ -488,7 +488,3 @@ bool HttpFileTransfer::startDownload()
 	m_eGeneralStatus = Connecting;
 	return m_pHttpRequest->start();
 }
-
-#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
-#include "m_HttpFileTransfer.moc"
-#endif //!COMPILE_USE_STANDALONE_MOC_SOURCES
diff --git a/src/modules/ident/libkviident.cpp b/src/modules/ident/libkviident.cpp
index fb28571ee..42b4a8009 100644
--- a/src/modules/ident/libkviident.cpp
+++ b/src/modules/ident/libkviident.cpp
@@ -622,6 +622,3 @@ KVIRC_MODULE(
 	0
 )
 
-#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
-#include "libkviident.moc"
-#endif //!COMPILE_USE_STANDALONE_MOC_SOURCES
diff --git a/src/modules/iograph/libkviiograph.cpp b/src/modules/iograph/libkviiograph.cpp
index d34a3489e..eec54661d 100644
--- a/src/modules/iograph/libkviiograph.cpp
+++ b/src/modules/iograph/libkviiograph.cpp
@@ -313,6 +313,3 @@ KVIRC_MODULE(
 	0
 )
 
-#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
-#include "libkviiograph.moc"
-#endif //!COMPILE_USE_STANDALONE_MOC_SOURCES
diff --git a/src/modules/lamerizer/libkvilamerizer.cpp b/src/modules/lamerizer/libkvilamerizer.cpp
index 409c4d0eb..515ec96cc 100644
--- a/src/modules/lamerizer/libkvilamerizer.cpp
+++ b/src/modules/lamerizer/libkvilamerizer.cpp
@@ -273,9 +273,3 @@ KVIRC_MODULE(
 	lamerizer_module_cleanup,
 	0
 )
-
-#ifdef COMPILE_CRYPT_SUPPORT
-	#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
-		#include "libkvilamerizer.moc"
-	#endif //!COMPILE_USE_STANDALONE_MOC_SOURCES
-#endif
diff --git a/src/modules/links/LinksWindow.cpp b/src/modules/links/LinksWindow.cpp
index 21ccf2f5b..58535fcb3 100644
--- a/src/modules/links/LinksWindow.cpp
+++ b/src/modules/links/LinksWindow.cpp
@@ -484,7 +484,3 @@ void LinksListView::mousePressEvent (QMouseEvent *e)
 	}
 	KviThemedTreeWidget::mousePressEvent(e);
 }
-
-#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
-#include "m_LinksWindow.moc"
-#endif //!COMPILE_USE_STANDALONE_MOC_SOURCES
diff --git a/src/modules/list/ListWindow.cpp b/src/modules/list/ListWindow.cpp
index 3ffef4e09..0bbaa3c99 100644
--- a/src/modules/list/ListWindow.cpp
+++ b/src/modules/list/ListWindow.cpp
@@ -52,7 +52,6 @@
 #include <QToolTip>
 #include <QDateTime>
 #include <QByteArray>
-#include <QTextDocument> // for Qt::escape
 
 extern KviPointerList<ListWindow> * g_pListWindowList;
 
@@ -71,9 +70,9 @@ ChannelTreeWidgetItemData::~ChannelTreeWidgetItemData()
 ChannelTreeWidgetItem::ChannelTreeWidgetItem(ChannelTreeWidgetItemData * pData)
 : QTreeWidgetItem(), m_pData(pData)
 {
-	setToolTip(0, Qt::escape(m_pData->m_szChan));
-	setToolTip(1, Qt::escape(m_pData->m_szUsers));
-	setToolTip(2, KviHtmlGenerator::convertToHtml(Qt::escape(m_pData->m_szTopic)));
+	setToolTip(0, KviQString::toHtmlEscaped(m_pData->m_szChan));
+	setToolTip(1, KviQString::toHtmlEscaped(m_pData->m_szUsers));
+	setToolTip(2, KviHtmlGenerator::convertToHtml(KviQString::toHtmlEscaped(m_pData->m_szTopic)));
 }
 
 ChannelTreeWidgetItem::~ChannelTreeWidgetItem()
@@ -618,6 +617,3 @@ void ListWindow::applyOptions()
 	KviWindow::applyOptions();
 }
 
-#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
-#include "ListWindow.moc"
-#endif //!COMPILE_USE_STANDALONE_MOC_SOURCES
diff --git a/src/modules/logview/LogViewWidget.cpp b/src/modules/logview/LogViewWidget.cpp
index 6a9314b66..7842811a8 100644
--- a/src/modules/logview/LogViewWidget.cpp
+++ b/src/modules/logview/LogViewWidget.cpp
@@ -95,6 +95,3 @@ LogListViewLog::LogListViewLog(QTreeWidgetItem * pPar, LogFile::Type eType, LogF
 	setText(0,m_pFileData->date().toString("yyyy-MM-dd"));
 }
 
-#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
-#include "LogViewWidget.moc"
-#endif //!COMPILE_USE_STANDALONE_MOC_SOURCES
diff --git a/src/modules/logview/LogViewWindow.cpp b/src/modules/logview/LogViewWindow.cpp
index 44bf3a67e..7957e637d 100644
--- a/src/modules/logview/LogViewWindow.cpp
+++ b/src/modules/logview/LogViewWindow.cpp
@@ -799,6 +799,4 @@ void LogViewWindow::createLog(LogFile * pLog, int iId, QString * pszFile)
 	log.close();
 }
 
-#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
-#include "LogViewWindow.moc"
-#endif //COMPILE_USE_STANDALONE_MOC_SOURCES
+
diff --git a/src/modules/mircimport/libkvimircimport.cpp b/src/modules/mircimport/libkvimircimport.cpp
index 824b454a9..a3260f4ab 100644
--- a/src/modules/mircimport/libkvimircimport.cpp
+++ b/src/modules/mircimport/libkvimircimport.cpp
@@ -378,6 +378,3 @@ KVIRC_MODULE(
 	0
 )
 
-#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
-#include "libkvimircimport.moc"
-#endif //!COMPILE_USE_STANDALONE_MOC_SOURCES
diff --git a/src/modules/my/Idle.cpp b/src/modules/my/Idle.cpp
index 4dd6f3cb1..5159bc7ac 100644
--- a/src/modules/my/Idle.cpp
+++ b/src/modules/my/Idle.cpp
@@ -130,6 +130,3 @@ void Idle::doCheck()
 	secondsIdle(secondsIdle());
 }
 
-#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
-#include "Idle.moc"
-#endif //!COMPILE_USE_STANDALONE_MOC_SOURCES
diff --git a/src/modules/notifier/NotifierWindow.cpp b/src/modules/notifier/NotifierWindow.cpp
index b6897ecac..da91924a7 100644
--- a/src/modules/notifier/NotifierWindow.cpp
+++ b/src/modules/notifier/NotifierWindow.cpp
@@ -1149,7 +1149,3 @@ void NotifierWindow::slotTabCloseRequested(int iIndex)
 			hideNow();
 	}
 }
-
-#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
-#include "m_NotifierWindow.moc"
-#endif //!COMPILE_USE_STANDALONE_MOC_SOURCES
diff --git a/src/modules/notifier/NotifierWindowTab.cpp b/src/modules/notifier/NotifierWindowTab.cpp
index e49d97c78..0a9c4329e 100644
--- a/src/modules/notifier/NotifierWindowTab.cpp
+++ b/src/modules/notifier/NotifierWindowTab.cpp
@@ -225,7 +225,3 @@ void NotifierWindowTab::paintEvent(QPaintEvent * e)
 	delete pPainter;
 	e->ignore();
 }
-
-#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
-#include "m_NotifierWindowTab.moc"
-#endif //!COMPILE_USE_STANDALONE_MOC_SOURCES
diff --git a/src/modules/objects/KvsObject_button.cpp b/src/modules/objects/KvsObject_button.cpp
index 511934d3f..646b3193e 100644
--- a/src/modules/objects/KvsObject_button.cpp
+++ b/src/modules/objects/KvsObject_button.cpp
@@ -160,8 +160,3 @@ void KvsObject_button::slotClicked()
 	KviKvsVariantList *params=0;
 	callFunction(this,"clickEvent",params);
 }
-
-
-#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
-#include "m_KvsObject_button.moc"
-#endif //COMPILE_USE_STANDALONE_MOC_SOURCES
diff --git a/src/modules/objects/KvsObject_checkBox.cpp b/src/modules/objects/KvsObject_checkBox.cpp
index 60638d793..73009a2f9 100644
--- a/src/modules/objects/KvsObject_checkBox.cpp
+++ b/src/modules/objects/KvsObject_checkBox.cpp
@@ -131,7 +131,4 @@ void KvsObject_checkBox::toggled(bool b)
 }
 
 
-#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
-#include "m_KvsObject_checkBox.moc"
-#endif //!COMPILE_USE_STANDALONE_MOC_SOURCES
 
diff --git a/src/modules/objects/KvsObject_colorDialog.cpp b/src/modules/objects/KvsObject_colorDialog.cpp
index 986ffcb0c..2d87bd0ba 100644
--- a/src/modules/objects/KvsObject_colorDialog.cpp
+++ b/src/modules/objects/KvsObject_colorDialog.cpp
@@ -231,7 +231,4 @@ void KvsObject_colorDialog::slotColorSelected(const QColor &col)
 }
 
 
-#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
-#include "m_KvsObject_colorDialog.moc"
-#endif //!COMPILE_USE_STANDALONE_MOC_SOURCES
 
diff --git a/src/modules/objects/KvsObject_comboBox.cpp b/src/modules/objects/KvsObject_comboBox.cpp
index 2e811c136..e712f0bb5 100644
--- a/src/modules/objects/KvsObject_comboBox.cpp
+++ b/src/modules/objects/KvsObject_comboBox.cpp
@@ -360,7 +360,4 @@ void KvsObject_comboBox::slotActivated(int i)
 }
 
 
-#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
-#include "m_KvsObject_comboBox.moc"
-#endif //!COMPILE_USE_STANDALONE_MOC_SOURCES
 
diff --git a/src/modules/objects/KvsObject_dateTimeEdit.cpp b/src/modules/objects/KvsObject_dateTimeEdit.cpp
index cc3a2af71..eaa2be091 100644
--- a/src/modules/objects/KvsObject_dateTimeEdit.cpp
+++ b/src/modules/objects/KvsObject_dateTimeEdit.cpp
@@ -208,6 +208,4 @@ void KvsObject_dateTimeEdit::slotDateChanged(const QDate &)
 	callFunction(this,"dateChangedEvent",params);
 }
 
-#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
-#include "m_KvsObject_dateTimeEdit.moc"
-#endif //COMPILE_USE_STANDALONE_MOC_SOURCES
+
diff --git a/src/modules/objects/KvsObject_dockWindow.cpp b/src/modules/objects/KvsObject_dockWindow.cpp
index e93096899..b8cc20676 100644
--- a/src/modules/objects/KvsObject_dockWindow.cpp
+++ b/src/modules/objects/KvsObject_dockWindow.cpp
@@ -175,7 +175,4 @@ KVSO_CLASS_FUNCTION(dockWindow,dock)
 	return true;
 }
 
-#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
-#include "m_KvsObject_dockWindow.moc"
-#endif //!COMPILE_USE_STANDALONE_MOC_SOURCES
 
diff --git a/src/modules/objects/KvsObject_file.cpp b/src/modules/objects/KvsObject_file.cpp
index bfc827588..cf46dc252 100644
--- a/src/modules/objects/KvsObject_file.cpp
+++ b/src/modules/objects/KvsObject_file.cpp
@@ -630,8 +630,8 @@ KVSO_CLASS_FUNCTION(file,writeHexBlock)
 	unsigned char byte,lsb,msb;
 	for(unsigned int i=0;i<uLen;i+=2)
 	{
-		msb=szBlock.at(i).toAscii();
-		lsb=szBlock.at(i+1).toAscii();
+		msb=szBlock.at(i).toLatin1();
+		lsb=szBlock.at(i+1).toLatin1();
 
 		if (((msb>='A' && msb<='F')||(msb>='0' && msb<='9')) && ((lsb>='A' && lsb<='F')|| (lsb>='0' && lsb<='9')))
 		{
diff --git a/src/modules/objects/KvsObject_ftp.cpp b/src/modules/objects/KvsObject_ftp.cpp
index 26d25cdaf..e23daa0bd 100644
--- a/src/modules/objects/KvsObject_ftp.cpp
+++ b/src/modules/objects/KvsObject_ftp.cpp
@@ -22,15 +22,19 @@
 //
 //=============================================================================
 
+#include "KvsObject_ftp.h"
+
+#warning QFtp doesn't exists anymore in Qt5, port this class or drop it
+#if (QT_VERSION < 0x050000)
+
 #include "kvi_debug.h"
 #include "KviError.h"
-#include "KvsObject_ftp.h"
+
 #include "KviLocale.h"
 
 #include <QFtp>
 #include <QHashIterator>
 
-
 /*
 	@doc: ftp
 	@keyterms:
@@ -327,6 +331,4 @@ KVSO_CLASS_FUNCTION(ftp,stateChangedEvent)
 	return true;
 }
 
-#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
-#include "m_KvsObject_ftp.moc"
-#endif //!COMPILE_USE_STANDALONE_MOC_SOURCES
+#endif
diff --git a/src/modules/objects/KvsObject_ftp.h b/src/modules/objects/KvsObject_ftp.h
index d7af449c7..20278f26c 100644
--- a/src/modules/objects/KvsObject_ftp.h
+++ b/src/modules/objects/KvsObject_ftp.h
@@ -26,6 +26,8 @@
 
 #include "object_macros.h"
 
+#if (QT_VERSION < 0x050000)
+
 #include <QFtp>
 #include <QHash>
 #include <QFile>
@@ -60,4 +62,7 @@ protected slots:
 	void slotReadyRead ();
 	void slotStateChanged ( int state);
 };
+
+#endif
+
 #endif //_CLASS_FTP_H_
diff --git a/src/modules/objects/KvsObject_http.cpp b/src/modules/objects/KvsObject_http.cpp
index d455a0437..e5ebd8cd5 100644
--- a/src/modules/objects/KvsObject_http.cpp
+++ b/src/modules/objects/KvsObject_http.cpp
@@ -24,6 +24,9 @@
 
 #include "KvsObject_http.h"
 
+#warning QFtp doesn't exists anymore in Qt5, port this class or drop it
+#if (QT_VERSION < 0x050000)
+
 #include "kvi_debug.h"
 #include "KviError.h"
 #include "KviLocale.h"
@@ -556,6 +559,5 @@ bool KvsObject_http::functionSslErrorsEvent(KviKvsObjectFunctionCall *c)
 	return true;
 }
 #endif
-#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
-#include "m_KvsObject_http.moc"
-#endif //!COMPILE_USE_STANDALONE_MOC_SOURCES
+
+#endif
diff --git a/src/modules/objects/KvsObject_http.h b/src/modules/objects/KvsObject_http.h
index 1ef5ef592..51f0ed1ec 100644
--- a/src/modules/objects/KvsObject_http.h
+++ b/src/modules/objects/KvsObject_http.h
@@ -29,6 +29,10 @@
 
 //===============================================================
 #include "object_macros.h"
+
+#warning QFtp doesn't exists anymore in Qt5, port this class or drop it
+#if (QT_VERSION < 0x050000)
+
 #include <QHttp>
 #include <QFile>
 #include <QHash>
@@ -86,4 +90,7 @@ protected slots:
 
 
 };
+
+#endif
+
 #endif //_CLASS_HTTP_H_
diff --git a/src/modules/objects/KvsObject_layout.cpp b/src/modules/objects/KvsObject_layout.cpp
index c4c506d6d..027af24cd 100644
--- a/src/modules/objects/KvsObject_layout.cpp
+++ b/src/modules/objects/KvsObject_layout.cpp
@@ -312,6 +312,3 @@ KVSO_CLASS_FUNCTION(layout,setAlignment)
 	if (widget()) ((QGridLayout *)widget())->setAlignment(((QWidget *)(pObject->object())),(Qt::Alignment)sum);
 	return true;
 }
-#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
-#include "m_KvsObject_layout.moc"
-#endif //!COMPILE_USE_STANDALONE_MOC_SOURCES
diff --git a/src/modules/objects/KvsObject_lcd.cpp b/src/modules/objects/KvsObject_lcd.cpp
index ab4664bdc..3bc333bf1 100644
--- a/src/modules/objects/KvsObject_lcd.cpp
+++ b/src/modules/objects/KvsObject_lcd.cpp
@@ -164,7 +164,11 @@ KVSO_CLASS_FUNCTION(lcd,setNumDigits)
 	KVSO_PARAMETERS_BEGIN(c)
 		KVSO_PARAMETER("digit",KVS_PT_DOUBLE,0,digit)
 	KVSO_PARAMETERS_END(c)
+#if (QT_VERSION >= 0x050000)
+	((QLCDNumber *)widget())->setDigitCount((int)digit);
+#else
 	((QLCDNumber *)widget())->setNumDigits((int)digit);
+#endif
 	return true;
 }
 
diff --git a/src/modules/objects/KvsObject_lineEdit.cpp b/src/modules/objects/KvsObject_lineEdit.cpp
index c10def50b..d59e18921 100644
--- a/src/modules/objects/KvsObject_lineEdit.cpp
+++ b/src/modules/objects/KvsObject_lineEdit.cpp
@@ -535,7 +535,4 @@ void KvsObject_lineEdit::slottextChanged(const QString &text)
 
 
 
-#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
-#include "m_KvsObject_lineEdit.moc"
-#endif //!COMPILE_USE_STANDALONE_MOC_SOURCES
 
diff --git a/src/modules/objects/KvsObject_listWidget.cpp b/src/modules/objects/KvsObject_listWidget.cpp
index 709a8b24c..db5896e43 100644
--- a/src/modules/objects/KvsObject_listWidget.cpp
+++ b/src/modules/objects/KvsObject_listWidget.cpp
@@ -674,7 +674,4 @@ void KvsObject_listWidget::slotItemChanged(QListWidgetItem *item)
 	callFunction(this,"itemChangedEvent",0,&params);
 }
 
-#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
-#include "m_KvsObject_listWidget.moc"
-#endif //!COMPILE_USE_STANDALONE_MOC_SOURCES
 
diff --git a/src/modules/objects/KvsObject_memoryBuffer.cpp b/src/modules/objects/KvsObject_memoryBuffer.cpp
index 5bde1fd13..b960573f4 100644
--- a/src/modules/objects/KvsObject_memoryBuffer.cpp
+++ b/src/modules/objects/KvsObject_memoryBuffer.cpp
@@ -156,8 +156,5 @@ KVSO_CLASS_FUNCTION(memoryBuffer,saveToFile)
 }
 
 
-#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
-#include "m_KvsObject_memoryBuffer.moc"
-#endif //!COMPILE_USE_STANDALONE_MOC_SOURCES
 
 
diff --git a/src/modules/objects/KvsObject_multiLineEdit.cpp b/src/modules/objects/KvsObject_multiLineEdit.cpp
index 45e3ee119..61837ab23 100644
--- a/src/modules/objects/KvsObject_multiLineEdit.cpp
+++ b/src/modules/objects/KvsObject_multiLineEdit.cpp
@@ -30,7 +30,6 @@
 
 #include <QTextBlock>
 #include <QFile>
-#include <QTextDocument>
 #include <QTextEdit>
 #include <QTextStream>
 #include <QTextCursor>
@@ -786,6 +785,3 @@ bool KvsObject_textedit::functionselectAll(KviKvsObjectFunctionCall *)
 }
 
 
-#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
-#include "m_KvsObject_multiLineEdit.moc"
-#endif //!COMPILE_USE_STANDALONE_MOC_SOURCES
diff --git a/src/modules/objects/KvsObject_painter.cpp b/src/modules/objects/KvsObject_painter.cpp
index 8d7e40777..8e31810b1 100644
--- a/src/modules/objects/KvsObject_painter.cpp
+++ b/src/modules/objects/KvsObject_painter.cpp
@@ -33,7 +33,9 @@
 #include "KviError.h"
 #include "KviIconManager.h"
 #include "KviMemory.h"
-#include <QPrintDialog>
+#if (QT_VERSION < 0x050000)
+	#include <QPrintDialog>
+#endif
 #include <QTextDocument>
 #include <QIcon>
 
@@ -620,7 +622,9 @@ KVSO_BEGIN_CONSTRUCTOR(KvsObject_painter,KviKvsObject)
 
 	m_pPainter = new QPainter();
 	bDonotdeleteinternalqpainter=false;
+#if (QT_VERSION < 0x050000)
 	m_pPrinter = 0 ;
+#endif
 	m_pDeviceObject=0;
 	m_pPainterPath=0;
 	m_pGradient=0;
@@ -635,8 +639,10 @@ KVSO_BEGIN_DESTRUCTOR(KvsObject_painter)
 		m_pGradient=0;
 	if (m_pPainter && !bDonotdeleteinternalqpainter) delete m_pPainter;
 		m_pPainter = 0;
+#if (QT_VERSION < 0x050000)
 	if (m_pPrinter) delete m_pPrinter;
 		m_pPrinter = 0;
+#endif
 
 KVSO_END_CONSTRUCTOR(KvsObject_painter)
 
@@ -1158,6 +1164,10 @@ KVSO_CLASS_FUNCTION(painter,begin)
 	{
 		QString szDev;
 		v->asString(szDev);
+#if (QT_VERSION >= 0x050000)
+		c->warning(__tr2qs_ctx("No valid paint device","objects"));
+		return true;
+#else
 		if(KviQString::equalCI(szDev,"printer") || KviQString::equalCI(szDev,"pdf"))
 		{
 			if (m_pPrinter) delete m_pPrinter;
@@ -1192,6 +1202,7 @@ KVSO_CLASS_FUNCTION(painter,begin)
 		}
 		m_pPainter->begin(m_pPrinter);
 		return true;
+#endif
 	} else if (v->isHObject()) {
 		v->asHObject(hObject);
 		pObject=KviKvsKernel::instance()->objectController()->lookupObject(hObject);
@@ -1234,11 +1245,13 @@ void KvsObject_painter::detachDevice()
 	if(!m_pDeviceObject)return;
 	disconnect(m_pDeviceObject,SIGNAL(aboutToDie()),this,SLOT(detachDevice()));
 	m_pPainter->end();
+#if (QT_VERSION < 0x050000)
 	if (m_pPrinter)
 	{
 		delete m_pPrinter;
 		m_pPrinter=0;
 	}
+#endif
 	m_pDeviceObject = 0;
 }
 
@@ -1249,11 +1262,13 @@ KVSO_CLASS_FUNCTION(painter,end)
 	if(!m_pDeviceObject)
 	{
 		m_pPainter->end();
+#if (QT_VERSION < 0x050000)
 		if (m_pPrinter)
 		{
 			delete m_pPrinter;
 			m_pPrinter=0;
 		}
+#endif
 	}
 	else detachDevice();
 	return true;
@@ -1266,11 +1281,13 @@ KVSO_CLASS_FUNCTION(painter,beginPdf)
 	KVSO_PARAMETERS_BEGIN(c)
 		KVSO_PARAMETER("file_name",KVS_PT_STRING,0,szFileName)
 	KVSO_PARAMETERS_END(c)
+#if (QT_VERSION < 0x050000)
 	if (m_pPrinter) delete m_pPrinter;
 	m_pPrinter=new QPrinter();//QPrinter::HighResolution);
 	m_pPrinter->setOutputFormat(QPrinter::PdfFormat);
 	m_pPrinter->setOutputFileName(szFileName);
 	m_pPainter->begin(m_pPrinter);
+#endif
 	return true;
 }
 
@@ -2097,6 +2114,4 @@ void KvsObject_painter::setInternalPainter(QPainter *p)
 	m_pPainter=p;
 	bDonotdeleteinternalqpainter=true;
 }
-#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
-#include "m_KvsObject_painter.moc"
-#endif //COMPILE_USE_STANDALONE_MOC_SOURCES
+
diff --git a/src/modules/objects/KvsObject_painter.h b/src/modules/objects/KvsObject_painter.h
index d6e28e3dc..dc69396d4 100644
--- a/src/modules/objects/KvsObject_painter.h
+++ b/src/modules/objects/KvsObject_painter.h
@@ -25,13 +25,17 @@
 //
 //=============================================================================
 
-#include <QPrinter>
+#warning QPrinter support in KvsObject_painter needs Qt5PrintSupport module: cmake rules, ifdefs, etc
 
-#include <qpainter.h>
-#include <qpaintdevice.h>
+#include "object_macros.h"
+#if (QT_VERSION < 0x050000)
+	#include <QPrinter>
+#endif
+
+#include <QPainter>
+#include <QPaintDevice>
 #include "KviCString.h"
 #include <QPainterPath>
-#include "object_macros.h"
 
 
 class KvsObject_painter : public KviKvsObject
@@ -40,7 +44,9 @@ class KvsObject_painter : public KviKvsObject
 public:
 	KVSO_DECLARE_OBJECT(KvsObject_painter)
 protected:
+#if (QT_VERSION < 0x050000)
 	QPrinter * m_pPrinter;
+#endif
 	bool bDonotdeleteinternalqpainter;
 	QPainter * m_pPainter;
 	QMatrix  m_pMatrix;
diff --git a/src/modules/objects/KvsObject_pixmap.cpp b/src/modules/objects/KvsObject_pixmap.cpp
index 9f858686a..fcb57a78d 100644
--- a/src/modules/objects/KvsObject_pixmap.cpp
+++ b/src/modules/objects/KvsObject_pixmap.cpp
@@ -707,7 +707,4 @@ void KvsObject_pixmap::frameChanged()
 	callFunction(this,"frameChangedEvent",params);
 }
 
-#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
-#include "m_KvsObject_pixmap.moc"
-#endif //!COMPILE_USE_STANDALONE_MOC_SOURCES
 
diff --git a/src/modules/objects/KvsObject_popupMenu.cpp b/src/modules/objects/KvsObject_popupMenu.cpp
index bf0987ec4..291b39a90 100644
--- a/src/modules/objects/KvsObject_popupMenu.cpp
+++ b/src/modules/objects/KvsObject_popupMenu.cpp
@@ -422,6 +422,3 @@ KVSO_CLASS_FUNCTION(popupMenu,activatedEvent)
 }
 
 
-#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
-#include "m_KvsObject_popupMenu.moc"
-#endif //!COMPILE_USE_STANDALONE_MOC_SOURCES
diff --git a/src/modules/objects/KvsObject_process.cpp b/src/modules/objects/KvsObject_process.cpp
index 5c2a00c4c..369d197bb 100644
--- a/src/modules/objects/KvsObject_process.cpp
+++ b/src/modules/objects/KvsObject_process.cpp
@@ -317,7 +317,4 @@ void KvsObject_process::slotReadStderr()
 	callFunction(this,"readyReadStderrEvent",params);
 }
 
-#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
-#include "m_KvsObject_process.moc"
-#endif //!COMPILE_USE_STANDALONE_MOC_SOURCES
 
diff --git a/src/modules/objects/KvsObject_radioButton.cpp b/src/modules/objects/KvsObject_radioButton.cpp
index 1b8be1a93..2a847866c 100644
--- a/src/modules/objects/KvsObject_radioButton.cpp
+++ b/src/modules/objects/KvsObject_radioButton.cpp
@@ -140,7 +140,4 @@ void KvsObject_radioButton::toggled(bool b)
 }
 
 
-#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
-#include "m_KvsObject_radioButton.moc"
-#endif //!COMPILE_USE_STANDALONE_MOC_SOURCES
 
diff --git a/src/modules/objects/KvsObject_slider.cpp b/src/modules/objects/KvsObject_slider.cpp
index fbd4744c3..4737818a7 100644
--- a/src/modules/objects/KvsObject_slider.cpp
+++ b/src/modules/objects/KvsObject_slider.cpp
@@ -295,7 +295,4 @@ void KvsObject_slider::valueChanged(int value)
 }
 
 
-#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
-#include "m_KvsObject_slider.moc"
-#endif //!COMPILE_USE_STANDALONE_MOC_SOURCES
 
diff --git a/src/modules/objects/KvsObject_socket.cpp b/src/modules/objects/KvsObject_socket.cpp
index dd361d501..571aff749 100644
--- a/src/modules/objects/KvsObject_socket.cpp
+++ b/src/modules/objects/KvsObject_socket.cpp
@@ -747,6 +747,3 @@ KVSO_CLASS_FUNCTION(socket,stateChangedEvent)
 	return true;
 }
 
-#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
-#include "m_KvsObject_socket.moc"
-#endif //!COMPILE_USE_STANDALONE_MOC_SOURCES
diff --git a/src/modules/objects/KvsObject_spinBox.cpp b/src/modules/objects/KvsObject_spinBox.cpp
index 7bb3c1c9e..4c64364dc 100644
--- a/src/modules/objects/KvsObject_spinBox.cpp
+++ b/src/modules/objects/KvsObject_spinBox.cpp
@@ -261,7 +261,4 @@ void KvsObject_spinBox::valueChanged(int value)
 	callFunction(this,"valueChangedEvent",&params);
 }
 
-#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
-#include "m_KvsObject_spinBox.moc"
-#endif //!COMPILE_USE_STANDALONE_MOC_SOURCES
 
diff --git a/src/modules/objects/KvsObject_sql.cpp b/src/modules/objects/KvsObject_sql.cpp
index ff4f2b0cb..6f2b0725c 100644
--- a/src/modules/objects/KvsObject_sql.cpp
+++ b/src/modules/objects/KvsObject_sql.cpp
@@ -26,11 +26,14 @@
 #include "KviMemory.h"
 #include "KviLocale.h"
 #include "KvsObject_sql.h"
-#include <QtSql>
 #include "KvsObject_memoryBuffer.h"
 #include <stdlib.h>
 #include <QHash>
-
+#if (QT_VERSION >= 0x050000)
+#include <QSqlDriver>
+#include <QSqlError>
+#include <QSqlRecord>
+#endif
 
 #define CHECK_QUERY_IS_INIT if (!m_pCurrentSQlQuery)\
 			{\
diff --git a/src/modules/objects/KvsObject_sql.h b/src/modules/objects/KvsObject_sql.h
index 431f6deea..e6266f4fa 100644
--- a/src/modules/objects/KvsObject_sql.h
+++ b/src/modules/objects/KvsObject_sql.h
@@ -29,7 +29,11 @@
 #include "KviPointerList.h"
 #include "KviKvsVariant.h"
 #include "object_macros.h"
-#include <QtSql>
+#if (QT_VERSION >= 0x050000)
+	#include <QSqlQuery>
+#else
+	#include <QtSql>
+#endif
 #include <QHash>
 
 class KvsObject_sql : public KviKvsObject
diff --git a/src/modules/objects/KvsObject_tabWidget.cpp b/src/modules/objects/KvsObject_tabWidget.cpp
index 4f2a515ae..860d34661 100644
--- a/src/modules/objects/KvsObject_tabWidget.cpp
+++ b/src/modules/objects/KvsObject_tabWidget.cpp
@@ -473,7 +473,4 @@ void KvsObject_tabWidget::slotTabCloseRequest(int iIndex)
 	KviKvsVariantList params(new KviKvsVariant((kvs_int_t)iIndex));
 	callFunction(this,"tabCloseRequestEvent",&params);
 }
-#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
-#include "m_KvsObject_tabWidget.moc"
-#endif //!COMPILE_USE_STANDALONE_MOC_SOURCES
 
diff --git a/src/modules/objects/KvsObject_tableWidget.cpp b/src/modules/objects/KvsObject_tableWidget.cpp
index a02378ca6..8b127e936 100644
--- a/src/modules/objects/KvsObject_tableWidget.cpp
+++ b/src/modules/objects/KvsObject_tableWidget.cpp
@@ -37,7 +37,6 @@
 #include <QTableWidget>
 #include <QHeaderView>
 #include <QPainter>
-#include <QPrinter>
 #include <QApplication>
 #include <QPoint>
 #include <QPaintEvent>
@@ -894,6 +893,4 @@ QSize KviCellItemDelegate::sizeHint(const QStyleOptionViewItem &option, const QM
 }
 
 
-#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
-#include "m_KvsObject_tableWidget.moc"
-#endif //COMPILE_USE_STANDALONE_MOC_SOURCES
+
diff --git a/src/modules/objects/KvsObject_tableWidget.h b/src/modules/objects/KvsObject_tableWidget.h
index 97b475e83..229910f3a 100644
--- a/src/modules/objects/KvsObject_tableWidget.h
+++ b/src/modules/objects/KvsObject_tableWidget.h
@@ -30,7 +30,6 @@
 
 #include "KviKvsRunTimeContext.h"
 
-#include <QtSql>
 #include <QTableWidgetItem>
 #include <QItemDelegate>
 #include <QAbstractItemView>
@@ -59,7 +58,6 @@ public:
 	bool paint(QPainter * pPainter, const QStyleOptionViewItem & option, const QModelIndex & index);
 
 protected:
-	QSqlQueryModel       * model;
 	KviKvsRunTimeContext * m_pContext;
 	KviCellItemDelegate  * m_pCellItemDelegate;
 protected:
diff --git a/src/modules/objects/KvsObject_textBrowser.cpp b/src/modules/objects/KvsObject_textBrowser.cpp
index 44fb40973..640a3dc58 100644
--- a/src/modules/objects/KvsObject_textBrowser.cpp
+++ b/src/modules/objects/KvsObject_textBrowser.cpp
@@ -149,7 +149,4 @@ KVSO_CLASS_FUNCTION(textBrowser,linkClickedEvent)
 	return true;
 }
 
-#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
-#include "m_KvsObject_textBrowser.moc"
-#endif //!COMPILE_USE_STANDALONE_MOC_SOURCES
 
diff --git a/src/modules/objects/KvsObject_toolButton.cpp b/src/modules/objects/KvsObject_toolButton.cpp
index 4a4519d58..c2da8b6a6 100644
--- a/src/modules/objects/KvsObject_toolButton.cpp
+++ b/src/modules/objects/KvsObject_toolButton.cpp
@@ -340,6 +340,4 @@ void KvsObject_toolButton::slotClicked()
 	callFunction(this,"clickEvent",params);
 }
 
-#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
-#include "m_KvsObject_toolButton.moc"
-#endif //COMPILE_USE_STANDALONE_MOC_SOURCES
+
diff --git a/src/modules/objects/KvsObject_trayIcon.cpp b/src/modules/objects/KvsObject_trayIcon.cpp
index f2265b8d8..a24e3f442 100644
--- a/src/modules/objects/KvsObject_trayIcon.cpp
+++ b/src/modules/objects/KvsObject_trayIcon.cpp
@@ -238,6 +238,3 @@ void KvsObject_trayIcon::slotActivated(QSystemTrayIcon::ActivationReason reason)
 	lParams.append(new KviKvsVariant(szReason));
 	callFunction(this,"activatedEvent",0,&lParams);
 }
-#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
-#include "m_KvsObject_trayIcon.moc"
-#endif //!COMPILE_USE_STANDALONE_MOC_SOURCES
diff --git a/src/modules/objects/KvsObject_treeWidget.cpp b/src/modules/objects/KvsObject_treeWidget.cpp
index b953be44d..dfb8fc01b 100644
--- a/src/modules/objects/KvsObject_treeWidget.cpp
+++ b/src/modules/objects/KvsObject_treeWidget.cpp
@@ -36,6 +36,7 @@
 #include <QDropEvent>
 #include <QHeaderView>
 #include <QUrl>
+#include <QMimeData>
 
 /*
 	@doc: listview
@@ -654,6 +655,3 @@ void KviKvsTreeWidget::dropEvent(QDropEvent * e)
 	}
 }
 
-#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
-#include "m_KvsObject_treeWidget.moc"
-#endif //!COMPILE_USE_STANDALONE_MOC_SOURCES
diff --git a/src/modules/objects/KvsObject_widget.cpp b/src/modules/objects/KvsObject_widget.cpp
index acd0eaa3a..0052ae0a2 100644
--- a/src/modules/objects/KvsObject_widget.cpp
+++ b/src/modules/objects/KvsObject_widget.cpp
@@ -53,7 +53,6 @@
 #include <QStatusBar>
 #include <QUrl>
 #include <QPainter>
-#include <QPrinter>
 #include <QApplication>
 #include <QPoint>
 #include <QContextMenuEvent>
@@ -2035,6 +2034,4 @@ KVSO_CLASS_FUNCTION(widget,grab)
 }
 
 
-#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
-#include "m_KvsObject_widget.moc"
-#endif //COMPILE_USE_STANDALONE_MOC_SOURCES
+
diff --git a/src/modules/objects/KvsObject_window.cpp b/src/modules/objects/KvsObject_window.cpp
index 140050fdc..dad3df59f 100644
--- a/src/modules/objects/KvsObject_window.cpp
+++ b/src/modules/objects/KvsObject_window.cpp
@@ -172,7 +172,4 @@ KVSO_CLASS_FUNCTION(window,setCentralWidget)
 	return true;
 }
 
-#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
-#include "m_KvsObject_window.moc"
-#endif //!COMPILE_USE_STANDALONE_MOC_SOURCES
 
diff --git a/src/modules/objects/KvsObject_wizard.cpp b/src/modules/objects/KvsObject_wizard.cpp
index 22be0754e..8cfe44a25 100644
--- a/src/modules/objects/KvsObject_wizard.cpp
+++ b/src/modules/objects/KvsObject_wizard.cpp
@@ -380,7 +380,4 @@ KviKvsMdmWizard::~KviKvsMdmWizard()
 {
 }
 
-#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
-#include "m_KvsObject_wizard.moc"
-#endif //!COMPILE_USE_STANDALONE_MOC_SOURCES
 
diff --git a/src/modules/objects/KvsObject_workspace.cpp b/src/modules/objects/KvsObject_workspace.cpp
index af0f4c876..377dce6c9 100644
--- a/src/modules/objects/KvsObject_workspace.cpp
+++ b/src/modules/objects/KvsObject_workspace.cpp
@@ -33,6 +33,8 @@
 #include <QMdiArea>
 #include <QMdiSubWindow>
 #include <QHash>
+#include <QMimeData>
+
 /*
 	@doc:	workspace
 	@keyterms:
diff --git a/src/modules/objects/libkviobjects.cpp b/src/modules/objects/libkviobjects.cpp
index 2e6e23738..a5981d98f 100644
--- a/src/modules/objects/libkviobjects.cpp
+++ b/src/modules/objects/libkviobjects.cpp
@@ -107,8 +107,10 @@ static bool objects_module_cleanup(KviModule *)
 	KvsObject_memoryBuffer::unregisterSelf();
 	KvsObject_process::unregisterSelf();
 	KvsObject_trayIcon::unregisterSelf();
+#if (QT_VERSION < 0x050000)
 	KvsObject_ftp::unregisterSelf();
 	KvsObject_http::unregisterSelf();
+#endif
 	KvsObject_socket::unregisterSelf();
 	KvsObject_xmlReader::unregisterSelf();
 	KvsObject_wrapper::unregisterSelf();
@@ -799,8 +801,10 @@ static bool objects_module_init(KviModule * m)
 	KvsObject_wrapper::registerSelf();
 	KvsObject_xmlReader::registerSelf();
 	KvsObject_socket::registerSelf();
+#if (QT_VERSION < 0x050000)
 	KvsObject_http::registerSelf();
 	KvsObject_ftp::registerSelf();
+#endif
 	KvsObject_trayIcon::registerSelf();
 	KvsObject_process::registerSelf();
 	KvsObject_memoryBuffer::registerSelf();
diff --git a/src/modules/options/OptionsDialog.cpp b/src/modules/options/OptionsDialog.cpp
index 9808c69a7..3e1debd49 100644
--- a/src/modules/options/OptionsDialog.cpp
+++ b/src/modules/options/OptionsDialog.cpp
@@ -665,7 +665,3 @@ void  OptionsDialog::keyPressEvent( QKeyEvent * e )
 	else
 		e->ignore();
 }
-
-#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
-#include "m_dialog.moc"
-#endif //!COMPILE_USE_STANDALONE_MOC_SOURCES
diff --git a/src/modules/options/OptionsDialog.h b/src/modules/options/OptionsDialog.h
index d72fc4810..d667f0fec 100644
--- a/src/modules/options/OptionsDialog.h
+++ b/src/modules/options/OptionsDialog.h
@@ -34,7 +34,6 @@
 #include <QStringList>
 #include <QToolButton>
 #include <QPainter>
-#include <QColorGroup>
 
 class QLabel;
 class QPushButton;
diff --git a/src/modules/options/OptionsInstanceManager.cpp b/src/modules/options/OptionsInstanceManager.cpp
index c3fcd24ad..c44cc28b3 100644
--- a/src/modules/options/OptionsInstanceManager.cpp
+++ b/src/modules/options/OptionsInstanceManager.cpp
@@ -3858,8 +3858,3 @@ OptionsWidgetInstanceEntry * OptionsInstanceManager::findInstanceEntry(const cha
 {
 	return findInstanceEntry(pcName,m_pInstanceTree);
 }
-
-#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
-	#include "m_OptionsInstanceManager.moc"
-#endif
-
diff --git a/src/modules/options/OptionsWidgetContainer.cpp b/src/modules/options/OptionsWidgetContainer.cpp
index 62cc3d95c..24fc7e528 100644
--- a/src/modules/options/OptionsWidgetContainer.cpp
+++ b/src/modules/options/OptionsWidgetContainer.cpp
@@ -164,7 +164,3 @@ void OptionsWidgetContainer::cancelClicked()
 {
 	deleteLater();
 }
-
-#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
-#include "m_OptionsWidgetContainer.moc"
-#endif //!COMPILE_USE_STANDALONE_MOC_SOURCES
diff --git a/src/modules/options/OptionsWidget_alertsAndHighlighting.cpp b/src/modules/options/OptionsWidget_alertsAndHighlighting.cpp
index ca3de875a..3dd3c300c 100644
--- a/src/modules/options/OptionsWidget_alertsAndHighlighting.cpp
+++ b/src/modules/options/OptionsWidget_alertsAndHighlighting.cpp
@@ -147,8 +147,5 @@ OptionsWidget_alerts::~OptionsWidget_alerts()
 }
 
 
-#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
-#include "m_OptionsWidget_alertsAndHighlighting.moc"
-#endif //!COMPILE_USE_STANDALONE_MOC_SOURCES
 
 #endif //_OPTW_HIGHLIGHTING_CPP_
diff --git a/src/modules/options/OptionsWidget_antiSpam.cpp b/src/modules/options/OptionsWidget_antiSpam.cpp
index 6b7648884..1a18aafb0 100644
--- a/src/modules/options/OptionsWidget_antiSpam.cpp
+++ b/src/modules/options/OptionsWidget_antiSpam.cpp
@@ -61,6 +61,3 @@ void OptionsWidget_antispam::reenableStuff(bool)
 }
 
 
-#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
-#include "m_OptionsWidget_antiSpam.moc"
-#endif //!COMPILE_USE_STANDALONE_MOC_SOURCES
diff --git a/src/modules/options/OptionsWidget_avatar.cpp b/src/modules/options/OptionsWidget_avatar.cpp
index 6f48d5f88..73b4b5faf 100644
--- a/src/modules/options/OptionsWidget_avatar.cpp
+++ b/src/modules/options/OptionsWidget_avatar.cpp
@@ -116,6 +116,3 @@ OptionsWidget_avatar::~OptionsWidget_avatar()
 }
 
 
-#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
-#include "m_OptionsWidget_avatar.moc"
-#endif //!COMPILE_USE_STANDALONE_MOC_SOURCES
diff --git a/src/modules/options/OptionsWidget_away.cpp b/src/modules/options/OptionsWidget_away.cpp
index f4f2041de..85e919a81 100644
--- a/src/modules/options/OptionsWidget_away.cpp
+++ b/src/modules/options/OptionsWidget_away.cpp
@@ -69,6 +69,3 @@ void OptionsWidget_away::enableAwayMessage(bool)
 	m_pAwayMessage->setEnabled(m_pEnableAwayMessage->isChecked());
 }
 
-#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
-#include "m_OptionsWidget_away.moc"
-#endif //!COMPILE_USE_STANDALONE_MOC_SOURCES
diff --git a/src/modules/options/OptionsWidget_channel.cpp b/src/modules/options/OptionsWidget_channel.cpp
index b33de8197..c3bfd7b9f 100644
--- a/src/modules/options/OptionsWidget_channel.cpp
+++ b/src/modules/options/OptionsWidget_channel.cpp
@@ -161,6 +161,4 @@ void OptionsWidget_channelAdvanced::commit()
 	KviOptionsWidget::commit();
 }
 
-#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
-#include "m_OptionsWidget_channel.moc"
-#endif //COMPILE_USE_STANDALONE_MOC_SOURCES
+
diff --git a/src/modules/options/OptionsWidget_connection.cpp b/src/modules/options/OptionsWidget_connection.cpp
index b12201f9b..c82a95bd4 100644
--- a/src/modules/options/OptionsWidget_connection.cpp
+++ b/src/modules/options/OptionsWidget_connection.cpp
@@ -305,6 +305,3 @@ OptionsWidget_connectionAdvanced::~OptionsWidget_connectionAdvanced()
 {
 }
 
-#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
-#include "m_OptionsWidget_connection.moc"
-#endif //!COMPILE_USE_STANDALONE_MOC_SOURCES
diff --git a/src/modules/options/OptionsWidget_ctcp.cpp b/src/modules/options/OptionsWidget_ctcp.cpp
index d94bad8d3..c452f8f2d 100644
--- a/src/modules/options/OptionsWidget_ctcp.cpp
+++ b/src/modules/options/OptionsWidget_ctcp.cpp
@@ -82,6 +82,3 @@ OptionsWidget_ctcp::~OptionsWidget_ctcp()
 }
 
 
-#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
-#include "m_OptionsWidget_ctcp.moc"
-#endif //!COMPILE_USE_STANDALONE_MOC_SOURCES
diff --git a/src/modules/options/OptionsWidget_ctcpFloodProtection.cpp b/src/modules/options/OptionsWidget_ctcpFloodProtection.cpp
index 0abfd22ca..ec87dae40 100644
--- a/src/modules/options/OptionsWidget_ctcpFloodProtection.cpp
+++ b/src/modules/options/OptionsWidget_ctcpFloodProtection.cpp
@@ -113,6 +113,3 @@ OptionsWidget_ctcpFloodProtection::~OptionsWidget_ctcpFloodProtection()
 }
 
 
-#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
-#include "m_OptionsWidget_ctcpFloodProtection.moc"
-#endif //!COMPILE_USE_STANDALONE_MOC_SOURCES
diff --git a/src/modules/options/OptionsWidget_dcc.cpp b/src/modules/options/OptionsWidget_dcc.cpp
index 585d5b6ab..77e95e6d9 100644
--- a/src/modules/options/OptionsWidget_dcc.cpp
+++ b/src/modules/options/OptionsWidget_dcc.cpp
@@ -367,6 +367,3 @@ OptionsWidget_dccVoice::~OptionsWidget_dccVoice()
 {
 }
 
-#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
-#include "m_OptionsWidget_dcc.moc"
-#endif //!COMPILE_USE_STANDALONE_MOC_SOURCES
diff --git a/src/modules/options/OptionsWidget_general.cpp b/src/modules/options/OptionsWidget_general.cpp
index b3836826a..5b9346285 100644
--- a/src/modules/options/OptionsWidget_general.cpp
+++ b/src/modules/options/OptionsWidget_general.cpp
@@ -46,6 +46,3 @@ OptionsWidget_general::~OptionsWidget_general()
 }
 
 
-#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
-#include "m_OptionsWidget_general.moc"
-#endif //!COMPILE_USE_STANDALONE_MOC_SOURCES
diff --git a/src/modules/options/OptionsWidget_identity.cpp b/src/modules/options/OptionsWidget_identity.cpp
index e79564221..6debb2d0d 100644
--- a/src/modules/options/OptionsWidget_identity.cpp
+++ b/src/modules/options/OptionsWidget_identity.cpp
@@ -1010,6 +1010,4 @@ void IdentityProfileEditor::toggleButton(const QString & szText)
 	m_pBtnOk->setEnabled(bEnabled);
 }
 
-#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
-#include "m_OptionsWidget_identity.moc"
-#endif //COMPILE_USE_STANDALONE_MOC_SOURCES
+
diff --git a/src/modules/options/OptionsWidget_ignore.cpp b/src/modules/options/OptionsWidget_ignore.cpp
index c8cfc6999..1381acba8 100644
--- a/src/modules/options/OptionsWidget_ignore.cpp
+++ b/src/modules/options/OptionsWidget_ignore.cpp
@@ -61,6 +61,3 @@ void OptionsWidget_ignore::enableVerbose(bool)
 
 
 
-#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
-#include "m_OptionsWidget_ignore.moc"
-#endif //!COMPILE_USE_STANDALONE_MOC_SOURCES
diff --git a/src/modules/options/OptionsWidget_input.cpp b/src/modules/options/OptionsWidget_input.cpp
index 78bdc3cce..d8d95a99e 100644
--- a/src/modules/options/OptionsWidget_input.cpp
+++ b/src/modules/options/OptionsWidget_input.cpp
@@ -162,6 +162,3 @@ OptionsWidget_inputFeatures::~OptionsWidget_inputFeatures()
 {
 }
 
-#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
-#include "m_OptionsWidget_input.moc"
-#endif //!COMPILE_USE_STANDALONE_MOC_SOURCES
diff --git a/src/modules/options/OptionsWidget_interfaceFeatures.cpp b/src/modules/options/OptionsWidget_interfaceFeatures.cpp
index ef3f1c2ed..009df9005 100644
--- a/src/modules/options/OptionsWidget_interfaceFeatures.cpp
+++ b/src/modules/options/OptionsWidget_interfaceFeatures.cpp
@@ -86,6 +86,3 @@ void OptionsWidget_interfaceFeatures::commit()
 
 }
 
-#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
-#include "m_OptionsWidget_interfaceFeatures.moc"
-#endif //!COMPILE_USE_STANDALONE_MOC_SOURCES
diff --git a/src/modules/options/OptionsWidget_irc.cpp b/src/modules/options/OptionsWidget_irc.cpp
index 675eb43db..e02fe5242 100644
--- a/src/modules/options/OptionsWidget_irc.cpp
+++ b/src/modules/options/OptionsWidget_irc.cpp
@@ -83,6 +83,4 @@ OptionsWidget_ircAdvanced::~OptionsWidget_ircAdvanced()
 {
 }
 
-#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
-#include "m_OptionsWidget_irc.moc"
-#endif //COMPILE_USE_STANDALONE_MOC_SOURCES
+
diff --git a/src/modules/options/OptionsWidget_ircOutput.cpp b/src/modules/options/OptionsWidget_ircOutput.cpp
index 8bb3711ff..be69cdfb4 100644
--- a/src/modules/options/OptionsWidget_ircOutput.cpp
+++ b/src/modules/options/OptionsWidget_ircOutput.cpp
@@ -106,6 +106,3 @@ void OptionsWidget_ircOutput::commit()
 	KVI_OPTION_UINT(KviOption_uintOutputDatetimeFormat) = m_pDatetimeCombo->currentIndex();
 }
 
-#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
-#include "m_OptionsWidget_ircOutput.moc"
-#endif //!COMPILE_USE_STANDALONE_MOC_SOURCES
diff --git a/src/modules/options/OptionsWidget_ircView.cpp b/src/modules/options/OptionsWidget_ircView.cpp
index ffa514817..7fb56fc48 100644
--- a/src/modules/options/OptionsWidget_ircView.cpp
+++ b/src/modules/options/OptionsWidget_ircView.cpp
@@ -216,6 +216,3 @@ void OptionsWidget_ircViewMarker::commit()
 	KviOptionsWidget::commit();
 }
 
-#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
-#include "m_OptionsWidget_ircView.moc"
-#endif //!COMPILE_USE_STANDALONE_MOC_SOURCES
diff --git a/src/modules/options/OptionsWidget_lag.cpp b/src/modules/options/OptionsWidget_lag.cpp
index 0e2e763fd..79d4088c0 100644
--- a/src/modules/options/OptionsWidget_lag.cpp
+++ b/src/modules/options/OptionsWidget_lag.cpp
@@ -75,6 +75,3 @@ OptionsWidget_lag::~OptionsWidget_lag()
 }
 
 
-#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
-#include "m_OptionsWidget_lag.moc"
-#endif //!COMPILE_USE_STANDALONE_MOC_SOURCES
diff --git a/src/modules/options/OptionsWidget_logging.cpp b/src/modules/options/OptionsWidget_logging.cpp
index 2802e9417..97d9c9978 100644
--- a/src/modules/options/OptionsWidget_logging.cpp
+++ b/src/modules/options/OptionsWidget_logging.cpp
@@ -72,6 +72,3 @@ OptionsWidget_logging::~OptionsWidget_logging()
 
 
 
-#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
-#include "m_OptionsWidget_logging.moc"
-#endif //!COMPILE_USE_STANDALONE_MOC_SOURCES
diff --git a/src/modules/options/OptionsWidget_mediaTypes.cpp b/src/modules/options/OptionsWidget_mediaTypes.cpp
index 71df63df1..7c85b21e5 100644
--- a/src/modules/options/OptionsWidget_mediaTypes.cpp
+++ b/src/modules/options/OptionsWidget_mediaTypes.cpp
@@ -260,6 +260,3 @@ void OptionsWidget_mediaTypes::commit()
 	g_pMediaManager->unlock();
 }
 
-#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
-#include "m_OptionsWidget_mediaTypes.moc"
-#endif //!COMPILE_USE_STANDALONE_MOC_SOURCES
diff --git a/src/modules/options/OptionsWidget_message.cpp b/src/modules/options/OptionsWidget_message.cpp
index 672d782c0..efb7519fc 100644
--- a/src/modules/options/OptionsWidget_message.cpp
+++ b/src/modules/options/OptionsWidget_message.cpp
@@ -657,6 +657,3 @@ void OptionsWidget_messageColors::load()
 	}
 }
 
-#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
-#include "m_OptionsWidget_message.moc"
-#endif //!COMPILE_USE_STANDALONE_MOC_SOURCES
diff --git a/src/modules/options/OptionsWidget_message.h b/src/modules/options/OptionsWidget_message.h
index c90ea61eb..50df67b7a 100644
--- a/src/modules/options/OptionsWidget_message.h
+++ b/src/modules/options/OptionsWidget_message.h
@@ -33,7 +33,6 @@
 #include <QCheckBox>
 #include <QToolButton>
 #include <QPainter>
-#include <QColorGroup>
 #include <QMenu>
 
 #define KVI_OPTIONS_WIDGET_ICON_OptionsWidget_message KviIconManager::Messages
diff --git a/src/modules/options/OptionsWidget_nickserv.cpp b/src/modules/options/OptionsWidget_nickserv.cpp
index d6da68662..c88722718 100644
--- a/src/modules/options/OptionsWidget_nickserv.cpp
+++ b/src/modules/options/OptionsWidget_nickserv.cpp
@@ -366,6 +366,3 @@ void OptionsWidget_nickServ::commit()
 	KviOptionsWidget::commit();
 }
 
-#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
-#include "m_OptionsWidget_nickserv.moc"
-#endif //!COMPILE_USE_STANDALONE_MOC_SOURCES
diff --git a/src/modules/options/OptionsWidget_notifier.cpp b/src/modules/options/OptionsWidget_notifier.cpp
index d21770c65..a83eb558c 100644
--- a/src/modules/options/OptionsWidget_notifier.cpp
+++ b/src/modules/options/OptionsWidget_notifier.cpp
@@ -273,6 +273,3 @@ void OptionsWidget_notifier::toggleNotifierProtocol(bool)
 }
 #endif // COMPILE_KDE_SUPPORT
 
-#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
-#include "m_OptionsWidget_input.moc"
-#endif //!COMPILE_USE_STANDALONE_MOC_SOURCES
diff --git a/src/modules/options/OptionsWidget_notify.cpp b/src/modules/options/OptionsWidget_notify.cpp
index ce8ad1338..1387514c3 100644
--- a/src/modules/options/OptionsWidget_notify.cpp
+++ b/src/modules/options/OptionsWidget_notify.cpp
@@ -102,6 +102,3 @@ OptionsWidget_notify::~OptionsWidget_notify()
 {
 }
 
-#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
-#include "m_OptionsWidget_notify.moc"
-#endif //!COMPILE_USE_STANDALONE_MOC_SOURCES
diff --git a/src/modules/options/OptionsWidget_protection.cpp b/src/modules/options/OptionsWidget_protection.cpp
index a9cb10527..4ba10d389 100644
--- a/src/modules/options/OptionsWidget_protection.cpp
+++ b/src/modules/options/OptionsWidget_protection.cpp
@@ -42,6 +42,3 @@ OptionsWidget_protection::~OptionsWidget_protection()
 {
 }
 
-#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
-#include "m_OptionsWidget_protection.moc"
-#endif //!COMPILE_USE_STANDALONE_MOC_SOURCES
diff --git a/src/modules/options/OptionsWidget_proxy.cpp b/src/modules/options/OptionsWidget_proxy.cpp
index 9a399ea54..9e26501d8 100644
--- a/src/modules/options/OptionsWidget_proxy.cpp
+++ b/src/modules/options/OptionsWidget_proxy.cpp
@@ -360,6 +360,3 @@ void OptionsWidget_proxy::removeCurrent()
 	}
 }
 
-#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
-#include "m_OptionsWidget_proxy.moc"
-#endif //!COMPILE_USE_STANDALONE_MOC_SOURCES
diff --git a/src/modules/options/OptionsWidget_query.cpp b/src/modules/options/OptionsWidget_query.cpp
index 235b86dab..d9d113745 100644
--- a/src/modules/options/OptionsWidget_query.cpp
+++ b/src/modules/options/OptionsWidget_query.cpp
@@ -111,6 +111,4 @@ OptionsWidget_query::~OptionsWidget_query()
 }
 
 
-#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
-#include "m_OptionsWidget_query.moc"
-#endif //COMPILE_USE_STANDALONE_MOC_SOURCES
+
diff --git a/src/modules/options/OptionsWidget_servers.cpp b/src/modules/options/OptionsWidget_servers.cpp
index 476328171..2464dfc08 100644
--- a/src/modules/options/OptionsWidget_servers.cpp
+++ b/src/modules/options/OptionsWidget_servers.cpp
@@ -1728,7 +1728,7 @@ void OptionsWidget_servers::saveLastItem()
 	{
 		QString tmp = m_pSrvNetEdit->text();
 		if(tmp.isEmpty())
-			tmp = QString::fromAscii("irc.unknown.net");
+			tmp = QString::fromLatin1("irc.unknown.net");
 		m_pLastEditedItem->m_pServerData->setHostName(tmp);
 		m_pLastEditedItem->updateVisibleStrings();
 	} else if(m_pLastEditedItem->m_pNetworkData)
@@ -2102,6 +2102,3 @@ void OptionsWidget_servers::detailsClicked()
 	}
 }
 
-#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
-#include "m_OptionsWidget_servers.moc"
-#endif //!COMPILE_USE_STANDALONE_MOC_SOURCES
diff --git a/src/modules/options/OptionsWidget_sound.cpp b/src/modules/options/OptionsWidget_sound.cpp
index ad980be4e..3b8b6d306 100644
--- a/src/modules/options/OptionsWidget_sound.cpp
+++ b/src/modules/options/OptionsWidget_sound.cpp
@@ -353,6 +353,3 @@ OptionsWidget_sounds::~OptionsWidget_sounds()
 {
 }
 
-#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
-#include "m_OptionsWidget_sound.moc"
-#endif //!COMPILE_USE_STANDALONE_MOC_SOURCES
diff --git a/src/modules/options/OptionsWidget_textEncoding.cpp b/src/modules/options/OptionsWidget_textEncoding.cpp
index f87a5ebad..eeaac0411 100644
--- a/src/modules/options/OptionsWidget_textEncoding.cpp
+++ b/src/modules/options/OptionsWidget_textEncoding.cpp
@@ -168,6 +168,3 @@ void OptionsWidget_textEncoding::commit()
 		QMessageBox::information(0,"KVIrc",__tr2qs_ctx("You need to restart KVirc to apply a language changing","options"),QMessageBox::Ok);*/
 }
 
-#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
-#include "m_OptionsWidget_textEncoding.moc"
-#endif //!COMPILE_USE_STANDALONE_MOC_SOURCES
diff --git a/src/modules/options/OptionsWidget_textIcons.cpp b/src/modules/options/OptionsWidget_textIcons.cpp
index c8c318bec..0c5bde729 100644
--- a/src/modules/options/OptionsWidget_textIcons.cpp
+++ b/src/modules/options/OptionsWidget_textIcons.cpp
@@ -80,7 +80,11 @@ OptionsWidget_textIcons::OptionsWidget_textIcons(QWidget * parent)
 
 	m_pTable->setColumnCount(2);
 	m_pTable->setColumnWidth(0,300);
+#if (QT_VERSION >= 0x050000)
+	m_pTable->horizontalHeader()->setSectionResizeMode(QHeaderView::Stretch);
+#else
 	m_pTable->horizontalHeader()->setResizeMode(QHeaderView::Stretch);
+#endif
 	m_pTable->horizontalHeader()->stretchLastSection();
 	m_pTable->setSelectionBehavior(QAbstractItemView::SelectRows);
 	m_pTable->setSelectionMode(QAbstractItemView::SingleSelection);
@@ -306,6 +310,3 @@ void OptionsWidget_textIcons::commit()
 	}
 }
 
-#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
-#include "m_OptionsWidget_textIcons.moc"
-#endif //!COMPILE_USE_STANDALONE_MOC_SOURCES
diff --git a/src/modules/options/OptionsWidget_theme.cpp b/src/modules/options/OptionsWidget_theme.cpp
index 96d7d6bbf..a4f8f1bf7 100644
--- a/src/modules/options/OptionsWidget_theme.cpp
+++ b/src/modules/options/OptionsWidget_theme.cpp
@@ -199,6 +199,3 @@ OptionsWidget_themeToolBarApplets::~OptionsWidget_themeToolBarApplets()
 }
 
 
-#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
-#include "m_OptionsWidget_theme.moc"
-#endif //!COMPILE_USE_STANDALONE_MOC_SOURCES
diff --git a/src/modules/options/OptionsWidget_tools.cpp b/src/modules/options/OptionsWidget_tools.cpp
index 2f5015fa7..6b21c57c6 100644
--- a/src/modules/options/OptionsWidget_tools.cpp
+++ b/src/modules/options/OptionsWidget_tools.cpp
@@ -46,6 +46,3 @@ OptionsWidget_tools::~OptionsWidget_tools()
 {
 }
 
-#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
-#include "m_OptionsWidget_tools.moc"
-#endif //!COMPILE_USE_STANDALONE_MOC_SOURCES
diff --git a/src/modules/options/OptionsWidget_topicLabel.cpp b/src/modules/options/OptionsWidget_topicLabel.cpp
index b305771ee..bc0f4d522 100644
--- a/src/modules/options/OptionsWidget_topicLabel.cpp
+++ b/src/modules/options/OptionsWidget_topicLabel.cpp
@@ -45,6 +45,3 @@ OptionsWidget_topicLabel::~OptionsWidget_topicLabel()
 {
 }
 
-#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
-#include "m_OptionsWidget_topicLabel.moc"
-#endif //!COMPILE_USE_STANDALONE_MOC_SOURCES
diff --git a/src/modules/options/OptionsWidget_tray.cpp b/src/modules/options/OptionsWidget_tray.cpp
index 339df1f02..052663742 100644
--- a/src/modules/options/OptionsWidget_tray.cpp
+++ b/src/modules/options/OptionsWidget_tray.cpp
@@ -107,6 +107,3 @@ void OptionsWidget_tray::setEnabled(bool)
 }
 
 
-#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
-#include "m_OptionsWidget_tray.moc"
-#endif //!COMPILE_USE_STANDALONE_MOC_SOURCES
diff --git a/src/modules/options/OptionsWidget_uparser.cpp b/src/modules/options/OptionsWidget_uparser.cpp
index d2822b02d..4a15fc9ff 100644
--- a/src/modules/options/OptionsWidget_uparser.cpp
+++ b/src/modules/options/OptionsWidget_uparser.cpp
@@ -68,6 +68,3 @@ OptionsWidget_uparser::~OptionsWidget_uparser()
 }
 
 
-#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
-#include "m_OptionsWidget_uparser.moc"
-#endif //!COMPILE_USE_STANDALONE_MOC_SOURCES
diff --git a/src/modules/options/OptionsWidget_urlHandlers.cpp b/src/modules/options/OptionsWidget_urlHandlers.cpp
index 54bb2f311..9798d59a1 100644
--- a/src/modules/options/OptionsWidget_urlHandlers.cpp
+++ b/src/modules/options/OptionsWidget_urlHandlers.cpp
@@ -153,8 +153,5 @@ void OptionsWidget_urlHandlers::commit()
 #endif
 }
 
-#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
-#include "m_OptionsWidget_urlHandlers.moc"
-#endif //!COMPILE_USE_STANDALONE_MOC_SOURCES
 
 #endif //_OPTW_URLHANDLERS_CPP_
diff --git a/src/modules/options/OptionsWidget_userList.cpp b/src/modules/options/OptionsWidget_userList.cpp
index 27a8d1344..ea8b4426a 100644
--- a/src/modules/options/OptionsWidget_userList.cpp
+++ b/src/modules/options/OptionsWidget_userList.cpp
@@ -245,6 +245,4 @@ OptionsWidget_userListFeatures::~OptionsWidget_userListFeatures()
 {
 }
 
-#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
-#include "m_OptionsWidget_userList.moc"
-#endif //COMPILE_USE_STANDALONE_MOC_SOURCES
+
diff --git a/src/modules/options/OptionsWidget_windowList.cpp b/src/modules/options/OptionsWidget_windowList.cpp
index 53b61c8a9..acb36b598 100644
--- a/src/modules/options/OptionsWidget_windowList.cpp
+++ b/src/modules/options/OptionsWidget_windowList.cpp
@@ -264,6 +264,3 @@ OptionsWidget_windowListClassic::~OptionsWidget_windowListClassic()
 {
 }
 
-#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
-#include "m_OptionsWidget_windowList.moc"
-#endif //!COMPILE_USE_STANDALONE_MOC_SOURCES
diff --git a/src/modules/options/mkcreateinstanceproc.sh b/src/modules/options/mkcreateinstanceproc.sh
index 9396972bd..9a89dafc9 100755
--- a/src/modules/options/mkcreateinstanceproc.sh
+++ b/src/modules/options/mkcreateinstanceproc.sh
@@ -466,10 +466,6 @@ OptionsWidgetInstanceEntry * OptionsInstanceManager::findInstanceEntry(const cha
 	return findInstanceEntry(pcName,m_pInstanceTree);
 }
 
-#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
-	#include "m_OptionsInstanceManager.moc"
-#endif
-
 EOF
 #################################################################################
 
diff --git a/src/modules/pythoncore/libkvipythoncore.cpp b/src/modules/pythoncore/libkvipythoncore.cpp
index 7c7b60e08..00a7257d8 100644
--- a/src/modules/pythoncore/libkvipythoncore.cpp
+++ b/src/modules/pythoncore/libkvipythoncore.cpp
@@ -148,7 +148,7 @@ bool KviPythonInterpreter::execute(
 		else
 			bFirst = false;
 
-		szVarCode += QString::fromAscii("\"%1\"").arg(szArg);
+		szVarCode += QString::fromLatin1("\"%1\"").arg(szArg);
 	}
 
 	szVarCode += "]";
diff --git a/src/modules/raweditor/RawEditorWindow.cpp b/src/modules/raweditor/RawEditorWindow.cpp
index 9ef52015c..28bca8cc6 100644
--- a/src/modules/raweditor/RawEditorWindow.cpp
+++ b/src/modules/raweditor/RawEditorWindow.cpp
@@ -218,7 +218,7 @@ void RawEditorWidget::addRaw()
 {
 	bool bOk = false;
 
-	int iIdx = QInputDialog::getInteger(this,__tr2qs_ctx("New Raw Event","editor"),__tr2qs_ctx("Enter the numeric code of the message (0-999)","editor"),0,0,999,1,&bOk);
+	int iIdx = QInputDialog::getInt(this,__tr2qs_ctx("New Raw Event","editor"),__tr2qs_ctx("Enter the numeric code of the message (0-999)","editor"),0,0,999,1,&bOk);
 
 	if(!bOk)return;
 
diff --git a/src/modules/reguser/RegisteredUserEntryDialog.cpp b/src/modules/reguser/RegisteredUserEntryDialog.cpp
index 05ba20eef..f616789ca 100644
--- a/src/modules/reguser/RegisteredUserEntryDialog.cpp
+++ b/src/modules/reguser/RegisteredUserEntryDialog.cpp
@@ -793,6 +793,3 @@ void RegisteredUserEntryDialog::editAllPropertiesClicked()
 
 }
 
-#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
-#include "RegisteredUserEntryDialog.moc"
-#endif //!COMPILE_USE_STANDALONE_MOC_SOURCES
diff --git a/src/modules/reguser/RegisteredUsersDialog.cpp b/src/modules/reguser/RegisteredUsersDialog.cpp
index 852c473fe..3cb51126e 100644
--- a/src/modules/reguser/RegisteredUsersDialog.cpp
+++ b/src/modules/reguser/RegisteredUsersDialog.cpp
@@ -62,7 +62,6 @@
 #include <QEvent>
 #include <QCloseEvent>
 #include <QAbstractItemView>
-#include <QTextDocument>
 #include <QAbstractTextDocumentLayout>
 #include <QShortcut>
 
@@ -932,6 +931,3 @@ succesfull_import:
 }
 
 
-#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
-#include "dialog.moc"
-#endif //!COMPILE_USE_STANDALONE_MOC_SOURCES
diff --git a/src/modules/reguser/RegistrationWizard.cpp b/src/modules/reguser/RegistrationWizard.cpp
index 5680b9d73..dc092dff2 100644
--- a/src/modules/reguser/RegistrationWizard.cpp
+++ b/src/modules/reguser/RegistrationWizard.cpp
@@ -473,6 +473,3 @@ void RegistrationWizard::notifyCheckToggled(bool)
 	notifyNickChanged(dummy);
 }
 
-#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
-#include "RegistrationWizard.moc"
-#endif //!COMPILE_USE_STANDALONE_MOC_SOURCES
diff --git a/src/modules/rijndael/libkvirijndael.cpp b/src/modules/rijndael/libkvirijndael.cpp
index 32482e752..5784dc8c7 100644
--- a/src/modules/rijndael/libkvirijndael.cpp
+++ b/src/modules/rijndael/libkvirijndael.cpp
@@ -797,9 +797,3 @@ KVIRC_MODULE(
 	rijndael_module_cleanup,
 	0
 )
-
-#ifdef COMPILE_CRYPT_SUPPORT
-	#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
-		#include "libkvirijndael.moc"
-	#endif //!COMPILE_USE_STANDALONE_MOC_SOURCES
-#endif
diff --git a/src/modules/rot13/libkvirot13.cpp b/src/modules/rot13/libkvirot13.cpp
index ad31af3b2..622cd92da 100644
--- a/src/modules/rot13/libkvirot13.cpp
+++ b/src/modules/rot13/libkvirot13.cpp
@@ -169,9 +169,3 @@ KVIRC_MODULE(
 	rot13_module_cleanup,
 	0
 )
-
-#ifdef COMPILE_CRYPT_SUPPORT
-	#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
-		#include "libkvirot13.moc"
-	#endif //!COMPILE_USE_STANDALONE_MOC_SOURCES
-#endif
diff --git a/src/modules/setup/SetupWizard.cpp b/src/modules/setup/SetupWizard.cpp
index b50095819..e9017a24a 100644
--- a/src/modules/setup/SetupWizard.cpp
+++ b/src/modules/setup/SetupWizard.cpp
@@ -1104,6 +1104,3 @@ void SetupWizard::accept()
 	KviTalWizard::accept();
 }
 
-#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
-#include "SetupWizard.moc"
-#endif //!COMPILE_USE_STANDALONE_MOC_SOURCES
diff --git a/src/modules/sharedfileswindow/SharedFilesWindow.cpp b/src/modules/sharedfileswindow/SharedFilesWindow.cpp
index 1becf1271..8ddbb2920 100644
--- a/src/modules/sharedfileswindow/SharedFilesWindow.cpp
+++ b/src/modules/sharedfileswindow/SharedFilesWindow.cpp
@@ -732,6 +732,3 @@ void SharedFilesWindow::die()
 //}
 
 
-#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
-#include "m_SharedFilesWindow.moc"
-#endif //!COMPILE_USE_STANDALONE_MOC_SOURCES
diff --git a/src/modules/snd/libkvisnd.cpp b/src/modules/snd/libkvisnd.cpp
index 5f62e929f..4db392865 100644
--- a/src/modules/snd/libkvisnd.cpp
+++ b/src/modules/snd/libkvisnd.cpp
@@ -34,7 +34,12 @@
 #include "KviLocale.h"
 #include "KviQString.h"
 
-#include <QSound>
+#warning in libkvisnd to use QSound we need proper cmake rules and includes for QtMultimedia
+
+#if (QT_VERSION < 0x050000)
+	#include <QSound>
+#endif
+
 
 #ifdef COMPILE_PHONON_SUPPORT
 	#include <phonon/mediaobject.h>
@@ -238,13 +243,13 @@ void KviSoundPlayer::detectSoundSystem()
 		#endif
 		KVI_OPTION_STRING(KviOption_stringSoundSystem) = "oss";
 	#endif
-
+#if (QT_VERSION < 0x050000)
 	if(QSound::isAvailable())
 	{
 		KVI_OPTION_STRING(KviOption_stringSoundSystem) = "qt";
 		return;
 	}
-
+#endif
 	KVI_OPTION_STRING(KviOption_stringSoundSystem) = "null";
 #endif
 }
@@ -359,7 +364,9 @@ bool KviSoundPlayer::playQt(const QString &szFileName)
 {
 	if(isMuted())
 		return true;
+#if (QT_VERSION < 0x050000)
 	QSound::play(szFileName);
+#endif
 	return true;
 }
 
@@ -859,6 +866,3 @@ KVIRC_MODULE(
 	0
 )
 
-#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
-#include "libkvisnd.moc"
-#endif //!COMPILE_USE_STANDALONE_MOC_SOURCES
diff --git a/src/modules/socketspy/SocketSpyWindow.cpp b/src/modules/socketspy/SocketSpyWindow.cpp
index e2bd6dd1b..3d8ac8bd9 100644
--- a/src/modules/socketspy/SocketSpyWindow.cpp
+++ b/src/modules/socketspy/SocketSpyWindow.cpp
@@ -109,6 +109,3 @@ void SocketSpyWindow::applyOptions()
 	KviWindow::applyOptions();
 }
 
-#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
-#include "m_socketspywindow.moc"
-#endif //!COMPILE_USE_STANDALONE_MOC_SOURCES
diff --git a/src/modules/spaste/SlowPasteController.cpp b/src/modules/spaste/SlowPasteController.cpp
index fbd1552bb..ed2f6944d 100644
--- a/src/modules/spaste/SlowPasteController.cpp
+++ b/src/modules/spaste/SlowPasteController.cpp
@@ -114,7 +114,7 @@ void SlowPasteController::pasteFile(void)
 			m_pFile->close();
 			delete this;
 		} else {
-			m_pWindow->ownMessage(line.toAscii());
+			m_pWindow->ownMessage(line.toLatin1());
 		}
 	} else { //File finished
 		m_pFile->close();
@@ -134,6 +134,3 @@ void SlowPasteController::pasteClipboard(void)
 	}
 }
 
-#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
-#include "SlowPasteController.moc"
-#endif //!COMPILE_USE_STANDALONE_MOC_SOURCES
diff --git a/src/modules/term/TermWidget.cpp b/src/modules/term/TermWidget.cpp
index 31c740901..46589f6ad 100644
--- a/src/modules/term/TermWidget.cpp
+++ b/src/modules/term/TermWidget.cpp
@@ -171,8 +171,5 @@
 		return QSize(wdth + 2,hght + 2);
 	}
 
-#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
-#include "TermWidget.moc"
-#endif //!COMPILE_USE_STANDALONE_MOC_SOURCES
 
 #endif //COMPILE_KDE_SUPPORT
diff --git a/src/modules/term/TermWindow.cpp b/src/modules/term/TermWindow.cpp
index e72a8195b..70fcf8a30 100644
--- a/src/modules/term/TermWindow.cpp
+++ b/src/modules/term/TermWindow.cpp
@@ -73,8 +73,5 @@
 	}
 
 
-#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
-#include "TermWindow.moc"
-#endif //!COMPILE_USE_STANDALONE_MOC_SOURCES
 
 #endif
diff --git a/src/modules/theme/ThemeManagementDialog.cpp b/src/modules/theme/ThemeManagementDialog.cpp
index 9710750e5..9f7160cda 100644
--- a/src/modules/theme/ThemeManagementDialog.cpp
+++ b/src/modules/theme/ThemeManagementDialog.cpp
@@ -66,7 +66,6 @@
 #include <QBuffer>
 #include <QCloseEvent>
 #include <QSplitter>
-#include <QTextDocument>
 #include <QAbstractTextDocumentLayout>
 #include <QShortcut>
 #include <QMenu>
diff --git a/src/modules/theme/ThemeManagementDialog.h b/src/modules/theme/ThemeManagementDialog.h
index b0ec67b00..9fbdb1ff7 100644
--- a/src/modules/theme/ThemeManagementDialog.h
+++ b/src/modules/theme/ThemeManagementDialog.h
@@ -33,7 +33,6 @@
 #include <QWidget>
 #include <QComboBox>
 #include <QCursor>
-#include <QTextDocument>
 #include <QListWidget>
 #include <QItemDelegate>
 #include <QToolButton>
diff --git a/src/modules/theme/WebThemeInterfaceDialog.cpp b/src/modules/theme/WebThemeInterfaceDialog.cpp
index 5d412d062..b42219f0e 100644
--- a/src/modules/theme/WebThemeInterfaceDialog.cpp
+++ b/src/modules/theme/WebThemeInterfaceDialog.cpp
@@ -70,9 +70,7 @@ bool WebThemeInterfaceDialog::packageIsInstalled(const QString &szId,const QStri
 			KviFileUtils::fileExists(m_szLocalThemesPath+szId+"-"+szVersion);
 }
 
-#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
-	#include "WebThemeInterfaceDialog.moc"
-#endif //!COMPILE_USE_STANDALONE_MOC_SOURCES
+
 
 #endif //COMPILE_WEBKIT_SUPPORT
 
diff --git a/src/modules/tip/libkvitip.cpp b/src/modules/tip/libkvitip.cpp
index 3b57c2d2f..ba7d06adf 100644
--- a/src/modules/tip/libkvitip.cpp
+++ b/src/modules/tip/libkvitip.cpp
@@ -288,6 +288,3 @@ KVIRC_MODULE(
 	0
 )
 
-#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
-#include "libkvitip.moc"
-#endif //!COMPILE_USE_STANDALONE_MOC_SOURCES
diff --git a/src/modules/toolbareditor/CustomizeToolBarsDialog.cpp b/src/modules/toolbareditor/CustomizeToolBarsDialog.cpp
index 7761df686..561a36987 100644
--- a/src/modules/toolbareditor/CustomizeToolBarsDialog.cpp
+++ b/src/modules/toolbareditor/CustomizeToolBarsDialog.cpp
@@ -53,6 +53,7 @@
 #include <QSplitter>
 #include <QDropEvent>
 #include <QDesktopWidget>
+#include <QMimeData>
 
 CustomizeToolBarsDialog * CustomizeToolBarsDialog::m_pInstance = 0;
 extern QRect g_rectToolBarEditorDialogGeometry;
diff --git a/src/modules/torrent/KTorrentDbusInterface.cpp b/src/modules/torrent/KTorrentDbusInterface.cpp
index 71a20e822..d28b1f95b 100644
--- a/src/modules/torrent/KTorrentDbusInterface.cpp
+++ b/src/modules/torrent/KTorrentDbusInterface.cpp
@@ -498,8 +498,5 @@
 		return true;
 	}
 
-#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
-#include "KTorrentDbusInterface.moc"
-#endif //!COMPILE_USE_STANDALONE_MOC_SOURCES
 
 #endif //	COMPILE_KDE_SUPPORT
diff --git a/src/modules/torrent/StatusBarApplet.cpp b/src/modules/torrent/StatusBarApplet.cpp
index a1cefe733..5cc64335d 100644
--- a/src/modules/torrent/StatusBarApplet.cpp
+++ b/src/modules/torrent/StatusBarApplet.cpp
@@ -93,6 +93,4 @@ void StatusBarApplet::update()
 	}
 }
 
-#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
-#include "StatusBarApplet.moc"
-#endif //COMPILE_USE_STANDALONE_MOC_SOURCES
+
diff --git a/src/modules/trayicon/libkvitrayicon.cpp b/src/modules/trayicon/libkvitrayicon.cpp
index 85bde1e7c..0a3378e22 100644
--- a/src/modules/trayicon/libkvitrayicon.cpp
+++ b/src/modules/trayicon/libkvitrayicon.cpp
@@ -754,7 +754,4 @@ KVIRC_MODULE(
 	0
 )
 
-#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
-#include "libkvitrayicon.moc"
-#endif //!COMPILE_USE_STANDALONE_MOC_SOURCES
 
diff --git a/src/modules/upnp/Service.cpp b/src/modules/upnp/Service.cpp
index b29255e16..3a889465b 100644
--- a/src/modules/upnp/Service.cpp
+++ b/src/modules/upnp/Service.cpp
@@ -34,8 +34,12 @@
 #include "Service.h"
 #include "XmlFunctions.h"
 
+#warning upnp/Service uses QHttp, it must be either ported or dropped
+
 #include <QDebug>
+#if (QT_VERSION < 0x050000)
 #include <QHttp>
+#endif
 #include <QByteArray>
 
 // This implementation was created with the help of the following documentation:
@@ -57,9 +61,10 @@ Service::Service(const QString &hostname, int port, const QString &informationUr
 , m_iPort(port)
 {
 	m_szInformationUrl = informationUrl;
+#if (QT_VERSION < 0x050000)
 	m_pHttp = new QHttp(hostname, port);
 	connect(m_pHttp, SIGNAL( requestFinished(int,bool) ), this, SLOT( slotRequestFinished(int,bool) ) );
-
+#endif
 	qDebug() << "UPnP::Service: Created information service url='" << m_szInformationUrl << "'." << endl;
 }
 
@@ -75,9 +80,10 @@ Service::Service(const ServiceParameters &params)
 , m_szHostname(params.hostname)
 , m_iPort(params.port)
 {
+#if (QT_VERSION < 0x050000)
 	m_pHttp = new QHttp(params.hostname, params.port);
 	connect(m_pHttp, SIGNAL( requestFinished(int,bool) ), this, SLOT( slotRequestFinished(int,bool) ) );
-
+#endif
 	qDebug() << "CREATED UPnP::Service: url='" << m_szControlUrl << "' id='" << m_szServiceId << "'." << endl;
 }
 
@@ -87,8 +93,9 @@ Service::Service(const ServiceParameters &params)
 Service::~Service()
 {
 	qDebug() << "DESTROYED UPnP::Service [url=" << m_szControlUrl << ",  id=" << m_szServiceId << "]" << endl;
-
+#if (QT_VERSION < 0x050000)
 	delete m_pHttp;
+#endif
 }
 
 
@@ -114,6 +121,7 @@ int Service::callAction(const QString &actionName, const QMap<QString,QString> &
 int Service::callActionInternal(const QString &actionName, const QMap<QString,QString> *arguments, const QString &prefix)
 {
 	qDebug() << "UPnP::Service: calling remote procedure '" << actionName << "'." << endl;
+#if (QT_VERSION < 0x050000)
 
 	// Create the data message
 	//NOTE: we shouldm use serviceId_ instead of serviceType_, but it seems that my router
@@ -166,7 +174,9 @@ int Service::callActionInternal(const QString &actionName, const QMap<QString,QS
 	m_iPendingRequests++;
 
 	qDebug() << "Sending request:\n" << header.toString() << "\n---" << content << endl;
+
 	return m_pHttp->request(header, content);
+#endif
 }
 
 
@@ -181,7 +191,9 @@ int Service::callInformationUrl()
 	// Send the GET request
 	// TODO: User-Agent: Mozilla/4.0 (compatible; UPnP/1.0; Windows NT/5.1)
 	m_iPendingRequests++;
+#if (QT_VERSION < 0x050000)
 	return m_pHttp->get(m_szInformationUrl);
+#endif
 }
 
 
@@ -224,6 +236,7 @@ void Service::gotInformationResponse(const QDomNode &response)
 // The QHttp object retrieved data.
 void Service::slotRequestFinished(int id, bool error)
 {
+#if (QT_VERSION < 0x050000)
 	qDebug() << "UPnP::Service: Got HTTP response for request #"<< id << ", state: " << m_pHttp->state() << ", " << m_pHttp->bytesAvailable() << " bytes." << endl;
 
 	if(! error)
@@ -324,7 +337,7 @@ void Service::slotRequestFinished(int id, bool error)
 		m_iPendingRequests--;
 		emit queryFinished(error);
 	}
-
+#endif
 }
 
 
diff --git a/src/modules/upnp/Service.h b/src/modules/upnp/Service.h
index b06758b90..6128db9a7 100644
--- a/src/modules/upnp/Service.h
+++ b/src/modules/upnp/Service.h
@@ -39,8 +39,9 @@
 #include <QMap>
 #include <QString>
 
+#if (QT_VERSION < 0x050000)
 class QHttp;
-
+#endif
 namespace UPnP
 {
 
@@ -110,8 +111,10 @@ private:
 private:
 	// The URL to control the service
 	QString              m_szControlUrl;
+#if (QT_VERSION < 0x050000)
 	// The HTTP requester
 	QHttp               *m_pHttp;
+#endif
 	// The URL to request service information
 	QString              m_szInformationUrl;
 	// The number of pending queries/actions
diff --git a/src/modules/url/libkviurl.cpp b/src/modules/url/libkviurl.cpp
index c0c444c7e..f80729a1f 100644
--- a/src/modules/url/libkviurl.cpp
+++ b/src/modules/url/libkviurl.cpp
@@ -939,6 +939,3 @@ KVIRC_MODULE(
 	0
 )
 
-#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
-#include "libkviurl.moc"
-#endif //!COMPILE_USE_STANDALONE_MOC_SOURCES