From 522dfb2ad8401b0cbe7c8aa2adb2213c669aa132 Mon Sep 17 00:00:00 2001
From: Noldor
Date: Tue, 27 Feb 2007 17:11:32 +0000
Subject: objects module QT4 porting (wip)

git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@384 17fca916-40b9-46aa-a4ea-0a15b648b75c
---
 src/modules/objects/class_toolbar.cpp | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

(limited to 'src/modules/objects/class_toolbar.cpp')

diff --git a/src/modules/objects/class_toolbar.cpp b/src/modules/objects/class_toolbar.cpp
index 2a1a4eb81..c8391afea 100644
--- a/src/modules/objects/class_toolbar.cpp
+++ b/src/modules/objects/class_toolbar.cpp
@@ -24,7 +24,8 @@
 #include "class_toolbar.h"
 #include "kvi_error.h"
 #include "kvi_debug.h"
-
+#include "kvi_tal_toolbar.h"
+#include "kvi_tal_mainwindow.h"
 #include "kvi_locale.h"
 #include "kvi_iconmanager.h"
 #include "class_mainwindow.h"
@@ -85,7 +86,7 @@ bool KviKvsObject_toolbar::init(KviKvsRunTimeContext * pContext,KviKvsVariantLis
 	}
 	if(parentObject()->inherits("KviKvsObject_mainwindow"))
 	{ 
-		setObject(new QToolBar(((QMainWindow *)parentScriptWidget()), name()), true);
+		setObject(new KviTalToolBar(((KviTalMainWindow *)parentScriptWidget()), name()), true);
 	}
 	else
 	{
@@ -97,7 +98,7 @@ bool KviKvsObject_toolbar::init(KviKvsRunTimeContext * pContext,KviKvsVariantLis
 
 bool KviKvsObject_toolbar::functionaddSeparator(KviKvsObjectFunctionCall *c)
 {
-	if(widget()) ((QToolBar *)widget())->addSeparator();
+	if(widget()) ((KviTalToolBar *)widget())->addSeparator();
 	return true;
 }
 bool KviKvsObject_toolbar::functionsetLabel(KviKvsObjectFunctionCall *c)
@@ -106,12 +107,12 @@ bool KviKvsObject_toolbar::functionsetLabel(KviKvsObjectFunctionCall *c)
 	KVSO_PARAMETERS_BEGIN(c)
 		KVSO_PARAMETER("label",KVS_PT_STRING,0,szLabel)
 	KVSO_PARAMETERS_END(c)
-	if (widget()) ((QToolBar *)widget())->setLabel(szLabel);
+	if (widget()) ((KviTalToolBar *)widget())->setLabel(szLabel);
 	return true;
 }
 bool KviKvsObject_toolbar::functionlabel(KviKvsObjectFunctionCall *c)
 {
-	if (widget()) c->returnValue()->setString(((QToolBar *)widget())->label());
+	if (widget()) c->returnValue()->setString(((KviTalToolBar *)widget())->label());
 	return true;
 }
 bool KviKvsObject_toolbar::functionsetStretchableWidget(KviKvsObjectFunctionCall *c)
@@ -138,13 +139,13 @@ bool KviKvsObject_toolbar::functionsetStretchableWidget(KviKvsObjectFunctionCall
 		c->warning(__tr2qs("Widget object required"));
         return TRUE;
     }
-	if(widget()) ((QToolBar *)widget())->setStretchableWidget(((QWidget  *)(ob->object())));
+	if(widget()) ((KviTalToolBar *)widget())->setStretchableWidget(((QWidget  *)(ob->object())));
 	return true;	
 }
 bool KviKvsObject_toolbar::functionclear(KviKvsObjectFunctionCall *c)
 {
 	if (widget())
-		((QToolBar *)object())->clear();
+		((KviTalToolBar *)object())->clear();
 	return true;
 }
 
-- 
cgit v1.3.1-10-gc9f91