From 1390bece9a81780610a9aee6f7d543f72bf57d1a Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Sun, 3 Dec 2023 00:48:02 +0900 Subject: [PATCH] Replaced various '#define' with actual strings - part 5 Signed-off-by: Michele Calgaro --- kcontrol/filetypes/filetypesview.cpp | 2 +- kcontrol/filetypes/newtypedlg.cpp | 2 +- kcontrol/tdefontinst/kcmfontinst/KCmFontInst.cpp | 2 +- kdesktop/minicli.cpp | 2 +- kicker/kicker/core/container_extension.cpp | 2 +- kicker/kicker/core/containerarealayout.cpp | 2 +- kicker/kicker/ui/itemview.cpp | 10 +++++----- konsole/konsole/keytrans.cpp | 4 ++-- libkonq/favicons/favicons.cpp | 2 +- libkonq/konq_pixmapprovider.cpp | 2 +- tdedebugdialog/tdedebugdialog.cpp | 2 +- tdeprint/tdeprintfax/confsystem.cpp | 2 +- tdm/kfrontend/kgreeter.cpp | 2 +- tdm/kfrontend/kgverify.h | 2 +- tdmlib/kgreet_classic.cpp | 4 ++-- tdmlib/kgreet_pam.cpp | 4 ++-- tdmlib/kgreet_pam.h | 2 +- tdmlib/kgreet_winbind.cpp | 4 ++-- twin/clients/b2/b2client.cpp | 16 ++++++++-------- twin/clients/keramik/embedtool.cpp | 2 +- twin/kcmtwin/twinoptions/windows.cpp | 2 +- 21 files changed, 36 insertions(+), 36 deletions(-) diff --git a/kcontrol/filetypes/filetypesview.cpp b/kcontrol/filetypes/filetypesview.cpp index 58bbbbd09..3dfa28c50 100644 --- a/kcontrol/filetypes/filetypesview.cpp +++ b/kcontrol/filetypes/filetypesview.cpp @@ -57,7 +57,7 @@ FileTypesView::FileTypesView(TQWidget *p, const char *name) leftLayout->setSpacing( KDialog::spacingHint() ); leftLayout->setColStretch(1, 1); - l->addLayout( TQT_TQLAYOUT(leftLayout) ); + l->addLayout( leftLayout ); TQLabel *patternFilterLBL = new TQLabel(i18n("F&ind filename pattern:"), this); leftLayout->addMultiCellWidget(patternFilterLBL, 0, 0, 0, 2); diff --git a/kcontrol/filetypes/newtypedlg.cpp b/kcontrol/filetypes/newtypedlg.cpp index dbb37344c..e2a9b28a7 100644 --- a/kcontrol/filetypes/newtypedlg.cpp +++ b/kcontrol/filetypes/newtypedlg.cpp @@ -19,7 +19,7 @@ NewTypeDialog::NewTypeDialog(TQStringList groups, TQGridLayout *grid = new TQGridLayout(2, 2); grid->setColStretch(1, 1); - topl->addLayout(TQT_TQLAYOUT(grid)); + topl->addLayout(grid); TQLabel *l = new TQLabel(i18n("Group:"), main); grid->addWidget(l, 0, 0); diff --git a/kcontrol/tdefontinst/kcmfontinst/KCmFontInst.cpp b/kcontrol/tdefontinst/kcmfontinst/KCmFontInst.cpp index 920326f0a..f81fba326 100644 --- a/kcontrol/tdefontinst/kcmfontinst/KCmFontInst.cpp +++ b/kcontrol/tdefontinst/kcmfontinst/KCmFontInst.cpp @@ -159,7 +159,7 @@ CKCmFontInst::CKCmFontInst(TQWidget *parent, const char *, const TQStringList&) connect(button, TQT_SIGNAL(clicked()), TQT_SLOT(addFonts())); button->setSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum); fontsLayout->addWidget(button, 1, 0); - TQT_TQLAYOUT(fontsLayout)->addItem(new TQSpacerItem(4, 4, TQSizePolicy::Expanding, TQSizePolicy::Minimum)); + fontsLayout->addItem(new TQSpacerItem(4, 4, TQSizePolicy::Expanding, TQSizePolicy::Minimum)); layout->addWidget(toolbar); #ifdef HAVE_XFT diff --git a/kdesktop/minicli.cpp b/kdesktop/minicli.cpp index 4b04ac3fe..da4d18d30 100644 --- a/kdesktop/minicli.cpp +++ b/kdesktop/minicli.cpp @@ -877,7 +877,7 @@ void Minicli::setIcon () { TQBitmap mask = *icon.mask(); bitBlt( &mask, x, y, - overlay.mask() ? TQT_TQPIXMAP(const_cast(overlay.mask())) : &overlay, + overlay.mask() ? const_cast(overlay.mask()) : &overlay, 0, 0, overlay.width(), overlay.height(), overlay.mask() ? OrROP : SetROP ); icon.setMask(mask); diff --git a/kicker/kicker/core/container_extension.cpp b/kicker/kicker/core/container_extension.cpp index 921ead986..dff2836e9 100644 --- a/kicker/kicker/core/container_extension.cpp +++ b/kicker/kicker/core/container_extension.cpp @@ -1427,7 +1427,7 @@ void ExtensionContainer::paintEvent(TQPaintEvent *e) // Nastiness to both vertically flip the PE_Separator // and make sure it pops out of, not sinks into, the screen TQPixmap inv_pm(width(),PANEL_RESIZE_HANDLE_WIDTH); - TQPainter myp(TQT_TQPAINTDEVICE(&inv_pm)); + TQPainter myp(&inv_pm); rect = TQRect(0,0,width(),PANEL_RESIZE_HANDLE_WIDTH); TQColorGroup darkcg = colorGroup(); darkcg.setColor(TQColorGroup::Light, colorGroup().dark()); diff --git a/kicker/kicker/core/containerarealayout.cpp b/kicker/kicker/core/containerarealayout.cpp index 9ee3b8835..81080fe82 100644 --- a/kicker/kicker/core/containerarealayout.cpp +++ b/kicker/kicker/core/containerarealayout.cpp @@ -213,7 +213,7 @@ ContainerAreaLayout::ContainerAreaLayout(TQWidget* parent) void ContainerAreaLayout::addItem(TQLayoutItem* item) { - m_items.append(new ContainerAreaLayoutItem(static_cast(item), this)); + m_items.append(new ContainerAreaLayoutItem(item, this)); } void ContainerAreaLayout::insertIntoFreeSpace(TQWidget* widget, TQPoint insertionPoint) diff --git a/kicker/kicker/ui/itemview.cpp b/kicker/kicker/ui/itemview.cpp index 64576a71f..4ab68eb55 100644 --- a/kicker/kicker/ui/itemview.cpp +++ b/kicker/kicker/ui/itemview.cpp @@ -158,12 +158,12 @@ void KMenuItem::setup() float min_font_size = 7. * TQMAX(1., TDEGlobalSettings::generalFont().pointSizeFloat() / 10.); const int expected_height = 38; - description_font_size = TQMAX( pointSize( expected_height * .3, TQT_TQPAINTDEVICE(listView()) ) + KickerSettings::kickoffFontPointSizeOffset(), min_font_size ) ; - title_font_size = TQMAX( pointSize( expected_height * .25, TQT_TQPAINTDEVICE(listView()) ) + KickerSettings::kickoffFontPointSizeOffset(), min_font_size + 1 ); + description_font_size = TQMAX( pointSize( expected_height * .3, listView() ) + KickerSettings::kickoffFontPointSizeOffset(), min_font_size ) ; + title_font_size = TQMAX( pointSize( expected_height * .25, listView() ) + KickerSettings::kickoffFontPointSizeOffset(), min_font_size + 1 ); //kdDebug() << description_font_size << " " << title_font_size << " " << pointSize( expected_height * .25, listView() ) << endl; TQListViewItem::setup(); - setHeight( (int)TQMAX( expected_height, pixelSize( title_font_size + description_font_size * 2.3, TQT_TQPAINTDEVICE(listView())))); + setHeight( (int)TQMAX( expected_height, pixelSize( title_font_size + description_font_size * 2.3, listView()))); } void KMenuItem::paintCell(TQPainter* p, const TQColorGroup & cg, int column, int width, int align) @@ -278,7 +278,7 @@ void KMenuItem::paintCellInter(TQPainter* p, const TQColorGroup & cg, int column if ( m_description.isEmpty() ) spacing = ( height() - f1h ) / 2; - int right_triangle_size = pixelSize( 7, TQT_TQPAINTDEVICE(listView()) ); + int right_triangle_size = pixelSize( 7, listView() ); int right_margin = listView()->verticalScrollBar()->width(); if ( m_has_children ) @@ -531,7 +531,7 @@ void KMenuItemHeader::paintCell(TQPainter* p, const TQColorGroup & cg, int , int int r = left_margin + margin * 2; const int min_font_size = 7; - int title_font_pixelSize = tqRound( pixelSize( TQMAX( pointSize( 12, TQT_TQPAINTDEVICE(listView()) ) + KickerSettings::kickoffFontPointSizeOffset(), min_font_size + 1 ), TQT_TQPAINTDEVICE(listView()) ) ); + int title_font_pixelSize = tqRound( pixelSize( TQMAX( pointSize( 12, listView() ) + KickerSettings::kickoffFontPointSizeOffset(), min_font_size + 1 ), listView() ) ); TQFont f1 = p->font(); f1.setPixelSize( title_font_pixelSize ); diff --git a/konsole/konsole/keytrans.cpp b/konsole/konsole/keytrans.cpp index a28801a06..7a2b3f566 100644 --- a/konsole/konsole/keytrans.cpp +++ b/konsole/konsole/keytrans.cpp @@ -363,11 +363,11 @@ void KeyTrans::readConfig() TQBuffer* newbuf; newbuf = new TQBuffer(); newbuf->setBuffer(txt); - buf=TQT_TQIODEVICE(newbuf); + buf=newbuf; } else { - buf=TQT_TQIODEVICE(new TQFile(m_path)); + buf=new TQFile(m_path); }; KeytabReader ktr(m_path,*buf); ktr.parseTo(this); diff --git a/libkonq/favicons/favicons.cpp b/libkonq/favicons/favicons.cpp index 05bddec1e..eab4a4479 100644 --- a/libkonq/favicons/favicons.cpp +++ b/libkonq/favicons/favicons.cpp @@ -219,7 +219,7 @@ void FaviconsModule::slotResult(TDEIO::Job *job) TQBuffer buffer(download.iconData); buffer.open(IO_ReadOnly); TQImageIO io; - io.setIODevice(TQT_TQIODEVICE(&buffer)); + io.setIODevice(&buffer); io.setParameters("size=16"); // Check here too, the job might have had no error, but the downloaded // file contains just a 404 message sent with a 200 status. diff --git a/libkonq/konq_pixmapprovider.cpp b/libkonq/konq_pixmapprovider.cpp index 28d5a9992..20a740eb4 100644 --- a/libkonq/konq_pixmapprovider.cpp +++ b/libkonq/konq_pixmapprovider.cpp @@ -186,7 +186,7 @@ TQPixmap KonqPixmapProvider::loadIcon( const TQString& url, const TQString& icon if ( big.mask() ) { TQBitmap mask = *big.mask(); bitBlt( &mask, x, y, - small.mask() ? TQT_TQPIXMAP(const_cast(small.mask())) : &small, 0, 0, + small.mask() ? const_cast(small.mask()) : &small, 0, 0, small.width(), small.height(), small.mask() ? OrROP : SetROP ); big.setMask( mask ); diff --git a/tdedebugdialog/tdedebugdialog.cpp b/tdedebugdialog/tdedebugdialog.cpp index d63fac78b..b5ced18a0 100644 --- a/tdedebugdialog/tdedebugdialog.cpp +++ b/tdedebugdialog/tdedebugdialog.cpp @@ -60,7 +60,7 @@ TDEDebugDialog::TDEDebugDialog( TQStringList areaList, TQWidget *parent, const c TQGridLayout *gbox = new TQGridLayout( 2, 2, KDialog::marginHint() ); if( gbox == 0 ) { return; } - topLayout->addLayout( TQT_TQLAYOUT(gbox) ); + topLayout->addLayout( gbox ); TQStringList destList; destList.append( i18n("File") ); diff --git a/tdeprint/tdeprintfax/confsystem.cpp b/tdeprint/tdeprintfax/confsystem.cpp index fbb27aac9..e6ef4e299 100644 --- a/tdeprint/tdeprintfax/confsystem.cpp +++ b/tdeprint/tdeprintfax/confsystem.cpp @@ -75,7 +75,7 @@ ConfSystem::ConfSystem(TQWidget *parent, const char *name) TQVBoxLayout *l0 = new TQVBoxLayout(this, 10, 10); TQGridLayout *l1 = new TQGridLayout(0, 2, 2, 0, 10); - l0->addLayout(TQT_TQLAYOUT(l1)); + l0->addLayout(l1); l1->setColStretch(1, 1); l1->addWidget(syslabel, 0, 0); l1->addWidget(cmdlabel, 1, 0); diff --git a/tdm/kfrontend/kgreeter.cpp b/tdm/kfrontend/kgreeter.cpp index 4aa49eca5..19d27fe2f 100644 --- a/tdm/kfrontend/kgreeter.cpp +++ b/tdm/kfrontend/kgreeter.cpp @@ -393,7 +393,7 @@ KGreeter::insertUser( const TQImage &default_pix, TQBuffer buf( fc ); buf.open( IO_ReadOnly ); TQImageIO ir; - ir.setIODevice( TQT_TQIODEVICE(&buf) ); + ir.setIODevice( &buf ); if (!ir.read()) { LogInfo( "%s is no valid image\n", fn.data() ); continue; diff --git a/tdm/kfrontend/kgverify.h b/tdm/kfrontend/kgverify.h index fef509d17..405fa35ba 100644 --- a/tdm/kfrontend/kgverify.h +++ b/tdm/kfrontend/kgverify.h @@ -200,7 +200,7 @@ class KGStdVerify : public KGVerify { const PluginList &pluginList, KGreeterPlugin::Function func, KGreeterPlugin::Context ctx ); virtual ~KGStdVerify(); - TQLayout *getLayout() const { return TQT_TQLAYOUT(grid); } + TQLayout *getLayout() const { return grid; } void selectPlugin( int id ); protected: diff --git a/tdmlib/kgreet_classic.cpp b/tdmlib/kgreet_classic.cpp index 996754181..44db90158 100644 --- a/tdmlib/kgreet_classic.cpp +++ b/tdmlib/kgreet_classic.cpp @@ -83,7 +83,7 @@ KClassicGreeter::KClassicGreeter( KGreeterPluginHandler *_handler, if (!themer) grid = new TQGridLayout( 0, 0, 10 ); - layoutItem = TQT_TQLAYOUTITEM(grid); + layoutItem = grid; loginLabel = passwdLabel = passwd1Label = passwd2Label = 0; loginEdit = 0; @@ -174,7 +174,7 @@ KClassicGreeter::~KClassicGreeter() delete passwdEdit; return; } - TQLayoutIterator it = TQT_TQLAYOUT(layoutItem)->iterator(); + TQLayoutIterator it = static_cast(layoutItem)->iterator(); for (TQLayoutItem *itm = it.current(); itm; itm = ++it) delete itm->widget(); delete layoutItem; diff --git a/tdmlib/kgreet_pam.cpp b/tdmlib/kgreet_pam.cpp index 69eac485b..b0ef73a28 100644 --- a/tdmlib/kgreet_pam.cpp +++ b/tdmlib/kgreet_pam.cpp @@ -111,7 +111,7 @@ KPamGreeter::KPamGreeter( KGreeterPluginHandler *_handler, m_themer = themer; if (!themer) - layoutItem = TQT_TQLAYOUTITEM(new TQGridLayout( 0, 0, 10 )); + layoutItem = new TQGridLayout( 0, 0, 10 ); loginLabel = 0; authLabel.clear(); @@ -211,7 +211,7 @@ KPamGreeter::~KPamGreeter() delete loginEdit; return; } - TQLayoutIterator it = TQT_TQLAYOUT(layoutItem)->iterator(); + TQLayoutIterator it = static_cast(layoutItem)->iterator(); for (TQLayoutItem *itm = it.current(); itm; itm = ++it) delete itm->widget(); delete layoutItem; diff --git a/tdmlib/kgreet_pam.h b/tdmlib/kgreet_pam.h index 0ce5091b1..98e3315b1 100644 --- a/tdmlib/kgreet_pam.h +++ b/tdmlib/kgreet_pam.h @@ -68,7 +68,7 @@ class KPamGreeter : public TQObject, public KGreeterPlugin { virtual void revive(); virtual void clear(); - TQGridLayout *getLayoutItem() const { return static_cast(TQT_TQLAYOUT(layoutItem)); } + TQGridLayout *getLayoutItem() const { return static_cast(layoutItem); } public slots: void slotLoginLostFocus(); diff --git a/tdmlib/kgreet_winbind.cpp b/tdmlib/kgreet_winbind.cpp index 545a96a61..6065a9123 100644 --- a/tdmlib/kgreet_winbind.cpp +++ b/tdmlib/kgreet_winbind.cpp @@ -93,7 +93,7 @@ KWinbindGreeter::KWinbindGreeter( KGreeterPluginHandler *_handler, if (!themer) { grid = new TQGridLayout( 0, 0, 10 ); - layoutItem = TQT_TQLAYOUTITEM(grid); + layoutItem = grid; } domainLabel = loginLabel = passwdLabel = passwd1Label = passwd2Label = 0; @@ -217,7 +217,7 @@ KWinbindGreeter::~KWinbindGreeter() delete domainCombo; return; } - TQLayoutIterator it = TQT_TQLAYOUT(layoutItem)->iterator(); + TQLayoutIterator it = static_cast(layoutItem)->iterator(); for (TQLayoutItem *itm = it.current(); itm; itm = ++it) delete itm->widget(); delete layoutItem; 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);