diff options
| author | Michele Calgaro <[email protected]> | 2023-12-03 00:35:29 +0900 |
|---|---|---|
| committer | Michele Calgaro <[email protected]> | 2023-12-04 14:28:12 +0900 |
| commit | 039fcfa844aec2a1ce7a2ce97671504e00ec4c5a (patch) | |
| tree | f58ccae9f3fd1b67df8c62e7b852e814f511cf33 /src/modules/objects | |
| parent | 3f8bfdfe61daf0c51d99437a52d1040da6ff6cff (diff) | |
| download | kvirc-039fcfa844aec2a1ce7a2ce97671504e00ec4c5a.tar.gz kvirc-039fcfa844aec2a1ce7a2ce97671504e00ec4c5a.zip | |
Replaced various '#define' with actual strings - part 5
Signed-off-by: Michele Calgaro <[email protected]>
(cherry picked from commit 236b93c7266b84269b4be5841d8575b5f3432065)
Diffstat (limited to 'src/modules/objects')
| -rw-r--r-- | src/modules/objects/class_painter.cpp | 4 | ||||
| -rw-r--r-- | src/modules/objects/libkviobjects.cpp | 12 |
2 files changed, 8 insertions, 8 deletions
diff --git a/src/modules/objects/class_painter.cpp b/src/modules/objects/class_painter.cpp index bf407f4c..341706d8 100644 --- a/src/modules/objects/class_painter.cpp +++ b/src/modules/objects/class_painter.cpp @@ -771,8 +771,8 @@ bool KviKvsObject_painter::functionbegin(KviKvsObjectFunctionCall *c) } TQPaintDevice * pd = 0; - if(pObject->inherits("KviKvsObject_pixmap"))pd =TQT_TQPAINTDEVICE(((KviKvsObject_pixmap *)pObject)->getPixmap()); - else if (pObject->inherits("KviKvsObject_widget")) pd=TQT_TQPAINTDEVICE(((KviKvsObject_widget *)pObject)->widget()); + if(pObject->inherits("KviKvsObject_pixmap"))pd =((KviKvsObject_pixmap *)pObject)->getPixmap(); + else if (pObject->inherits("KviKvsObject_widget")) pd=((KviKvsObject_widget *)pObject)->widget(); if (!pd) c->warning(__tr2qs("Widget or Pixmap required ")); diff --git a/src/modules/objects/libkviobjects.cpp b/src/modules/objects/libkviobjects.cpp index 6d29f5d9..1c34f50f 100644 --- a/src/modules/objects/libkviobjects.cpp +++ b/src/modules/objects/libkviobjects.cpp @@ -616,8 +616,8 @@ static bool objects_kvs_cmd_bitBlt(KviKvsModuleCommandCall * c) TQImage * imgSource=0; TQPaintDevice * pdSource = 0; - if(obSrc->inherits("KviKvsObject_pixmap")) pdSource =TQT_TQPAINTDEVICE(((KviKvsObject_pixmap *)obSrc)->getPixmap()); - else if (obSrc->inherits("KviKvsObject_widget")) pdSource=TQT_TQPAINTDEVICE(((KviKvsObject_widget *)obSrc)->widget()); + if(obSrc->inherits("KviKvsObject_pixmap")) pdSource =((KviKvsObject_pixmap *)obSrc)->getPixmap(); + else if (obSrc->inherits("KviKvsObject_widget")) pdSource=((KviKvsObject_widget *)obSrc)->widget(); if (!pdSource) { c->warning(__tr2qs("Widget, Image or Pixmap required ")); @@ -625,9 +625,9 @@ static bool objects_kvs_cmd_bitBlt(KviKvsModuleCommandCall * c) } TQPaintDevice * pdDest = 0; if(obDst->inherits("KviKvsObject_pixmap")){ - pdDest= TQT_TQPAINTDEVICE(((KviKvsObject_pixmap *)obDst)->getPixmap()); + pdDest= ((KviKvsObject_pixmap *)obDst)->getPixmap(); } - else if (obDst->inherits("KviKvsObject_widget")) pdDest=TQT_TQPAINTDEVICE(((KviKvsObject_widget *)obDst)->widget()); + else if (obDst->inherits("KviKvsObject_widget")) pdDest=((KviKvsObject_widget *)obDst)->widget(); if (!pdDest) { c->warning(__tr2qs("Widget or Pixmap required")); @@ -711,8 +711,8 @@ static bool objects_kvs_cmd_blend(KviKvsModuleCommandCall * c) } TQPaintDevice * pdDest = 0; - if(obDest->inherits("KviKvsObject_pixmap")) pdDest = TQT_TQPAINTDEVICE(((KviKvsObject_pixmap *)obDest)->getPixmap()); - else if (obDest->inherits("KviKvsObject_widget")) pdDest=TQT_TQPAINTDEVICE(((KviKvsObject_widget *)obDest)->widget()); + if(obDest->inherits("KviKvsObject_pixmap")) pdDest = ((KviKvsObject_pixmap *)obDest)->getPixmap(); + else if (obDest->inherits("KviKvsObject_widget")) pdDest=((KviKvsObject_widget *)obDest)->widget(); if (!pdDest) { |