From 4602a1a7ac1f4b2fd33bb1581f4eedd1edd65a9c Mon Sep 17 00:00:00 2001
From: Fabio Bas
Date: Tue, 25 Sep 2012 13:15:57 +0000
Subject: 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
---
 src/modules/objects/KvsObject_button.cpp        |  5 -----
 src/modules/objects/KvsObject_checkBox.cpp      |  3 ---
 src/modules/objects/KvsObject_colorDialog.cpp   |  3 ---
 src/modules/objects/KvsObject_comboBox.cpp      |  3 ---
 src/modules/objects/KvsObject_dateTimeEdit.cpp  |  4 +---
 src/modules/objects/KvsObject_dockWindow.cpp    |  3 ---
 src/modules/objects/KvsObject_file.cpp          |  4 ++--
 src/modules/objects/KvsObject_ftp.cpp           | 12 +++++++-----
 src/modules/objects/KvsObject_ftp.h             |  5 +++++
 src/modules/objects/KvsObject_http.cpp          |  8 +++++---
 src/modules/objects/KvsObject_http.h            |  7 +++++++
 src/modules/objects/KvsObject_layout.cpp        |  3 ---
 src/modules/objects/KvsObject_lcd.cpp           |  4 ++++
 src/modules/objects/KvsObject_lineEdit.cpp      |  3 ---
 src/modules/objects/KvsObject_listWidget.cpp    |  3 ---
 src/modules/objects/KvsObject_memoryBuffer.cpp  |  3 ---
 src/modules/objects/KvsObject_multiLineEdit.cpp |  4 ----
 src/modules/objects/KvsObject_painter.cpp       | 23 +++++++++++++++++++----
 src/modules/objects/KvsObject_painter.h         | 14 ++++++++++----
 src/modules/objects/KvsObject_pixmap.cpp        |  3 ---
 src/modules/objects/KvsObject_popupMenu.cpp     |  3 ---
 src/modules/objects/KvsObject_process.cpp       |  3 ---
 src/modules/objects/KvsObject_radioButton.cpp   |  3 ---
 src/modules/objects/KvsObject_slider.cpp        |  3 ---
 src/modules/objects/KvsObject_socket.cpp        |  3 ---
 src/modules/objects/KvsObject_spinBox.cpp       |  3 ---
 src/modules/objects/KvsObject_sql.cpp           |  7 +++++--
 src/modules/objects/KvsObject_sql.h             |  6 +++++-
 src/modules/objects/KvsObject_tabWidget.cpp     |  3 ---
 src/modules/objects/KvsObject_tableWidget.cpp   |  5 +----
 src/modules/objects/KvsObject_tableWidget.h     |  2 --
 src/modules/objects/KvsObject_textBrowser.cpp   |  3 ---
 src/modules/objects/KvsObject_toolButton.cpp    |  4 +---
 src/modules/objects/KvsObject_trayIcon.cpp      |  3 ---
 src/modules/objects/KvsObject_treeWidget.cpp    |  4 +---
 src/modules/objects/KvsObject_widget.cpp        |  5 +----
 src/modules/objects/KvsObject_window.cpp        |  3 ---
 src/modules/objects/KvsObject_wizard.cpp        |  3 ---
 src/modules/objects/KvsObject_workspace.cpp     |  2 ++
 src/modules/objects/libkviobjects.cpp           |  4 ++++
 40 files changed, 80 insertions(+), 109 deletions(-)

(limited to 'src/modules/objects')

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();
-- 
cgit v1.3.1-10-gc9f91