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

11 files changed, 5 insertions, 44 deletions

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