From 2db2c90530f4979109640eea5020c607d3afc7f6 Mon Sep 17 00:00:00 2001
From: Noldor
Date: Wed, 26 Mar 2008 08:33:40 +0000
Subject: More QT4 work and removed QT3 unused code in objects module.

git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@1294 17fca916-40b9-46aa-a4ea-0a15b648b75c
---
 src/modules/objects/class_toolbutton.cpp | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

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

diff --git a/src/modules/objects/class_toolbutton.cpp b/src/modules/objects/class_toolbutton.cpp
index 3a531da30..b2d3e651b 100644
--- a/src/modules/objects/class_toolbutton.cpp
+++ b/src/modules/objects/class_toolbutton.cpp
@@ -143,11 +143,7 @@ bool KviKvsObject_toolbutton::functionsetImage(KviKvsObjectFunctionCall *c)
 	if (!widget()) return true;
 	QPixmap * pix = g_pIconManager->getImage(icon);
 	if(pix){
-		#ifdef COMPILE_USE_QT4
 			((QToolButton *)widget())->setIconSet(QIconSet(*pix));
-		#else
-			((QToolButton *)widget())->setIconSet(QIconSet(*pix,QIconSet::Small));
-		#endif
 	}
 	else
 		((QToolButton *)widget())->setIconSet(QIconSet());
@@ -237,14 +233,8 @@ bool KviKvsObject_toolbutton::functionsetTextLabel(KviKvsObjectFunctionCall *c)
 		KVSO_PARAMETER("tooltip",KVS_PT_STRING,KVS_PF_OPTIONAL,szTip)
 	KVSO_PARAMETERS_END(c)
 	if(!widget()) return true;
-
-	#ifdef COMPILE_USE_QT4
-		((QToolButton *)widget())->setText(szLabel);
-		if (!szTip.isEmpty()) ((QToolButton *)widget())->setToolTip(szTip);
-	#else
-		if (szTip.isEmpty()) ((QToolButton *)widget())->setTextLabel(szLabel);
-			else ((QToolButton *)widget())->setTextLabel(szLabel,szTip);
-	#endif
+	((QToolButton *)widget())->setText(szLabel);
+	if (!szTip.isEmpty()) ((QToolButton *)widget())->setToolTip(szTip);
 	return true;
 }
 bool KviKvsObject_toolbutton::functiontextLabel(KviKvsObjectFunctionCall *c)
-- 
cgit v1.3.1-10-gc9f91