diff options
| author |  Noldor | 2008-10-15 16:26:21 +0000 |
|---|---|---|
| committer | Noldor | 2008-10-15 16:26:21 +0000 |
| commit | 4c47d7cbcb483810d8adb40b7aba993d6f5bc414 (patch) | |
| tree | bef8df30449050bb2c25dcaab34fd2c5fafb87d0 /src/modules/objects/class_button.cpp | |
| parent | other small fixes (diff) | |
| download | KVIrc-4c47d7cbcb483810d8adb40b7aba993d6f5bc414.tar.gz KVIrc-4c47d7cbcb483810d8adb40b7aba993d6f5bc414.tar.bz2 KVIrc-4c47d7cbcb483810d8adb40b7aba993d6f5bc414.zip | |
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
Diffstat (limited to 'src/modules/objects/class_button.cpp')
| -rw-r--r-- | src/modules/objects/class_button.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
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")); |