Rename a number of old tq methods that are no longer tq specific

1 files changed, 14 insertions, 14 deletions

diff --git a/amarok/src/osd.cpp b/amarok/src/osd.cpp
index 6e5bd7f7..a475f33a 100644
--- a/amarok/src/osd.cpp
+++ b/amarok/src/osd.cpp
@@ -52,7 +52,7 @@ OSDWidget::OSDWidget( TQWidget *parent, const char *name )
         : TQWidget( parent, name, WType_TopLevel | WNoAutoErase | WStyle_Customize | WX11BypassWM | WStyle_StaysOnTop )
         , m_duration( 2000 )
         , m_timer( new TQTimer( this ) )
-        , m_tqalignment( Middle )
+        , m_alignment( Middle )
         , m_screen( 0 )
         , m_y( MARGIN )
         , m_drawShadow( false )
@@ -118,7 +118,7 @@ OSDWidget::volChanged( unsigned char volume )
     {
         m_volume = true;
         m_newvolume = volume;
-        m_text = m_newvolume ? i18n("Volume: %1%").tqarg( m_newvolume ) : i18n("Mute");
+        m_text = m_newvolume ? i18n("Volume: %1%").arg( m_newvolume ) : i18n("Mute");
 
         show();
     }
@@ -247,7 +247,7 @@ OSDWidget::determineMetrics( const uint M )
     const TQRect screen = TQApplication::desktop()->screenGeometry( m_screen );
     TQPoint newPos( MARGIN, m_y );
 
-    switch( m_tqalignment )
+    switch( m_alignment )
     {
         case Left:
             break;
@@ -349,8 +349,8 @@ OSDWidget::render( const uint M, const TQSize &size )
             const uint shadowSize = static_cast<uint>( m_scaledCover.width() / 100.0 * 6.0 );
 
             const TQString folder = Amarok::saveLocation( "covershadow-cache/" );
-            const TQString file = TQString( "shadow_albumcover%1x%2.png" ).tqarg( m_scaledCover.width()  + shadowSize )
-                                                                        .tqarg( m_scaledCover.height() + shadowSize );
+            const TQString file = TQString( "shadow_albumcover%1x%2.png" ).arg( m_scaledCover.width()  + shadowSize )
+                                                                        .arg( m_scaledCover.height() + shadowSize );
             if ( TQFile::exists( folder + file ) )
                 shadow.load( folder + file );
             else {
@@ -395,8 +395,8 @@ OSDWidget::render( const uint M, const TQSize &size )
             p.end();
 
             pixmapGradient = TQPixmap( vol.size() );
-            KPixmapEffect::gradient( pixmapGradient, tqcolorGroup().background(),
-                tqcolorGroup().highlight(), KPixmapEffect::EllipticGradient );
+            KPixmapEffect::gradient( pixmapGradient, colorGroup().background(),
+                colorGroup().highlight(), KPixmapEffect::EllipticGradient );
             pixmapGradient.setMask( mask );
         }
 
@@ -580,7 +580,7 @@ OSDWidget::mousePressEvent( TQMouseEvent* )
 void
 OSDWidget::unsetColors()
 {
-    const TQColorGroup c = TQApplication::tqpalette().active();
+    const TQColorGroup c = TQApplication::palette().active();
 
     setPaletteForegroundColor( c.highlightedText() );
     setPaletteBackgroundColor( c.highlight() );
@@ -670,11 +670,11 @@ void OSDPreviewWidget::mouseMoveEvent( TQMouseEvent *e )
         if( destination.y() > maxY ) destination.ry() = maxY;
 
         if( eGlobalPosX < (hcenter-snapZone) ) {
-            m_tqalignment = Left;
+            m_alignment = Left;
             destination.rx() = MARGIN;
         }
         else if( eGlobalPosX > (hcenter+snapZone) ) {
-            m_tqalignment = Right;
+            m_alignment = Right;
             destination.rx() = screen.width() - MARGIN - width();
         }
         else {
@@ -685,10 +685,10 @@ void OSDPreviewWidget::mouseMoveEvent( TQMouseEvent *e )
 
             if( eGlobalPosY >= (vcenter-snapZone) && eGlobalPosY <= (vcenter+snapZone) )
             {
-                m_tqalignment = Center;
+                m_alignment = Center;
                 destination.ry() = vcenter - height()/2;
             }
-            else m_tqalignment = Middle;
+            else m_alignment = Middle;
         }
 
         destination += screen.topLeft();
@@ -760,7 +760,7 @@ Amarok::OSD::show( const MetaBundle &bundle ) //slot
                                : ( parens.contains( column ) || parens.contains( availableTags.at( i - 1 ) ) ) ? " "
                                : i18n(" - ");
                 append += ( parens.contains( column ) ? "(%1)" : "%1" );
-                text += append.tqarg( tags.at( column + 1 ) );
+                text += append.arg( tags.at( column + 1 ) );
             }
         }
         else
@@ -849,7 +849,7 @@ Amarok::OSD::show( const MetaBundle &bundle ) //slot
 void
 Amarok::OSD::applySettings()
 {
-    tqsetAlignment( static_cast<OSDWidget::Alignment>( AmarokConfig::osdAlignment() ) );
+    setAlignment( static_cast<OSDWidget::Alignment>( AmarokConfig::osdAlignment() ) );
     setDuration( AmarokConfig::osdDuration() );
 #ifdef TQ_WS_X11
     setEnabled( AmarokConfig::osdEnabled() );