From 4c47d7cbcb483810d8adb40b7aba993d6f5bc414 Mon Sep 17 00:00:00 2001
From: Noldor
Date: Wed, 15 Oct 2008 16:26:21 +0000
Subject: fixed some serious bugs in module object+code clean and improvements.

git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@2738 17fca916-40b9-46aa-a4ea-0a15b648b75c
---
 src/modules/objects/class_button.cpp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

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

diff --git a/src/modules/objects/class_button.cpp b/src/modules/objects/class_button.cpp
index 2e439a546..68326c1bd 100644
--- a/src/modules/objects/class_button.cpp
+++ b/src/modules/objects/class_button.cpp
@@ -92,14 +92,14 @@ bool KviKvsObject_button::init(KviKvsRunTimeContext * pContext,KviKvsVariantList
 
 KVSO_CLASS_FUNCTION(button,text)
 {
-	CHECK_INTERNAL_QPOINTER(widget())
+	CHECK_INTERNAL_POINTER(widget())
 	c->returnValue()->setString(((QPushButton *)widget())->text());
 	return true;
 }
 
 KVSO_CLASS_FUNCTION(button,setText)
 {
-	CHECK_INTERNAL_QPOINTER(widget())
+	CHECK_INTERNAL_POINTER(widget())
 	QString szText;
 	KVSO_PARAMETERS_BEGIN(c)
 		KVSO_PARAMETER("text",KVS_PT_STRING,0,szText)
@@ -110,7 +110,7 @@ KVSO_CLASS_FUNCTION(button,setText)
 
 KVSO_CLASS_FUNCTION(button,setImage)
 {
-	CHECK_INTERNAL_QPOINTER(widget())
+	CHECK_INTERNAL_POINTER(widget())
 	KviKvsVariant icon;
 	KVSO_PARAMETERS_BEGIN(c)
 		KVSO_PARAMETER("icon_or_hobject",KVS_PT_VARIANT,0,icon)
@@ -122,10 +122,10 @@ KVSO_CLASS_FUNCTION(button,setImage)
 		KviKvsObject *pObject=KviKvsKernel::instance()->objectController()->lookupObject(hObj);
 		if (!pObject)
 		{
-			c->warning(__tr2qs_ctx("Pixmap parameter is not an object!","object"));
+			c->warning(__tr2qs_ctx("Pixmap parameter is not an object!","objects"));
 			return true;
 		}
-		if(pObject->inherits("KviKvsObject_pixmap"))
+		if(pObject->inheritsClass("pixmap"))
 			((QPushButton *)widget())->setIcon(QIcon(*((KviKvsObject_pixmap *)pObject)->getPixmap()));
 		else{ 
 			c->warning(__tr2qs_ctx("Object Pixmap required!","object"));
-- 
cgit v1.3.1-10-gc9f91