More Qt 4.x port

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

7 files changed, 24 insertions, 24 deletions

diff --git a/src/modules/objects/class_hbox.cpp b/src/modules/objects/class_hbox.cpp
index 3b6c0a37e..f9d509440 100644
--- a/src/modules/objects/class_hbox.cpp
+++ b/src/modules/objects/class_hbox.cpp
@@ -68,7 +68,7 @@ KVSO_END_CONSTRUCTOR(KviKvsObject_hbox)
 bool KviKvsObject_hbox::init(KviKvsRunTimeContext * pContext,KviKvsVariantList *pParams)
 {
 	
-		setObject(new QHBox(parentScriptWidget(), name()), true);
+		setObject(new KviTalHBox(parentScriptWidget()), true);
 	return true;
 }
 bool KviKvsObject_hbox::functionsetMargin(KviKvsObjectFunctionCall *c)
@@ -77,7 +77,7 @@ bool KviKvsObject_hbox::functionsetMargin(KviKvsObjectFunctionCall *c)
 	KVSO_PARAMETERS_BEGIN(c)
 		KVSO_PARAMETER("margin",KVS_PT_UNSIGNEDINTEGER,0,uMargin)
 	KVSO_PARAMETERS_END(c)
-    if (widget()) ((QHBox *)widget())->setMargin(uMargin);
+    if (widget()) ((KviTalHBox *)widget())->setMargin(uMargin);
 	return true;
 }
 
@@ -87,7 +87,7 @@ bool KviKvsObject_hbox::functionsetSpacing(KviKvsObjectFunctionCall *c)
 	KVSO_PARAMETERS_BEGIN(c)
 		KVSO_PARAMETER("spacing",KVS_PT_UNSIGNEDINTEGER,0,uSpacing)
 	KVSO_PARAMETERS_END(c)
-    if (widget()) ((QHBox *)widget())->setSpacing(uSpacing);
+    if (widget()) ((KviTalHBox *)widget())->setSpacing(uSpacing);
 	return true;
 }
 bool KviKvsObject_hbox::functionsetStretchFactor(KviKvsObjectFunctionCall *c)
@@ -121,7 +121,7 @@ bool KviKvsObject_hbox::functionsetStretchFactor(KviKvsObjectFunctionCall *c)
 		c->warning(__tr2qs("The widget must be a child of this hbox"));
 		return true;
 	}
-	((QHBox *)widget())->setStretchFactor(((QWidget *)(pObject->object())),uStretch);
+	((KviTalHBox *)widget())->setStretchFactor(((QWidget *)(pObject->object())),uStretch);
 	return true;
 }
 
diff --git a/src/modules/objects/class_hbox.h b/src/modules/objects/class_hbox.h
index 59f20cc8e..ae067b5fe 100644
--- a/src/modules/objects/class_hbox.h
+++ b/src/modules/objects/class_hbox.h
@@ -23,7 +23,7 @@
 //
 #include "kvi_string.h"
 
-#include <qhbox.h>
+#include "kvi_tal_hbox.h"
 #include "object_macros.h"
 #include "class_widget.h"
 
diff --git a/src/modules/objects/class_popupmenu.cpp b/src/modules/objects/class_popupmenu.cpp
index ee0762ae1..c32d0f891 100644
--- a/src/modules/objects/class_popupmenu.cpp
+++ b/src/modules/objects/class_popupmenu.cpp
@@ -184,7 +184,7 @@ KVSO_END_CONSTRUCTOR(KviKvsObject_popupmenu)
 
 bool KviKvsObject_popupmenu::init(KviKvsRunTimeContext * pContext,KviKvsVariantList *pParams)
 {
-	setObject(new QPopupMenu(parentScriptWidget(), name()), true);
+	setObject(new KviTalPopupMenu(parentScriptWidget(), name()), true);
 	connect(widget(),SIGNAL(activated(int)),this,SLOT(slotactivated(int)));
 	connect(widget(),SIGNAL(highlighted(int)),this,SLOT(slothighlighted(int)));
 	return true;
@@ -203,12 +203,12 @@ bool KviKvsObject_popupmenu::functioninsertItem(KviKvsObjectFunctionCall *c)
     if(!szIcon.isEmpty())
 	{
 		pix = g_pIconManager->getImage(szIcon);
-        if (pix) id=((QPopupMenu *)widget())->insertItem(*pix,szItem);
+        if (pix) id=((KviTalPopupMenu *)widget())->insertItem(*pix,szItem);
 		else c->warning(__tr2qs("pix '%Q' doesn't exists"),&szIcon);
 
 	}
 	else
-		id=((QPopupMenu *)widget())->insertItem(szItem);
+		id=((KviTalPopupMenu *)widget())->insertItem(szItem);
 	c->returnValue()->setInteger(id);
 	return true;
 }
