undoing, sorry

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

29 files changed, 69 insertions, 129 deletions

diff --git a/src/modules/objects/class_button.cpp b/src/modules/objects/class_button.cpp
index bbb95cdcb..fd8a4b3b5 100644
--- a/src/modules/objects/class_button.cpp
+++ b/src/modules/objects/class_button.cpp
@@ -174,3 +174,5 @@ void KviKvsObject_button::slotClicked()
 	callFunction(this,"clickEvent",params);
 }
 
+
+#include "m_class_button.moc"
diff --git a/src/modules/objects/class_checkbox.cpp b/src/modules/objects/class_checkbox.cpp
index 6545d8a1b..1e9260509 100644
--- a/src/modules/objects/class_checkbox.cpp
+++ b/src/modules/objects/class_checkbox.cpp
@@ -124,3 +124,5 @@ void KviKvsObject_checkbox::toggled(bool b)
 	callFunction(this,"toggleEvent",&params);
 }
 
+
+#include "m_class_checkbox.moc"
diff --git a/src/modules/objects/class_combobox.cpp b/src/modules/objects/class_combobox.cpp
index 146a92bed..f8c3d3d6b 100644
--- a/src/modules/objects/class_combobox.cpp
+++ b/src/modules/objects/class_combobox.cpp
@@ -362,3 +362,5 @@ void KviKvsObject_combobox::slotActivated(int i)
 	callFunction(this,"activatedEvent",&params);
 }
 
+
+#include "m_class_combobox.moc"
diff --git a/src/modules/objects/class_dockwindow.cpp b/src/modules/objects/class_dockwindow.cpp
index fc2276e91..a6067a505 100644
--- a/src/modules/objects/class_dockwindow.cpp
+++ b/src/modules/objects/class_dockwindow.cpp
@@ -227,3 +227,5 @@ bool KviKvsObject_dockwindow::function_dock(KviKvsObjectFunctionCall * c)
 	else c->warning(__tr2qs("Invalid dock area specified"));
 	return true;
 }
+
+#include "m_class_dockwindow.moc"
diff --git a/src/modules/objects/class_file.cpp b/src/modules/objects/class_file.cpp
index 010a51be9..55bbd4f29 100644
--- a/src/modules/objects/class_file.cpp
+++ b/src/modules/objects/class_file.cpp
@@ -485,3 +485,4 @@ bool KviScriptFileObject::functionHexRead(KviCommand * c, KviParameterList * p,
 }
 
 */
+#include "m_class_file.moc"
diff --git a/src/modules/objects/class_lineedit.cpp b/src/modules/objects/class_lineedit.cpp
index 37144e2bf..a5e94ebc7 100644
--- a/src/modules/objects/class_lineedit.cpp
+++ b/src/modules/objects/class_lineedit.cpp
@@ -457,3 +457,5 @@ void KviKvsObject_lineedit::slottextChanged(const QString &text)
 	callFunction(this,"textChangedEvent",&params);
 }
 
+
+#include "m_class_lineedit.moc"
diff --git a/src/modules/objects/class_listbox.cpp b/src/modules/objects/class_listbox.cpp
index 8a56e2c75..bf7292773 100644
--- a/src/modules/objects/class_listbox.cpp
+++ b/src/modules/objects/class_listbox.cpp
@@ -386,3 +386,5 @@ kvs_uint_t uIndex;
 		return true;
 }
 
+
+#include "m_class_listbox.moc"
diff --git a/src/modules/objects/class_listview.cpp b/src/modules/objects/class_listview.cpp
index 9f384cd5d..4a6d03924 100644
--- a/src/modules/objects/class_listview.cpp
+++ b/src/modules/objects/class_listview.cpp
@@ -554,3 +554,4 @@ void KviKvsMdmListView::contentsDropEvent(QDropEvent *e)
 	}
 
 }
