From fc684d164494c462115b58f129cbf6edb8b2b8b1 Mon Sep 17 00:00:00 2001 From: TheXception Date: Sun, 15 Apr 2007 16:35:46 +0000 Subject: small fixes git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@490 17fca916-40b9-46aa-a4ea-0a15b648b75c --- src/modules/objects/class_widget.cpp | 40 ++++++++++++++++++------------------ 1 file changed, 20 insertions(+), 20 deletions(-) (limited to 'src/modules/objects/class_widget.cpp') diff --git a/src/modules/objects/class_widget.cpp b/src/modules/objects/class_widget.cpp index 3076d92ed..407aea0cc 100644 --- a/src/modules/objects/class_widget.cpp +++ b/src/modules/objects/class_widget.cpp @@ -1700,27 +1700,27 @@ bool KviKvsObject_widget::function_setDynamicToolTip(KviKvsObjectFunctionCall *c m_pTip->doTip(QRect(QPoint(iXstart,iYstart),QSize(uWidth,uHeight)),szTip); return true; } -bool KviKvsObject_widget::function_setMask(KviKvsObjectFunctionCall *c) -{ - KviKvsObject *obj; - kvs_hobject_t hObject; - KVSO_PARAMETERS_BEGIN(c) - KVSO_PARAMETER("pixmap",KVS_PT_HOBJECT,0,hObject) - KVSO_PARAMETERS_END(c) - obj=KviKvsKernel::instance()->objectController()->lookupObject(hObject); - if(!widget())return true; - if (!obj) - { - c->warning(__tr2qs("Pixmap parameter is not an object")); - return true; - } - if (!obj->inherits("KviKvsObject_pixmap")) - { - c->warning(__tr2qs("Pixmap object required")); - return true; - } +bool KviKvsObject_widget::function_setMask(KviKvsObjectFunctionCall *c) +{ + KviKvsObject *obj; + kvs_hobject_t hObject; + KVSO_PARAMETERS_BEGIN(c) + KVSO_PARAMETER("pixmap",KVS_PT_HOBJECT,0,hObject) + KVSO_PARAMETERS_END(c) + obj=KviKvsKernel::instance()->objectController()->lookupObject(hObject); + if(!widget())return true; + if (!obj) + { + c->warning(__tr2qs("Pixmap parameter is not an object")); + return true; + } + if (!obj->inherits("KviKvsObject_pixmap")) + { + c->warning(__tr2qs("Pixmap object required")); + return true; + } QPixmap * pm=((KviKvsObject_pixmap *)obj)->getPixmap(); - QBitmap mask(pm->mask()); + QBitmap mask(*pm->mask()); if (mask.isNull()) c->warning(__tr2qs("Null mask")); widget()->setMask(mask); return true; -- cgit v1.3.1-10-gc9f91