From 856d6d139529d49b4875ecd9319b61d0dcbad8c3 Mon Sep 17 00:00:00 2001
From: Michele Calgaro <michele.calgaro@yahoo.it>
Date: Sun, 3 Dec 2023 00:47:54 +0900
Subject: Replaced various '#define' with actual strings - part 5

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
(cherry picked from commit 3c87f890580f072e4bdce6c36e6dd1cb79cf170d)
---
 twin-styles/kstep/nextclient.cpp    |  8 ++++----
 twin-styles/system/systemclient.cpp | 16 ++++++++--------
 2 files changed, 12 insertions(+), 12 deletions(-)

(limited to 'twin-styles')

diff --git a/twin-styles/kstep/nextclient.cpp b/twin-styles/kstep/nextclient.cpp
index a086400d..fefcf019 100644
--- a/twin-styles/kstep/nextclient.cpp
+++ b/twin-styles/kstep/nextclient.cpp
@@ -256,13 +256,13 @@ static void create_pixmaps(NextClientFactory *f)
                             KPixmapEffect::DiagonalGradient);
     KPixmapEffect::gradient(internal, c.dark(120), c.light(120),
                             KPixmapEffect::DiagonalGradient);
-    bitBlt(TQT_TQPAINTDEVICE(iBtn), 3, 3, TQT_TQPAINTDEVICE(&internal), 0, 0, internalHeight, internalHeight, TQt::CopyROP, true);
+    bitBlt(iBtn, 3, 3, &internal, 0, 0, internalHeight, internalHeight, TQt::CopyROP, true);
 
     KPixmapEffect::gradient(*iBtnDown, c.dark(120), c.light(120),
                             KPixmapEffect::DiagonalGradient);
     KPixmapEffect::gradient(internal, c.light(120), c.dark(120),
                             KPixmapEffect::DiagonalGradient);
-    bitBlt(TQT_TQPAINTDEVICE(iBtnDown), 3, 3, TQT_TQPAINTDEVICE(&internal), 0, 0, internalHeight, internalHeight, TQt::CopyROP, true);
+    bitBlt(iBtnDown, 3, 3, &internal, 0, 0, internalHeight, internalHeight, TQt::CopyROP, true);
 
     // active buttons
     c = options()->color(KDecoration::ColorButtonBg, true);
@@ -270,13 +270,13 @@ static void create_pixmaps(NextClientFactory *f)
                             KPixmapEffect::DiagonalGradient);
     KPixmapEffect::gradient(internal, c.dark(120), c.light(120),
                             KPixmapEffect::DiagonalGradient);
-    bitBlt(TQT_TQPAINTDEVICE(aBtn), 3, 3, TQT_TQPAINTDEVICE(&internal), 0, 0, internalHeight, internalHeight, TQt::CopyROP, true);
+    bitBlt(aBtn, 3, 3, &internal, 0, 0, internalHeight, internalHeight, TQt::CopyROP, true);
 
     KPixmapEffect::gradient(*aBtnDown, c.dark(120), c.light(120),
                             KPixmapEffect::DiagonalGradient);
     KPixmapEffect::gradient(internal, c.light(120), c.dark(120),
                             KPixmapEffect::DiagonalGradient);
-    bitBlt(TQT_TQPAINTDEVICE(aBtnDown), 3, 3, TQT_TQPAINTDEVICE(&internal), 0, 0, internalHeight, internalHeight, TQt::CopyROP, true);
+    bitBlt(aBtnDown, 3, 3, &internal, 0, 0, internalHeight, internalHeight, TQt::CopyROP, true);
 
     TQPainter p;
     p.begin(aBtn);
diff --git a/twin-styles/system/systemclient.cpp b/twin-styles/system/systemclient.cpp
index 17b93e20..f3577630 100644
--- a/twin-styles/system/systemclient.cpp
+++ b/twin-styles/system/systemclient.cpp
@@ -118,18 +118,18 @@ static void create_pixmaps()
                                 hColor.light(150),
                                 hColor.dark(150),
                                 KPixmapEffect::DiagonalGradient);
