aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar TheXception2007-04-15 16:35:46 +0000
committerGravatar TheXception2007-04-15 16:35:46 +0000
commitfc684d164494c462115b58f129cbf6edb8b2b8b1 (patch)
treef7895b234fbb29707d2c7e33360b3a58f2c40d4e
parentUpdated $system.call documentation (diff)
downloadKVIrc-fc684d164494c462115b58f129cbf6edb8b2b8b1.tar.gz
KVIrc-fc684d164494c462115b58f129cbf6edb8b2b8b1.tar.bz2
KVIrc-fc684d164494c462115b58f129cbf6edb8b2b8b1.zip
small fixes
git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@490 17fca916-40b9-46aa-a4ea-0a15b648b75c
-rw-r--r--src/kvirc/kernel/kvi_options.cpp2
-rw-r--r--src/modules/objects/class_widget.cpp40
2 files changed, 21 insertions, 21 deletions
diff --git a/src/kvirc/kernel/kvi_options.cpp b/src/kvirc/kernel/kvi_options.cpp
index 7bbb898b6..fb385bd0b 100644
--- a/src/kvirc/kernel/kvi_options.cpp
+++ b/src/kvirc/kernel/kvi_options.cpp
@@ -964,7 +964,7 @@ namespace KviTheme
if(szD.isEmpty())
{
- options.setLastError(__tr2qs("Missing absolute directory for the theme informations"));
+ options.setLastError(__tr2qs("Missing absolute directory for the theme information"));
return false;
}
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;