+#include "m_class_listview.moc"
diff --git a/src/modules/objects/class_listviewitem.cpp b/src/modules/objects/class_listviewitem.cpp
index 5136fda10..7d193b98f 100644
--- a/src/modules/objects/class_listviewitem.cpp
+++ b/src/modules/objects/class_listviewitem.cpp
@@ -417,3 +417,5 @@ bool KviKvsObject_listviewitem::function_setPixmap(KviKvsObjectFunctionCall *c)
 	m_pListViewItem->setPixmap(uCol,*pix);
 	return true;
 }
+
+#include "m_class_listviewitem.moc"
diff --git a/src/modules/objects/class_multilineedit.cpp b/src/modules/objects/class_multilineedit.cpp
index e3f8d0947..8be51a018 100644
--- a/src/modules/objects/class_multilineedit.cpp
+++ b/src/modules/objects/class_multilineedit.cpp
@@ -1213,3 +1213,5 @@ bool KviKvsObject_mledit::functionselectAll(KviKvsObjectFunctionCall *c)
 }
 
 
+
+#include "m_class_multilineedit.moc"
diff --git a/src/modules/objects/class_painter.cpp b/src/modules/objects/class_painter.cpp
index fd2c0ab3e..5c45910d2 100644
--- a/src/modules/objects/class_painter.cpp
+++ b/src/modules/objects/class_painter.cpp
@@ -956,20 +956,20 @@ bool KviKvsObject_painter::functionresetMatrix(KviKvsObjectFunctionCall *c)
 }
 
 #ifdef COMPILE_USE_QT4
-bool KviKvsObject_painter::functionsetOpacity(KviKvsObjectFunctionCall *c)
-{
-	if(!m_pPainter)return true; 
-	kvs_real_t dOpacity;
-		
-	KVSO_PARAMETERS_BEGIN(c)
-			KVSO_PARAMETER("opacity_factor",KVS_PT_DOUBLE,0,dOpacity)	
-	KVSO_PARAMETERS_END(c)
-	m_pPainter->setOpacity(dOpacity);
-	return true;
-}
+bool KviKvsObject_painter::functionsetOpacity(KviKvsObjectFunctionCall *c)

+{

+	if(!m_pPainter)return true; 

+	kvs_real_t dOpacity;

+		

+	KVSO_PARAMETERS_BEGIN(c)

+			KVSO_PARAMETER("opacity_factor",KVS_PT_DOUBLE,0,dOpacity)	

+	KVSO_PARAMETERS_END(c)

+	m_pPainter->setOpacity(dOpacity);

+	return true;

+}

 bool KviKvsObject_painter::functionsetTextAntialiasing(KviKvsObjectFunctionCall *c)
 {
-	if(!m_pPainter)return true; 
+	if(!m_pPainter)return true; 

 	
 	bool bEnabled;
 	KVSO_PARAMETERS_BEGIN(c)
@@ -977,10 +977,10 @@ bool KviKvsObject_painter::functionsetTextAntialiasing(KviKvsObjectFunctionCall
 	KVSO_PARAMETERS_END(c)
 	m_pPainter->setRenderHint(QPainter::TextAntialiasing,bEnabled);
 	return true;
-}
+}

 bool KviKvsObject_painter::functionsetAntialiasing(KviKvsObjectFunctionCall *c)
 {
-	if(!m_pPainter)return true; 
+	if(!m_pPainter)return true; 

 	
 	bool bEnabled;
 	KVSO_PARAMETERS_BEGIN(c)
@@ -988,10 +988,10 @@ bool KviKvsObject_painter::functionsetAntialiasing(KviKvsObjectFunctionCall *c)
 	KVSO_PARAMETERS_END(c)
 	m_pPainter->setRenderHint(QPainter::Antialiasing,bEnabled);
 	return true;
-}
+}

 bool KviKvsObject_painter::functionsetSmoothPixmapTransform(KviKvsObjectFunctionCall *c)
 {
-	if(!m_pPainter)return true; 
+	if(!m_pPainter)return true; 

 	
 	bool bEnabled;
 	KVSO_PARAMETERS_BEGIN(c)
@@ -999,7 +999,9 @@ bool KviKvsObject_painter::functionsetSmoothPixmapTransform(KviKvsObjectFunction
 	KVSO_PARAMETERS_END(c)
 	m_pPainter->setRenderHint(QPainter::SmoothPixmapTransform,bEnabled);
 	return true;
-}
-#endif
-
+}

