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

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
(cherry picked from commit b841bed50c)

amarok/src/browserbar.cpp

@@ -44,7 +44,7 @@ namespace Amarok
         virtual void paintEvent( TQPaintEvent* )
         {
             TQPainter p( this );
-            parentWidget()->style().tqdrawPrimitive( TQStyle::PE_Splitter, &p, rect(), colorGroup(), TQStyle::Style_Horizontal );
+            parentWidget()->style().drawPrimitive( TQStyle::PE_Splitter, &p, rect(), colorGroup(), TQStyle::Style_Horizontal );
         }
 
         virtual void styleChange( TQStyle& )

amarok/src/multitabbar.cpp

@@ -714,7 +714,7 @@ TQSize MultiTabBarButton::sizeHint() const
 //             h = ( parentWidget()->width() - 3 ) / NUM_TABS;
 //     }
 
-    return ( style().tqsizeFromContents( TQStyle::CT_ToolButton, this, TQSize( w, h ) ).
+    return ( style().sizeFromContents( TQStyle::CT_ToolButton, this, TQSize( w, h ) ).
              expandedTo( TQApplication::globalStrut() ) );
 }
 

amarok/src/prettypopupmenu.cpp

@@ -174,7 +174,7 @@ PrettyPopupMenu::paintEvent( TQPaintEvent* e )
 
     drawContents( &p );
 
-    style().tqdrawPrimitive( TQStyle::PE_PanelPopup, &p,
+    style().drawPrimitive( TQStyle::PE_PanelPopup, &p,
                            TQRect( 0, 0, width(), height() ),
                            colorGroup(), TQStyle::Style_Default,
                            TQStyleOption( frameWidth(), 0 ) );

amarok/src/scancontroller.cpp

@@ -489,7 +489,7 @@ ScanController::startElement( const TQString&, const TQString& localName, const
         TQValueList< TQPair<TQString, TQString> > covers;
 
         for( uint i = 0; i < list.count(); ) {
-            covers += tqMakePair( list[i], list[i + 1] );
+            covers += qMakePair( list[i], list[i + 1] );
             i += 2;
         }
 

amarok/src/statusbar/statusBarBase.cpp

@@ -181,7 +181,7 @@ StatusBar::paintEvent( TQPaintEvent* )
         if ( !w->isVisible() )
             continue;
 
-        style().tqdrawPrimitive(
+        style().drawPrimitive(
                 TQStyle::PE_StatusBarSection,
                 &p,
                 TQRect( w->x() - 1, w->y() - 1, w->width() + 2, w->height() + 2 ),