-        bitBlt(TQT_TQPAINTDEVICE(&aPix), 1, 1, TQT_TQPAINTDEVICE(&aInternal), 0, 0, 8, 8, TQt::CopyROP, true);
-        bitBlt(TQT_TQPAINTDEVICE(&iPix), 1, 1, TQT_TQPAINTDEVICE(&iInternal), 0, 0, 8, 8, TQt::CopyROP, true);
+        bitBlt(&aPix, 1, 1, &aInternal, 0, 0, 8, 8, TQt::CopyROP, true);
+        bitBlt(&iPix, 1, 1, &iInternal, 0, 0, 8, 8, TQt::CopyROP, true);
 
         // normal buttons
         btnPix = new KPixmap;
         btnPix->resize(14, 14);
-        bitBlt(TQT_TQPAINTDEVICE(btnPix), 2, 2, TQT_TQPAINTDEVICE(&aPix), 0, 0, 10, 10, TQt::CopyROP, true);
+        bitBlt(btnPix, 2, 2, &aPix, 0, 0, 10, 10, TQt::CopyROP, true);
         drawButtonFrame(btnPix, KDecoration::options()->colorGroup(KDecorationOptions::ColorFrame, true));
 
         iBtnPix = new KPixmap;
         iBtnPix->resize(14, 14);
-        bitBlt(TQT_TQPAINTDEVICE(iBtnPix), 2, 2, TQT_TQPAINTDEVICE(&iPix), 0, 0, 10, 10, TQt::CopyROP, true);
+        bitBlt(iBtnPix, 2, 2, &iPix, 0, 0, 10, 10, TQt::CopyROP, true);
         drawButtonFrame(iBtnPix, KDecoration::options()->colorGroup(KDecorationOptions::ColorFrame, false));
 
 
@@ -153,18 +153,18 @@ static void create_pixmaps()
                                 hColor.light(150),
                                 hColor.dark(150),
                                 KPixmapEffect::DiagonalGradient);
-        bitBlt(TQT_TQPAINTDEVICE(&aPix), 1, 1, TQT_TQPAINTDEVICE(&aInternal), 0, 0, 8, 8, TQt::CopyROP, true);
-        bitBlt(TQT_TQPAINTDEVICE(&iPix), 1, 1, TQT_TQPAINTDEVICE(&iInternal), 0, 0, 8, 8, TQt::CopyROP, true);
+        bitBlt(&aPix, 1, 1, &aInternal, 0, 0, 8, 8, TQt::CopyROP, true);
+        bitBlt(&iPix, 1, 1, &iInternal, 0, 0, 8, 8, TQt::CopyROP, true);
 
         btnPixDown = new KPixmap;
         btnPixDown->resize(14, 14);
-        bitBlt(TQT_TQPAINTDEVICE(btnPixDown), 2, 2, TQT_TQPAINTDEVICE(&aPix), 0, 0, 10, 10, TQt::CopyROP, true);
+        bitBlt(btnPixDown, 2, 2, &aPix, 0, 0, 10, 10, TQt::CopyROP, true);
         drawButtonFrame(btnPixDown, KDecoration::options()->colorGroup(KDecorationOptions::ColorFrame,
                                                         true));
 
         iBtnPixDown = new KPixmap;
         iBtnPixDown->resize(14, 14);
-        bitBlt(TQT_TQPAINTDEVICE(iBtnPixDown), 2, 2, TQT_TQPAINTDEVICE(&iPix), 0, 0, 10, 10, TQt::CopyROP, true);
+        bitBlt(iBtnPixDown, 2, 2, &iPix, 0, 0, 10, 10, TQt::CopyROP, true);
         drawButtonFrame(iBtnPixDown, KDecoration::options()->colorGroup(KDecorationOptions::ColorFrame,
                                                          false));
     }
-- 
cgit v1.2.3