+#endif

+

+

 
+#include "m_class_painter.moc"
diff --git a/src/modules/objects/class_pixmap.cpp b/src/modules/objects/class_pixmap.cpp
index 6028642b6..89247edb9 100644
--- a/src/modules/objects/class_pixmap.cpp
+++ b/src/modules/objects/class_pixmap.cpp
@@ -313,3 +313,5 @@ QImage * KviKvsObject_pixmap::getImage()
 	

 	return m_pImage;

 }

+

+#include "m_class_pixmap.moc"

diff --git a/src/modules/objects/class_popupmenu.cpp b/src/modules/objects/class_popupmenu.cpp
index d47a1f7bd..c32d0f891 100644
--- a/src/modules/objects/class_popupmenu.cpp
+++ b/src/modules/objects/class_popupmenu.cpp
@@ -357,3 +357,5 @@ bool KviKvsObject_popupmenu::functionactivatedEvent(KviKvsObjectFunctionCall *c)
 	return true;
 }
 
+
+#include "m_class_popupmenu.moc"
diff --git a/src/modules/objects/class_process.cpp b/src/modules/objects/class_process.cpp
index 1ff1544b0..e0951b14e 100644
--- a/src/modules/objects/class_process.cpp
+++ b/src/modules/objects/class_process.cpp
@@ -313,3 +313,5 @@ void KviKvsObject_process::slotReadStderr()
 	KviKvsVariantList *params=0;
 	callFunction(this,"readyReadStderrEvent",params);
 }
+
+#include "m_class_process.moc"
diff --git a/src/modules/objects/class_radiobutton.cpp b/src/modules/objects/class_radiobutton.cpp
index 5b2a44b3d..402d24b50 100644
--- a/src/modules/objects/class_radiobutton.cpp
+++ b/src/modules/objects/class_radiobutton.cpp
@@ -134,3 +134,5 @@ void KviKvsObject_radiobutton::toggled(bool b)
 	callFunction(this,"toggleEvent",&params);
 }
 
+
+#include "m_class_radiobutton.moc"
diff --git a/src/modules/objects/class_slider.cpp b/src/modules/objects/class_slider.cpp
index 02d2d5312..54673d610 100644
--- a/src/modules/objects/class_slider.cpp
+++ b/src/modules/objects/class_slider.cpp
@@ -283,3 +283,5 @@ void KviKvsObject_slider::valueChanged(int value)
 	callFunction(this,"valueChangedEvent",&params);
 }
 
+
+#include "m_class_slider.moc"
diff --git a/src/modules/objects/class_socket.cpp b/src/modules/objects/class_socket.cpp
index f0d71edb6..3819ca05b 100644
--- a/src/modules/objects/class_socket.cpp
+++ b/src/modules/objects/class_socket.cpp
@@ -1326,4 +1326,6 @@ KviQCString szData8 = szData.utf8();
 

 

 

-//-------------
\ No newline at end of file
+//--------------

+

+#include "m_class_socket.moc"

diff --git a/src/modules/objects/class_spinbox.cpp b/src/modules/objects/class_spinbox.cpp
index bcd6acaf9..6b0147f24 100644
--- a/src/modules/objects/class_spinbox.cpp
+++ b/src/modules/objects/class_spinbox.cpp
@@ -261,3 +261,5 @@ void KviKvsObject_spinbox::valueChanged(int value)
 	KviKvsVariantList params(new KviKvsVariant((kvs_int_t)value));
 	callFunction(this,"valueChangedEvent",&params);
 }
+
+#include "m_class_spinbox.moc"
diff --git a/src/modules/objects/class_tabwidget.cpp b/src/modules/objects/class_tabwidget.cpp
index 5d6d5ebba..998bb3f44 100644
--- a/src/modules/objects/class_tabwidget.cpp
+++ b/src/modules/objects/class_tabwidget.cpp
@@ -537,3 +537,5 @@ void KviKvsObject_tabwidget::slotCurrentChanged(int value)
 	KviKvsVariantList params(new KviKvsVariant((kvs_int_t)value));
 	callFunction(this,"currentChangedEvent",&params);
 }