@@ -235,7 +235,7 @@ bool KviKvsObject_popupmenu::functioninsertWidget(KviKvsObjectFunctionCall *c)
 		c->warning(__tr2qs("Can't add a non-widget object"));
         return TRUE;
     }
-	if (widget()) ((QPopupMenu *)widget())->insertItem(((QPopupMenu  *)(pObject->object())));
+	if (widget()) ((KviTalPopupMenu *)widget())->insertItem(((KviTalPopupMenu  *)(pObject->object())));
 	return true;
 }
 bool KviKvsObject_popupmenu::functioninsertHandle(KviKvsObjectFunctionCall *c)
@@ -260,12 +260,12 @@ bool KviKvsObject_popupmenu::functioninsertHandle(KviKvsObjectFunctionCall *c)
     if(!szIcon.isEmpty())
 	{
 		pix = g_pIconManager->getImage(szIcon);
-        if (pix) id=((QPopupMenu *)widget())->insertItem(*pix,szLabel,((QPopupMenu  *)(ob->object())));
+        if (pix) id=((KviTalPopupMenu *)widget())->insertItem(*pix,szLabel,((KviTalPopupMenu  *)(ob->object())));
 		else c->warning(__tr2qs("pix '%Q' doesn't exists"),&szIcon);
 
 	}
 	else
-		id=((QPopupMenu *)widget())->insertItem(szLabel,((QPopupMenu  *)(ob->object())));
+		id=((KviTalPopupMenu *)widget())->insertItem(szLabel,((KviTalPopupMenu  *)(ob->object())));
 	c->returnValue()->setInteger(id);
 	return true;
 }
@@ -273,7 +273,7 @@ bool KviKvsObject_popupmenu::functionexec(KviKvsObjectFunctionCall *c)
 {
 	if(!c->params()->count())
 	{
-	 ((QPopupMenu *)widget())->exec(QCursor::pos());
+	 ((KviTalPopupMenu *)widget())->exec(QCursor::pos());
 	 return true;
 	}
 
@@ -303,7 +303,7 @@ bool KviKvsObject_popupmenu::functionexec(KviKvsObjectFunctionCall *c)
 		return true;
 	}
 
-	((QPopupMenu *)widget())->exec(((QWidget *)(pObject->object()))->mapToGlobal(QPoint(iX,iY)) );
+	((KviTalPopupMenu *)widget())->exec(((QWidget *)(pObject->object()))->mapToGlobal(QPoint(iX,iY)) );
 
 	return true;
 }
@@ -313,7 +313,7 @@ bool KviKvsObject_popupmenu::functionremoveItem(KviKvsObjectFunctionCall *c)
 	KVSO_PARAMETERS_BEGIN(c)
 		KVSO_PARAMETER("item_id",KVS_PT_UNSIGNEDINTEGER,0,uItem)
 	KVSO_PARAMETERS_END(c)
-	if(widget()) ((QPopupMenu *)widget())->removeItem(uItem);
+	if(widget()) ((KviTalPopupMenu *)widget())->removeItem(uItem);
 	return true;
 }
 bool KviKvsObject_popupmenu::functionremoveItemAt(KviKvsObjectFunctionCall *c)
@@ -322,7 +322,7 @@ bool KviKvsObject_popupmenu::functionremoveItemAt(KviKvsObjectFunctionCall *c)
 	KVSO_PARAMETERS_BEGIN(c)
 		KVSO_PARAMETER("index",KVS_PT_UNSIGNEDINTEGER,0,uIndex)
 	KVSO_PARAMETERS_END(c)
-	if(widget())((QPopupMenu *)widget())->removeItemAt(uIndex);
+	if(widget())((KviTalPopupMenu *)widget())->removeItemAt(uIndex);
 	return true;
 }
 
@@ -332,7 +332,7 @@ bool KviKvsObject_popupmenu::functioninsertSeparator(KviKvsObjectFunctionCall *c
 	KVSO_PARAMETERS_BEGIN(c)
 		KVSO_PARAMETER("index",KVS_PT_UNSIGNEDINTEGER,0,uIndex)
 	KVSO_PARAMETERS_END(c)
-	if(widget())((QPopupMenu *)widget())->insertSeparator(uIndex);
+	if(widget())((KviTalPopupMenu *)widget())->insertSeparator(uIndex);
 	return true;
 }
 
