Ported kvs class layout and code cleaning

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

16 files changed, 31 insertions, 44 deletions

diff --git a/src/modules/objects/class_button.cpp b/src/modules/objects/class_button.cpp
index 8dfa15bc1..5db91762e 100644
--- a/src/modules/objects/class_button.cpp
+++ b/src/modules/objects/class_button.cpp
@@ -21,14 +21,12 @@
 //
 
 #include "kvi_debug.h"
-
-
 #include "kvi_error.h"
-#include <qiconset.h>
 #include "kvi_iconmanager.h"
-
 #include "class_button.h"
 
+#include <QIconSet>
+
 KVSO_BEGIN_REGISTERCLASS(KviKvsObject_button,"button","widget")
 
 	KVSO_REGISTER_HANDLER(KviKvsObject_button,"setText", functionSetText)
diff --git a/src/modules/objects/class_buttongroup.cpp b/src/modules/objects/class_buttongroup.cpp
index 9c0eb3423..3ec6fedb0 100644
--- a/src/modules/objects/class_buttongroup.cpp
+++ b/src/modules/objects/class_buttongroup.cpp
@@ -21,15 +21,15 @@
 //   Inc. ,59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 //
 
-#include <qbuttongroup.h>
+
 #include "class_buttongroup.h"
-#include <qradiobutton.h>
 #include "kvi_error.h"
 #include "kvi_debug.h"
-
 #include "kvi_locale.h"
 #include "kvi_iconmanager.h"
 