+
+#include "m_class_tabwidget.moc"
diff --git a/src/modules/objects/class_tbrowser.cpp b/src/modules/objects/class_tbrowser.cpp
index d3f2aac41..bd46f0803 100644
--- a/src/modules/objects/class_tbrowser.cpp
+++ b/src/modules/objects/class_tbrowser.cpp
@@ -139,3 +139,5 @@ bool KviKvsObject_textbrowser::function_linkClickedEvent(KviKvsObjectFunctionCal
 	emitSignal("linkClicked",c,c->params());
 	return true;
 }
+
+#include "m_class_tbrowser.moc"
diff --git a/src/modules/objects/class_toolbar.cpp b/src/modules/objects/class_toolbar.cpp
index a8f1fc05b..e8e3292e6 100644
--- a/src/modules/objects/class_toolbar.cpp
+++ b/src/modules/objects/class_toolbar.cpp
@@ -149,3 +149,5 @@ bool KviKvsObject_toolbar::functionclear(KviKvsObjectFunctionCall *c)
 	return true;
 }
 
+#include "m_class_toolbar.moc"
+
diff --git a/src/modules/objects/class_toolbutton.cpp b/src/modules/objects/class_toolbutton.cpp
index a4c5ed7a5..3a531da30 100644
--- a/src/modules/objects/class_toolbutton.cpp
+++ b/src/modules/objects/class_toolbutton.cpp
@@ -337,3 +337,5 @@ void KviKvsObject_toolbutton::slotClicked()
 	callFunction(this,"clickEvent",params);
 }
 
+#include "m_class_toolbutton.moc"
+
diff --git a/src/modules/objects/class_widget.cpp b/src/modules/objects/class_widget.cpp
index 44fb2e77d..3d9cb936a 100644
--- a/src/modules/objects/class_widget.cpp
+++ b/src/modules/objects/class_widget.cpp
@@ -1742,3 +1742,4 @@ bool KviKvsObject_widget::function_setAttribute(KviKvsObjectFunctionCall *c)
 }

 #endif

 

+#include "m_class_widget.moc"

diff --git a/src/modules/objects/class_window.cpp b/src/modules/objects/class_window.cpp
index 85fb4a7c3..7bcbea852 100644
--- a/src/modules/objects/class_window.cpp
+++ b/src/modules/objects/class_window.cpp
@@ -155,3 +155,4 @@ bool KviKvsObject_window::functionsetCentralWidget(KviKvsObjectFunctionCall *c)
 	((KviKvsScriptWindowWindow *)widget())->setCentralWidget((KviKvsObject_widget *)ob,((KviKvsObject_widget *)ob)->widget());
 	return true;
 }
+#include "m_class_window.moc"
diff --git a/src/modules/objects/class_wizard.cpp b/src/modules/objects/class_wizard.cpp
index c7d8770e8..83117af97 100644
--- a/src/modules/objects/class_wizard.cpp
+++ b/src/modules/objects/class_wizard.cpp
@@ -387,3 +387,4 @@ void KviKvsMdmWizard::slotBackClicked()
 KviKvsMdmWizard::~KviKvsMdmWizard()
 {
 }
+#include "m_class_wizard.moc"
diff --git a/src/modules/objects/class_wrapper.cpp b/src/modules/objects/class_wrapper.cpp
index 9eb1f6a9b..464f10f85 100644
--- a/src/modules/objects/class_wrapper.cpp
+++ b/src/modules/objects/class_wrapper.cpp
@@ -265,3 +265,5 @@ QWidget *KviKvsObject_wrapper::findWidgetToWrap(const char *szClass, const char
 	return 0;
 #endif
 }
+
+#include "m_class_wrapper.moc"
diff --git a/src/modules/objects/class_xmlreader.cpp b/src/modules/objects/class_xmlreader.cpp
index 3690c64e9..e4ac20acf 100644
--- a/src/modules/objects/class_xmlreader.cpp
+++ b/src/modules/objects/class_xmlreader.cpp
@@ -330,3 +330,5 @@ bool KviKvsObject_xmlreader::function_lastError(KviKvsObjectFunctionCall *c)
 	c->returnValue()->setString(m_szLastError);
 	return true;
 }
