Rename a few stragglers

amarok/src/multitabbar.cpp

@@ -887,8 +887,8 @@ void MultiTabBarTab::drawButtonStyled( TQPainter *paint )
 
     if ( isOn() ) st |= TQStyle::Style_On;
 
-    tqstyle().drawControl( TQStyle::CE_PushButton, &painter, this, TQRect( 0, 0, pixmap.width(), pixmap.height() ), colorGroup(), st );
-    tqstyle().drawControl( TQStyle::CE_PushButtonLabel, &painter, this, TQRect( 0, 0, pixmap.width(), pixmap.height() ), colorGroup(), st );
+    style().drawControl( TQStyle::CE_PushButton, &painter, this, TQRect( 0, 0, pixmap.width(), pixmap.height() ), colorGroup(), st );
+    style().drawControl( TQStyle::CE_PushButtonLabel, &painter, this, TQRect( 0, 0, pixmap.width(), pixmap.height() ), colorGroup(), st );
 
     switch ( m_position ) {
     case MultiTabBar::Left:

amarok/src/prettypopupmenu.cpp

@@ -74,7 +74,7 @@ PrettyPopupMenu::calcPixmapColor()
 {
     KConfig *config = KGlobal::config();
     config->setGroup("WM");
-    TQColor color = TQApplication::tqpalette().active().highlight();
+    TQColor color = TQApplication::palette().active().highlight();
 //     TQColor activeTitle = TQApplication::palette().active().background();
 //     TQColor inactiveTitle = TQApplication::palette().inactive().background();
     TQColor activeTitle = config->readColorEntry("activeBackground", &color);
@@ -84,7 +84,7 @@ PrettyPopupMenu::calcPixmapColor()
     int h1, s1, v1, h2, s2, v2, h3, s3, v3;
     activeTitle.hsv(&h1, &s1, &v1);
     inactiveTitle.hsv(&h2, &s2, &v2);
-    TQApplication::tqpalette().active().background().hsv(&h3, &s3, &v3);
+    TQApplication::palette().active().background().hsv(&h3, &s3, &v3);
 
     if ( (kAbs(h1-h3)+kAbs(s1-s3)+kAbs(v1-v3) < kAbs(h2-h3)+kAbs(s2-s3)+kAbs(v2-v3)) &&
             ((kAbs(h1-h3)+kAbs(s1-s3)+kAbs(v1-v3) < 32) || (s1 < 32)) && (s2 > s1))

amarok/src/statusbar/popupMessage.cpp

@@ -191,7 +191,7 @@ void PopupMessage::countDown()
     TQFrame *&h = m_countdownFrame;
 
     if( m_counter < h->height() - 3 )
-        TQPainter( h ).fillRect( 2, 2, h->width() - 4, m_counter, tqpalette().active().highlight() );
+        TQPainter( h ).fillRect( 2, 2, h->width() - 4, m_counter, palette().active().highlight() );
 
     if( !hasMouse() )
         m_counter++;

amarok/src/systray.cpp

@@ -175,7 +175,7 @@ Amarok::TrayIcon::engineTrackPositionChanged( long position, bool /*userSeek*/ )
 void
 Amarok::TrayIcon::paletteChange( const TQPalette & op )
 {
-    if ( tqpalette().active().highlight() == op.active().highlight() || alternateIcon.isNull() )
+    if ( palette().active().highlight() == op.active().highlight() || alternateIcon.isNull() )
         return;
 
     alternateIcon.resize( 0, 0 );
@@ -209,7 +209,7 @@ Amarok::TrayIcon::paintIcon( int mergePixels, bool force )
         // eros: this looks cool with dark red blue or green but sucks with
         // other colors (such as kde default's pale pink..). maybe the effect
         // or the blended color has to be changed..
-        TQColor saturatedColor = tqpalette().active().highlight();
+        TQColor saturatedColor = palette().active().highlight();
         int hue, sat, value;
         saturatedColor.getHsv( &hue, &sat, &value );
         saturatedColor.setHsv( hue, sat > 200 ? 200 : sat, value < 100 ? 100 : value );