From 1390bece9a81780610a9aee6f7d543f72bf57d1a Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Sun, 3 Dec 2023 00:48:02 +0900 Subject: Replaced various '#define' with actual strings - part 5 Signed-off-by: Michele Calgaro --- twin/clients/b2/b2client.cpp | 16 ++++++++-------- twin/clients/keramik/embedtool.cpp | 2 +- twin/kcmtwin/twinoptions/windows.cpp | 2 +- 3 files changed, 10 insertions(+), 10 deletions(-) (limited to 'twin') diff --git a/twin/clients/b2/b2client.cpp b/twin/clients/b2/b2client.cpp index 13375aaf0..6339402b7 100644 --- a/twin/clients/b2/b2client.cpp +++ b/twin/clients/b2/b2client.cpp @@ -982,7 +982,7 @@ static void redraw_pixmaps() TQColor color = is_act ? aGrp.button() : iGrp.button(); drawB2Rect(&thinBox, color, is_down); pix->fill(TQt::black); - bitBlt(TQT_TQPAINTDEVICE(pix), 0, 0, TQT_TQPAINTDEVICE(&thinBox), + bitBlt(pix, 0, 0, &thinBox, 0, 0, thinBox.width(), thinBox.height(), TQt::CopyROP, true); } @@ -1005,12 +1005,12 @@ static void redraw_pixmaps() drawB2Rect(&smallBox, is_act ? aGrp.button() : iGrp.button(), is_down); drawB2Rect(&largeBox, is_act ? aGrp.button() : iGrp.button(), is_down); pix->fill(options()->color(KDecoration::ColorTitleBar, is_act)); - bitBlt(TQT_TQPAINTDEVICE(pix), pix->width() - 12, pix->width() - 12, TQT_TQPAINTDEVICE(&largeBox), + bitBlt(pix, pix->width() - 12, pix->width() - 12, &largeBox, 0, 0, 12, 12, TQt::CopyROP, true); - bitBlt(TQT_TQPAINTDEVICE(pix), 0, 0, TQT_TQPAINTDEVICE(&smallBox), 0, 0, 10, 10, TQt::CopyROP, true); + bitBlt(pix, 0, 0, &smallBox, 0, 0, 10, 10, TQt::CopyROP, true); - bitBlt(TQT_TQPAINTDEVICE(pixmap[P_ICONIFY * NumStates + i]), 0, 0, - TQT_TQPAINTDEVICE(&smallBox), 0, 0, 10, 10, TQt::CopyROP, true); + bitBlt(pixmap[P_ICONIFY * NumStates + i], 0, 0, + &smallBox, 0, 0, 10, 10, TQt::CopyROP, true); } // resize @@ -1020,8 +1020,8 @@ static void redraw_pixmaps() *pixmap[P_RESIZE * NumStates + i] = *pixmap[P_CLOSE * NumStates + i]; pixmap[P_RESIZE * NumStates + i]->detach(); drawB2Rect(&smallBox, is_act ? aGrp.button() : iGrp.button(), is_down); - bitBlt(TQT_TQPAINTDEVICE(pixmap[P_RESIZE * NumStates + i]), - 0, 0, TQT_TQPAINTDEVICE(&smallBox), 0, 0, 10, 10, TQt::CopyROP, true); + bitBlt(pixmap[P_RESIZE * NumStates + i], + 0, 0, &smallBox, 0, 0, 10, 10, TQt::CopyROP, true); } @@ -1395,7 +1395,7 @@ void B2Titlebar::resizeEvent(TQResizeEvent *) void B2Titlebar::paintEvent(TQPaintEvent *) { if(client->isActive()) - bitBlt(TQT_TQPAINTDEVICE(this), 0, 0, TQT_TQPAINTDEVICE(&titleBuffer), 0, 0, titleBuffer.width(), + bitBlt(this, 0, 0, &titleBuffer, 0, 0, titleBuffer.width(), titleBuffer.height(), TQt::CopyROP, true); else { TQPainter p(this); diff --git a/twin/clients/keramik/embedtool.cpp b/twin/clients/keramik/embedtool.cpp index 8d39f9650..1cc56fe32 100644 --- a/twin/clients/keramik/embedtool.cpp +++ b/twin/clients/keramik/embedtool.cpp @@ -66,7 +66,7 @@ KeramikEmbedder::KeramikEmbedder() file = new TQFile( "tiles.h" ); file->open( IO_WriteOnly | IO_Truncate ); - stream.setDevice( TQT_TQIODEVICE(file) ); + stream.setDevice( file ); stream << "/*\n"; stream << " * Generated by embedtool 1.0 on " << datestring << endl; diff --git a/twin/kcmtwin/twinoptions/windows.cpp b/twin/kcmtwin/twinoptions/windows.cpp index 0a83808db..30d565716 100644 --- a/twin/kcmtwin/twinoptions/windows.cpp +++ b/twin/kcmtwin/twinoptions/windows.cpp @@ -1010,7 +1010,7 @@ KMovingConfig::KMovingConfig (bool _standAlone, TDEConfig *_config, TQWidget *pa " its size.")); TQGridLayout *rLay = new TQGridLayout(2,3); - bLay->addLayout(TQT_TQLAYOUT(rLay)); + bLay->addLayout(rLay); rLay->setColStretch(0,0); rLay->setColStretch(1,1); -- cgit v1.2.1