+
+#include "m_class_xmlreader.moc"
diff --git a/src/modules/objects/objects.pro b/src/modules/objects/objects.pro
deleted file mode 100644
index eac04a872..000000000
--- a/src/modules/objects/objects.pro
+++ /dev/null
@@ -1,101 +0,0 @@
-QT += xml

-

-LIBS += -lws2_32

-

-PRECOMPILED_HEADER  = pch.h

-

-precompile_header:!isEmpty(PRECOMPILED_HEADER) {

-     DEFINES += USING_PCH

-     }

-

-TARGET = kviobjects

- 

-HEADERS += class_button.h \

-            class_buttongroup.h \

-		class_checkbox.h \

-		class_combobox.h \

-		class_dialog.h \

-		class_dockwindow.h \

-		class_file.h \

-		class_groupbox.h \

-		class_label.h \

-		class_layout.h \

-		class_lcd.h \

-		class_lineedit.h \

-		class_list.h \

-		class_listbox.h \

-		class_listview.h \

-		class_listviewitem.h \

-		class_mainwindow.h \

-		class_menubar.h \

-		class_multilineedit.h \

-		class_painter.h \

-		class_pixmap.h \

-		class_popupmenu.h \

-		class_process.h \

-		class_progressbar.h \

-		class_radiobutton.h \

-		class_slider.h \

-		class_socket.h \

-		class_spinbox.h \

-		class_tabwidget.h \

-		class_tbrowser.h \

-		class_toolbar.h \

-		class_toolbutton.h \

-		class_urllabel.h \

-		class_widget.h \

-		class_window.h \

-		class_wizard.h \

-		class_workspace.h \

-		class_wrapper.h \

-		class_xmlreader.h \

-       	class_vbox.h \

-         	class_hbox.h \

-		object_macros.h

-

- 						

-SOURCES += libkviobjects.cpp \

-			    class_button.cpp \

-                      class_buttongroup.cpp \

-			    class_checkbox.cpp \

-			    class_combobox.cpp \

-			    class_dialog.cpp \

-			    class_dockwindow.cpp \

-			    class_file.cpp \

-			    class_groupbox.cpp \

-			   class_label.cpp \

-			    class_layout.cpp \

-			    class_lcd.cpp \

-			    class_lineedit.cpp \

-			    class_list.cpp \

-			    class_listbox.cpp \

-			    class_listview.cpp \

-			    class_listviewitem.cpp \

-			    class_mainwindow.cpp \

-			    class_menubar.cpp \

-			    class_multilineedit.cpp \

-			    class_popupmenu.cpp \

-			    class_process.cpp \

-			    class_progressbar.cpp \

-			    class_radiobutton.cpp \

-			    class_slider.cpp \

-			    class_socket.cpp \

-			    class_spinbox.cpp \

-			    class_tabwidget.cpp \

-			    class_toolbar.cpp \

-			    class_toolbutton.cpp \

-			    class_painter.cpp \

-			    class_pixmap.cpp \

-			    class_tbrowser.cpp \

-			    class_widget.cpp \

-			    class_window.cpp \

-			    class_wizard.cpp \

-			    class_workspace.cpp \

-			    class_wrapper.cpp \

-			    class_urllabel.cpp \

-			    class_xmlreader.cpp \

-			    class_vbox.cpp \

-                      class_hbox.cpp

-

- 						

-include(../module.pri)
\ No newline at end of file
diff --git a/src/modules/objects/pch.h b/src/modules/objects/pch.h
deleted file mode 100644
index 7f94318ca..000000000
--- a/src/modules/objects/pch.h
+++ /dev/null
@@ -1,8 +0,0 @@
-#if defined __cplusplus

-	#include <qvariant.h>  // All moc genereated code has this include

-	#include <qstring.h>

-	#include "kvi_settings.h"

-	#include "kvi_app.h"

-	#include "object_macros.h"

-	#include "kvi_locale.h"

-#endif