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_painter.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/modules/objects/class_painter.cpp') diff --git a/src/modules/objects/class_painter.cpp b/src/modules/objects/class_painter.cpp index 82bafc023..d73c51c8c 100644 --- a/src/modules/objects/class_painter.cpp +++ b/src/modules/objects/class_painter.cpp @@ -846,7 +846,7 @@ bool KviKvsObject_painter::functionsetBrush(KviKvsObjectFunctionCall *c) c->warning(__tr2qs("Pixmap parameter is not an object!")); return true; } - if(pObject->inherits("KviKvsObject_pixmap")) + if(pObject->inheritsClass("pixmap")) m_pPainter->setBrush(*((KviKvsObject_pixmap *)pObject)->getPixmap()); else c->warning(__tr2qs("Object Pixmap required!")); return true; @@ -1038,15 +1038,15 @@ bool KviKvsObject_painter::functionbegin(KviKvsObjectFunctionCall *c) return true; } QPaintDevice * pd; - if(pObject->inherits("KviKvsObject_pixmap"))pd=((KviKvsObject_pixmap *)pObject)->getPixmap(); + if(pObject->inheritsClass("pixmap"))pd=((KviKvsObject_pixmap *)pObject)->getPixmap(); - else if (pObject->inherits("KviKvsObject_widget")) pd=((KviKvsObject_widget *)pObject)->widget(); + else if (pObject->inheritsClass("widget")) pd=((KviKvsObject_widget *)pObject)->widget(); else{ c->warning(__tr2qs("Widget or Pixmap required ")); return true; } attachDevice(pObject,pd); - if (pObject->inherits("KviKvsObject_pixmap")) ((KviKvsObject_pixmap *)pObject)->pixmapChanged(); + if (pObject->inheritsClass("pixmap")) ((KviKvsObject_pixmap *)pObject)->pixmapChanged(); return true; } @@ -1138,7 +1138,7 @@ bool KviKvsObject_painter::functiondrawPixmap(KviKvsObjectFunctionCall *c) c->warning(__tr2qs("Pixmap parameter is not an object")); return true; } - if (!obj->inherits("KviKvsObject_pixmap")) + if (!obj->inheritsClass("pixmap")) { c->warning(__tr2qs("Pixmap object required")); return true; -- cgit v1.3.1-10-gc9f91