diff --git a/src/modules/objects/class_popupmenu.h b/src/modules/objects/class_popupmenu.h
index 51eaf4586..9f5048020 100644
--- a/src/modules/objects/class_popupmenu.h
+++ b/src/modules/objects/class_popupmenu.h
@@ -24,7 +24,7 @@
 //
 
 
-#include <qpopupmenu.h>
+#include "kvi_tal_popupmenu.h"
 #include <qcursor.h>
 #include "class_widget.h"
 #include "object_macros.h"
diff --git a/src/modules/objects/class_toolbutton.cpp b/src/modules/objects/class_toolbutton.cpp
index b31e32b1d..4508540bc 100644
--- a/src/modules/objects/class_toolbutton.cpp
+++ b/src/modules/objects/class_toolbutton.cpp
@@ -27,7 +27,7 @@
 
 #include "kvi_locale.h"
 #include "kvi_iconmanager.h"
-#include <qpopupmenu.h>
+#include "kvi_tal_popupmenu.h"
 /*
 	@doc:	toolbutton
 	@keyterms:
@@ -265,7 +265,7 @@ bool KviKvsObject_toolbutton::functionsetPopup(KviKvsObjectFunctionCall *c)
         return TRUE;
     }
 	if(widget())
-		((QToolButton *)widget())->setPopup(((QPopupMenu  *)(ob->object())));
+		((QToolButton *)widget())->setPopup(((KviTalPopupMenu  *)(ob->object())));
 	return true;
 }
 bool KviKvsObject_toolbutton::functionopenPopup(KviKvsObjectFunctionCall *c)
diff --git a/src/modules/objects/class_vbox.cpp b/src/modules/objects/class_vbox.cpp
index d87a24c5c..f3bf44969 100644
--- a/src/modules/objects/class_vbox.cpp
+++ b/src/modules/objects/class_vbox.cpp
@@ -67,7 +67,7 @@ KVSO_END_CONSTRUCTOR(KviKvsObject_vbox)
 
 bool KviKvsObject_vbox::init(KviKvsRunTimeContext * pContext,KviKvsVariantList *pParams)
 {
-	setObject(new QVBox(parentScriptWidget(), name()), true);
+	setObject(new KviTalVBox(parentScriptWidget()), true);
 	return true;
 }
 
@@ -77,7 +77,7 @@ bool KviKvsObject_vbox::functionsetMargin(KviKvsObjectFunctionCall *c)
 	KVSO_PARAMETERS_BEGIN(c)
 		KVSO_PARAMETER("margin",KVS_PT_INT,0,iMargin)
 	KVSO_PARAMETERS_END(c)
-    if (widget()) ((QVBox *)widget())->setMargin(iMargin);
+    if (widget()) ((KviTalVBox *)widget())->setMargin(iMargin);
 	return true;
 }
 
@@ -87,7 +87,7 @@ bool KviKvsObject_vbox::functionsetSpacing(KviKvsObjectFunctionCall *c)
 	KVSO_PARAMETERS_BEGIN(c)
 		KVSO_PARAMETER("spacing",KVS_PT_INT,0,iSpacing)
 	KVSO_PARAMETERS_END(c)
-    if (widget()) ((QVBox *)widget())->setSpacing(iSpacing);
+    if (widget()) ((KviTalVBox *)widget())->setSpacing(iSpacing);
 	return true;
 }
 
@@ -123,6 +123,6 @@ bool KviKvsObject_vbox::functionsetStretchFactor(KviKvsObjectFunctionCall *c)
 		c->warning(__tr2qs("The widget must be a child of this vbox"));
 		return true;
 	}
-	((QVBox *)widget())->setStretchFactor(((QWidget *)(pObject->object())),uStretch);
+	((KviTalVBox *)widget())->setStretchFactor(((QWidget *)(pObject->object())),uStretch);
 	return true;
 }
\ No newline at end of file
diff --git a/src/modules/objects/class_vbox.h b/src/modules/objects/class_vbox.h
index cd2bf6c05..11cef7d0e 100644
--- a/src/modules/objects/class_vbox.h
+++ b/src/modules/objects/class_vbox.h
@@ -24,7 +24,7 @@
 #include "kvi_string.h"
 
 #include "class_widget.h"
-#include <qvbox.h>
+#include "kvi_tal_vbox.h"
 #include "object_macros.h"
 
 class KviKvsObject_vbox : public KviKvsObject_widget