+#include <QButtonGroup>
+#include <QRadioButton>
 
 /*
 	@doc:	buttongroup
diff --git a/src/modules/objects/class_checkbox.cpp b/src/modules/objects/class_checkbox.cpp
index 73e71b01a..c9dc9dc0e 100644
--- a/src/modules/objects/class_checkbox.cpp
+++ b/src/modules/objects/class_checkbox.cpp
@@ -23,10 +23,8 @@
 
 #include "kvi_error.h"
 #include "kvi_debug.h"
-
 #include "kvi_locale.h"
 #include "kvi_styled_controls.h"
-
 #include "class_checkbox.h"
 
 /*
diff --git a/src/modules/objects/class_combobox.cpp b/src/modules/objects/class_combobox.cpp
index 172d3b9b9..314666305 100644
--- a/src/modules/objects/class_combobox.cpp
+++ b/src/modules/objects/class_combobox.cpp
@@ -24,12 +24,11 @@
 #include "kvi_error.h"
 #include "kvi_locale.h"
 #include "kvi_debug.h"
-
-
 #include "class_list.h"
 #include "class_combobox.h"
-#include <qlineedit.h>
-#include <qstring.h>
+
+#include <QLineEdit>
+#include <QString>
 
 /*
 	@doc:	combobox
diff --git a/src/modules/objects/class_dialog.cpp b/src/modules/objects/class_dialog.cpp
index 77ec4609c..88b4c0877 100644
--- a/src/modules/objects/class_dialog.cpp
+++ b/src/modules/objects/class_dialog.cpp
@@ -21,15 +21,13 @@
 //
 
 #include "class_dialog.h"
-
 #include "kvi_error.h"
 #include "kvi_debug.h"
-
 #include "kvi_locale.h"
 #include "kvi_frame.h"
 #include "kvi_app.h"
 
-#include <qdialog.h>
+#include <QDialog>
 
 
 /*
diff --git a/src/modules/objects/class_file.cpp b/src/modules/objects/class_file.cpp
index 5ce5e750c..904f78da7 100644
--- a/src/modules/objects/class_file.cpp
+++ b/src/modules/objects/class_file.cpp
@@ -24,11 +24,11 @@
 
 #include "class_file.h"
 #include "kvi_debug.h"
-
 #include "kvi_locale.h"
 #include "kvi_error.h"
 #include "kvi_fileutils.h"
-#include  <qstringlist.h>
+
+#include  <QStringlist>
 
 
 // needed for $open()
diff --git a/src/modules/objects/class_hbox.cpp b/src/modules/objects/class_hbox.cpp
index f9d509440..60c0c0fbf 100644
--- a/src/modules/objects/class_hbox.cpp
+++ b/src/modules/objects/class_hbox.cpp
@@ -21,9 +21,7 @@
 //
 #define _KVI_DEBUG_CHECK_RANGE_
 #include "kvi_debug.h"
-
 #include "kvi_locale.h"
-
 #include "class_hbox.h"
 
 /*
diff --git a/src/modules/objects/class_label.cpp b/src/modules/objects/class_label.cpp
index 4c5b9480b..af3276918 100644
--- a/src/modules/objects/class_label.cpp
+++ b/src/modules/objects/class_label.cpp
@@ -21,17 +21,17 @@
 //   Inc. ,59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 //
 
-#include <qfont.h>
-#include <qpixmap.h>
-#include <qmessagebox.h>
-#include "class_label.h"
-//#include "kvi_fileutils.h"
+
 #include "kvi_error.h"
 #include "kvi_debug.h"
-
+#include "class_label.h"
 #include "kvi_locale.h"
 #include "kvi_iconmanager.h"
 
+#include <QFont>
+#include <QPixmap>
+#include <QMessageBox.h>
+
 
 
 // Tables used in $setAlignment & $alignment
@@ -225,7 +225,9 @@ KVSO_END_CONSTRUCTOR(KviKvsObject_label)
 
 bool KviKvsObject_label::init(KviKvsRunTimeContext * pContext,KviKvsVariantList *pParams)
 {
-	setObject(new QLabel(parentScriptWidget(), name()), true);
+	QLabel *label=new QLabel(parentScriptWidget());
+	label->setObjectName(name());
+	setObject(label,true);
 	return true;
 }
 
diff --git a/src/modules/objects/class_layout.cpp b/src/modules/objects/class_layout.cpp
index a214a3e55..c8f641b6e 100644
--- a/src/modules/objects/class_layout.cpp
+++ b/src/modules/objects/class_layout.cpp
@@ -175,7 +175,7 @@ bool KviKvsObject_layout::functionAddMultiCellWidget(KviKvsObjectFunctionCall *c
 		c->warning(__tr2qs("Can't add a non-widget object"));
 		return true;
 	}
-	((QGridLayout *)object())->addMultiCellWidget(((QWidget *)(pObject->object())),uStartRow,uEndRow,uStartCol,uEndCol);
+	((QGridLayout *)object())->addWidget(((QWidget *)(pObject->object())),uStartRow,uStartCol,uEndRow,uEndCol);
 	return true;
 }
 bool KviKvsObject_layout::functionSetRowStretch(KviKvsObjectFunctionCall *c)
@@ -197,7 +197,7 @@ bool KviKvsObject_layout::functionSetColStretch(KviKvsObjectFunctionCall *c)
 		KVSO_PARAMETER("stretch",KVS_PT_UNSIGNEDINTEGER,0,uStretch)
 	KVSO_PARAMETERS_END(c)
 	if(!widget())return true;
-	((QGridLayout *)object())->setColStretch(uCol,uStretch);
+	((QGridLayout *)object())->setColumnStretch(uCol,uStretch);
 	return true;
 }
 
@@ -229,7 +229,8 @@ bool KviKvsObject_layout::functionAddRowSpacing(KviKvsObjectFunctionCall *c)
 		KVSO_PARAMETER("row",KVS_PT_UNSIGNEDINTEGER,0,uRow)
 		KVSO_PARAMETER("spacing",KVS_PT_UNSIGNEDINTEGER,0,uSpacing)
 	KVSO_PARAMETERS_END(c)
-    if (widget()) ((QGridLayout *)object())->addRowSpacing(uRow,uSpacing);
+    if (widget()) //((QGridLayout *)object())->addRowSpacing(uRow,uSpacing);
+	     ((QGridLayout *)object())->addItem(new QSpacerItem(0, uSpacing), uRow, 0);
 	return true;
 }
 
@@ -256,7 +257,7 @@ bool KviKvsObject_layout::functionSetResizeMode(KviKvsObjectFunctionCall *c)
 	else if(KviQString::equalCI(szMode,"Minimum")) r = QLAYOUT_MINIMUM;
 	else if(KviQString::equalCI(szMode,"Fixed"))r = QLAYOUT_FIXED;
 	else c->warning(__tr2qs("Invalid resize mode defaulting to Auto"));
-	((QGridLayout *)object())->setResizeMode(r);
+	((QGridLayout *)object())->setSizeConstraint(r);
 	return true;
 
 }
diff --git a/src/modules/objects/class_list.cpp b/src/modules/objects/class_list.cpp
index 6f4357c79..d9a3fd77f 100644
--- a/src/modules/objects/class_list.cpp
+++ b/src/modules/objects/class_list.cpp
@@ -23,12 +23,9 @@
 //============================================================================
 
 #include "kvi_debug.h"
-
 #include "kvi_malloc.h"
 #include "kvi_locale.h"
-
 #include "class_list.h"
-
 #include <stdlib.h>
 
 
diff --git a/src/modules/objects/class_listbox.cpp b/src/modules/objects/class_listbox.cpp
index bfcba51ca..cb44cb5aa 100644
--- a/src/modules/objects/class_listbox.cpp
+++ b/src/modules/objects/class_listbox.cpp
@@ -24,10 +24,7 @@
 #include "kvi_error.h"
 #include "kvi_locale.h"
 #include "kvi_debug.h"
-
-
 #include "kvi_tal_listbox.h"
-
 #include "class_list.h"
 #include "class_listbox.h"
 
diff --git a/src/modules/objects/class_listviewitem.cpp b/src/modules/objects/class_listviewitem.cpp
index bfac0ef61..3dc5af9a8 100644
--- a/src/modules/objects/class_listviewitem.cpp
+++ b/src/modules/objects/class_listviewitem.cpp
@@ -24,7 +24,6 @@
 #include "class_pixmap.h"
 #include "kvi_error.h"
 #include "kvi_debug.h"
-
 #include "kvi_locale.h"
 #include "kvi_iconmanager.h"
 
diff --git a/src/modules/objects/class_mainwindow.cpp b/src/modules/objects/class_mainwindow.cpp
index 4b672cfb3..073558ef8 100644
--- a/src/modules/objects/class_mainwindow.cpp
+++ b/src/modules/objects/class_mainwindow.cpp
@@ -25,7 +25,6 @@
 #include "class_mainwindow.h"
 #include "kvi_error.h"
 #include "kvi_debug.h"
-
 #include "kvi_locale.h"
 #include "kvi_iconmanager.h"
 
diff --git a/src/modules/objects/class_menubar.cpp b/src/modules/objects/class_menubar.cpp
index 6994edc53..37797a3eb 100644
--- a/src/modules/objects/class_menubar.cpp
+++ b/src/modules/objects/class_menubar.cpp
@@ -25,7 +25,6 @@
 #include "class_menubar.h"
 #include "kvi_error.h"
 #include "kvi_debug.h"
-
 #include "kvi_locale.h"
 
 /*
diff --git a/src/modules/objects/class_multilineedit.cpp b/src/modules/objects/class_multilineedit.cpp
index 2e45ef780..4627b2564 100644
--- a/src/modules/objects/class_multilineedit.cpp
+++ b/src/modules/objects/class_multilineedit.cpp
@@ -28,10 +28,11 @@
 #include "kvi_debug.h"
 #include "kvi_locale.h"
 #include "kvi_malloc.h"
-#include <qfile.h>
-#include <q3multilineedit.h>
+
+#include <QFile>
+#include <Q3multiLineedit>
 #include <QTextStream>
-#include <q3stylesheet.h>
+#include <Q3styleSheet>
 #define KviTalMultiLineEdit Q3MultiLineEdit
 #define QTEXTEDIT_AUTO_ALL Q3TextEdit::AutoAll
 #define QTEXTEDIT_AUTO_NONE Q3TextEdit::AutoNone
diff --git a/src/modules/objects/class_widget.cpp b/src/modules/objects/class_widget.cpp
index e08fe3a9a..5da256437 100644
--- a/src/modules/objects/class_widget.cpp
+++ b/src/modules/objects/class_widget.cpp
@@ -965,7 +965,8 @@ bool KviKvsObject_widget::eventFilter(QObject *o,QEvent *e)
 bool KviKvsObject_widget::function_show(KviKvsObjectFunctionCall *c)

 {

 	if(!widget())return true; // should we warn here ?

-	widget()->show();

+	QWidget *wid=widget();

+	wid->show();

 	return true;

 }

 bool KviKvsObject_widget::function_update(KviKvsObjectFunctionCall *c)