From 1304109bee51323c2fb7258df91b2d4eccd83030 Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Fri, 24 Nov 2023 10:56:06 +0900 Subject: Replaced various '#define' with actual strings - part 3 Signed-off-by: Michele Calgaro --- arts/gui/kde/klayoutbox_impl.cpp | 2 +- arts/gui/kde/kpoti.cpp | 2 +- arts/gui/kde/tdepopupbox_private.h | 2 +- juk/musicbrainzquery.cpp | 4 ++-- juk/playlist.cpp | 4 ++-- kaboodle/main.cpp | 2 +- kmix/ksmallslider.cpp | 2 +- libkcddb/lookup.cpp | 4 ++-- 8 files changed, 11 insertions(+), 11 deletions(-) diff --git a/arts/gui/kde/klayoutbox_impl.cpp b/arts/gui/kde/klayoutbox_impl.cpp index bbd38be0..84a4e202 100644 --- a/arts/gui/kde/klayoutbox_impl.cpp +++ b/arts/gui/kde/klayoutbox_impl.cpp @@ -85,7 +85,7 @@ void KLayoutBox_Separator::paintEvent( TQPaintEvent* ) { TQPainter p( this ); TQStyle::SFlags flags = TQStyle::Style_Default; if ( width() < height() ) flags |= TQStyle::Style_Horizontal; - style().tqdrawPrimitive( TQStyle::PE_Splitter, &p, rect(), colorGroup(), flags ); + style().drawPrimitive( TQStyle::PE_Splitter, &p, rect(), colorGroup(), flags ); } TQSize KLayoutBox_Separator::minimumSizeHint() const { diff --git a/arts/gui/kde/kpoti.cpp b/arts/gui/kde/kpoti.cpp index 59ba7ec8..8fc412a2 100644 --- a/arts/gui/kde/kpoti.cpp +++ b/arts/gui/kde/kpoti.cpp @@ -458,7 +458,7 @@ void KPoti::drawContents( TQPainter * p ) dbp.drawPixmap( d->buttonRect, d->bgPixmap( colorGroup() ) ); if( hasFocus() ) - style().tqdrawPrimitive( TQStyle::PE_FocusRect, &dbp, d->buttonRect, colorGroup() ); + style().drawPrimitive( TQStyle::PE_FocusRect, &dbp, d->buttonRect, colorGroup() ); paintPoti( &dbp ); dbp.end(); diff --git a/arts/gui/kde/tdepopupbox_private.h b/arts/gui/kde/tdepopupbox_private.h index cfc9eb02..1df01f79 100644 --- a/arts/gui/kde/tdepopupbox_private.h +++ b/arts/gui/kde/tdepopupbox_private.h @@ -88,7 +88,7 @@ public: TQPainter p( this ); TQStyle::SFlags flags = TQStyle::Style_Default; if( width() < height() ) flags |= TQStyle::Style_Horizontal; - style().tqdrawPrimitive( TQStyle::PE_DockWindowHandle, &p, rect(), colorGroup(), flags ); + style().drawPrimitive( TQStyle::PE_DockWindowHandle, &p, rect(), colorGroup(), flags ); } signals: void clicked(); diff --git a/juk/musicbrainzquery.cpp b/juk/musicbrainzquery.cpp index 652bb30d..f1042930 100644 --- a/juk/musicbrainzquery.cpp +++ b/juk/musicbrainzquery.cpp @@ -82,11 +82,11 @@ void MusicBrainzLookup::confirmation() return; if(!queue.isEmpty()) { - queue.append(tqMakePair(m_file, results())); + queue.append(qMakePair(m_file, results())); return; } - queue.append(tqMakePair(m_file, results())); + queue.append(qMakePair(m_file, results())); while(!queue.isEmpty()) { TQPair item = queue.first(); diff --git a/juk/playlist.cpp b/juk/playlist.cpp index 7415d47e..38cdb73f 100644 --- a/juk/playlist.cpp +++ b/juk/playlist.cpp @@ -1384,8 +1384,8 @@ void Playlist::refreshAlbums(const PlaylistItemList &items, coverKey id) TQString artist = (*it)->file().tag()->artist(); TQString album = (*it)->file().tag()->album(); - if(albums.find(tqMakePair(artist, album)) == albums.end()) - albums.append(tqMakePair(artist, album)); + if(albums.find(qMakePair(artist, album)) == albums.end()) + albums.append(qMakePair(artist, album)); (*it)->file().coverInfo()->setCoverId(id); if(setAlbumCovers) diff --git a/kaboodle/main.cpp b/kaboodle/main.cpp index d83fb8cf..154b1b25 100644 --- a/kaboodle/main.cpp +++ b/kaboodle/main.cpp @@ -49,7 +49,7 @@ int main(int argc, char **argv) #ifndef NDEBUG if(!TDECmdLineArgs::parsedArgs()->isSet("qdebug")) - tqInstallMsgHandler(noMessageOutput); + qInstallMsgHandler(noMessageOutput); #endif Kaboodle::KaboodleApp::addCmdLineOptions(); diff --git a/kmix/ksmallslider.cpp b/kmix/ksmallslider.cpp index 5e344959..77ab0112 100644 --- a/kmix/ksmallslider.cpp +++ b/kmix/ksmallslider.cpp @@ -225,7 +225,7 @@ void KSmallSlider::paintEvent( TQPaintEvent * ) int sliderPos = positionFromValue( TQRangeControl::value() ); // ------------------------ draw 3d border --------------------------------------------- - style().tqdrawPrimitive ( TQStyle::PE_Panel, &p, TQRect( 0, 0, width(), height() ), colorGroup(), TRUE ); + style().drawPrimitive ( TQStyle::PE_Panel, &p, TQRect( 0, 0, width(), height() ), colorGroup(), TRUE ); // ------------------------ draw lower/left part ---------------------------------------- diff --git a/libkcddb/lookup.cpp b/libkcddb/lookup.cpp index c1a767fc..38f5a694 100644 --- a/libkcddb/lookup.cpp +++ b/libkcddb/lookup.cpp @@ -43,7 +43,7 @@ namespace KCDDB if ( 200 == serverStatus ) { TQStringList tokenList = TQStringList::split( ' ', line ); - matchList_.append( tqMakePair( tokenList[ 1 ], tokenList[ 2 ] ) ); + matchList_.append( qMakePair( tokenList[ 1 ], tokenList[ 2 ] ) ); return Success; } else if ( ( 211 == serverStatus ) || ( 210 == serverStatus ) ) @@ -62,7 +62,7 @@ namespace KCDDB Lookup::parseExtraMatch( const TQString & line ) { TQStringList tokenList = TQStringList::split( ' ', line ); - matchList_.append( tqMakePair( tokenList[ 0 ], tokenList[ 1 ] ) ); + matchList_.append( qMakePair( tokenList[ 0 ], tokenList[ 1 ] ) ); } CDDB::Result -- cgit v1.2.1