Replaced various '#define' with actual strings - part 3

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>

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 {

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();

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();

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<FileHandle, KTRMResultList> item = queue.first();

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)

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();

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 ----------------------------------------

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