Rename old tq methods that no longer need a unique name

1 files changed, 22 insertions, 22 deletions

diff --git a/amarok/src/playlist.cpp b/amarok/src/playlist.cpp
index 42b6bd4a..3f36e2cd 100644
--- a/amarok/src/playlist.cpp
+++ b/amarok/src/playlist.cpp
@@ -166,7 +166,7 @@ Playlist *Playlist::s_instance = 0;
 Playlist::Playlist( TQWidget *parent )
         : KListView( parent, "ThePlaylist" )
         , EngineObserver( EngineController::instance() )
-        , m_startupTime_t( TQDateTime::tqcurrentDateTime().toTime_t() )
+        , m_startupTime_t( TQDateTime::currentDateTime().toTime_t() )
         , m_oldestTime_t( CollectionDB::instance()->query( "SELECT MIN( createdate ) FROM statistics;" ).first().toInt() )
         , m_currentTrack( 0 )
         , m_marker( 0 )
@@ -958,7 +958,7 @@ Playlist::playNextTrack( bool forceNext )
 
         if( !AmarokConfig::randomMode() ) {
             item = MyIt::nextVisible( item );
-            while( item && ( !checkFiletqStatus( item ) || !item->exists() ) )
+            while( item && ( !checkFileStatus( item ) || !item->exists() ) )
                 item = MyIt::nextVisible( item );
             setCurrentTrack( item );
         }
@@ -1002,7 +1002,7 @@ Playlist::playNextTrack( bool forceNext )
             }
             else
                 for( MyIt it( this ); *it; ++it )
-                    if ( !m_prevTracks.containsRef( *it ) && checkFiletqStatus( *it ) && (*it)->exists() )
+                    if ( !m_prevTracks.containsRef( *it ) && checkFileStatus( *it ) && (*it)->exists() )
                         tracks.push_back( *it );
             if( tracks.isEmpty() )
             {
@@ -1082,7 +1082,7 @@ Playlist::playNextTrack( bool forceNext )
                     item = tracks.at( KApplication::random() % tracks.count() ); //is O(1)
                 else
                 {
-                    const uint currenttime_t = TQDateTime::tqcurrentDateTime().toTime_t();
+                    const uint currenttime_t = TQDateTime::currentDateTime().toTime_t();
                     TQValueVector<int> weights( tracks.size() );
                     TQ_INT64 total = m_total;
                     if( Amarok::randomAlbums() )
@@ -1131,13 +1131,13 @@ Playlist::playNextTrack( bool forceNext )
         else if( item )
         {
             item = MyIt::nextVisible( item );
-            while( item && ( !checkFiletqStatus( item ) || !item->exists() ) )
+            while( item && ( !checkFileStatus( item ) || !item->exists() ) )
                 item = MyIt::nextVisible( item );
         }
         else
         {
             item = *MyIt( this ); //ie. first visible item
-            while( item && ( !checkFiletqStatus( item ) || !item->exists() ) )
+            while( item && ( !checkFileStatus( item ) || !item->exists() ) )
                 item = item->nextSibling();
         }
 
@@ -1227,7 +1227,7 @@ Playlist::playPrevTrack()
         if( !item )
         {
             item = *static_cast<MyIt&>(--MyIt( item ));
-            while( item && !checkFiletqStatus( item ) )
+            while( item && !checkFileStatus( item ) )
                 item = *static_cast<MyIt&>(--MyIt( item ));
         }
     }
@@ -1241,13 +1241,13 @@ Playlist::playPrevTrack()
             if( item )
             {
                 item = MyIt::prevVisible( item );
-                while( item && ( !checkFiletqStatus( item ) || !item->isEnabled() ) )
+                while( item && ( !checkFileStatus( item ) || !item->isEnabled() ) )
                     item = MyIt::prevVisible( item );
             }
             else
             {
                 item = *MyIt( this ); //ie. first visible item
-                while( item && ( !checkFiletqStatus( item ) || !item->isEnabled() ) )
+                while( item && ( !checkFileStatus( item ) || !item->isEnabled() ) )
                     item = item->nextSibling();
             }
         }
@@ -1562,7 +1562,7 @@ Playlist::slotCountChanged()
 }
 
 bool
-Playlist::checkFiletqStatus( PlaylistItem * item )
+Playlist::checkFileStatus( PlaylistItem * item )
 {
     //DEBUG_BLOCK
     //debug() << "uniqueid of item = " << item->uniqueId() << ", url = " << item->url().path() << endl;
@@ -1622,7 +1622,7 @@ Playlist::activate( TQListViewItem *item )
 
     #define item static_cast<PlaylistItem*>(item)
 
-    if ( !checkFiletqStatus( item ) )
+    if ( !checkFileStatus( item ) )
     {
         Amarok::StatusBar::instance()->shortMessage( i18n("Local file does not exist.") );
         return;
@@ -1712,7 +1712,7 @@ TQPair<TQString, TQRect> Playlist::toolTipText( TQWidget*, const TQPoint &pos )
     else
         text = item->text( col );
 
-    TQRect irect = tqitemRect( item );
+    TQRect irect = itemRect( item );
     const int headerPos = header()->sectionPos( col );
     irect.setLeft( headerPos - 1 );
     irect.setRight( headerPos + header()->sectionSize( col ) );
@@ -2277,7 +2277,7 @@ Playlist::writeTag( TQListViewItem *qitem, const TQString &, int column ) //SLOT
 
     for( PlaylistItem *item = m_itemsToChangeTagsFor.first(); item; item = m_itemsToChangeTagsFor.next() )
     {
-        if( !checkFiletqStatus( item ) )
+        if( !checkFileStatus( item ) )
             continue;
 
         const TQString oldTag = item == qitem ? m_editOldTag : item->exactText(column);
@@ -2340,8 +2340,8 @@ Playlist::paletteChange( const TQPalette &p )
 
         const uint steps = STEPS+5+5; //so we don't fade all the way to base, and all the way up to highlight either
 
-        fg = tqcolorGroup().highlight();
-        bg = tqcolorGroup().base();
+        fg = colorGroup().highlight();
+        bg = colorGroup().base();
 
         dr = double(bg.red() - fg.red()) / steps;
         dg = double(bg.green() - fg.green()) / steps;
@@ -2357,8 +2357,8 @@ Playlist::paletteChange( const TQPalette &p )
 
         const uint steps = STEPS + 5; //so we don't fade all the way to base
 
-        fg = tqcolorGroup().highlightedText();
-        bg = tqcolorGroup().text();
+        fg = colorGroup().highlightedText();
+        bg = colorGroup().text();
 
         dr = double(bg.red() - fg.red()) / steps;
         dg = double(bg.green() - fg.green()) / steps;
@@ -2404,7 +2404,7 @@ Playlist::contentsDragMoveEvent( TQDragMoveEvent* e )
     const TQPoint p = contentsToViewport( e->pos() );
     TQListViewItem *item = itemAt( p );
     if( !item || ctrlPressed ) item = lastItem();
-    else if( p.y() - tqitemRect( item ).top() < (item->height()/2) ) item = item->itemAbove();
+    else if( p.y() - itemRect( item ).top() < (item->height()/2) ) item = item->itemAbove();
 
     if( item != m_marker ) {
         //NOTE this if block prevents flicker
@@ -2532,7 +2532,7 @@ Playlist::viewportPaintEvent( TQPaintEvent *e )
         TQPainter p( viewport() );
         p.fillRect(
                 drawDropVisualizer( 0, 0, m_marker ),
-                TQBrush( tqcolorGroup().highlight().dark(), TQBrush::Dense4Pattern ) );
+                TQBrush( colorGroup().highlight().dark(), TQBrush::Dense4Pattern ) );
     }
     else if( m_showHelp && isEmpty() ) {
         TQPainter p( viewport() );
@@ -2569,9 +2569,9 @@ Playlist::viewportPaintEvent( TQPaintEvent *e )
         const uint x = (viewport()->width() - w - 30) / 2 ;
         const uint y = (viewport()->height() - h - 30) / 2 ;
 
-        p.setBrush( tqcolorGroup().background() );
+        p.setBrush( colorGroup().background() );
         p.drawRoundRect( x, y, w+30, h+30, (8*200)/w, (8*200)/h );
-        t->draw( &p, x+15, y+15, TQRect(), tqcolorGroup() );
+        t->draw( &p, x+15, y+15, TQRect(), colorGroup() );
         delete t;
     }
 }
@@ -4734,7 +4734,7 @@ Playlist::showTagDialog( TQPtrList<TQListViewItem> items )
             TagDialog *dialog = new TagDialog( *item, item, instance() );
             dialog->show();
         }
-        else if ( checkFiletqStatus( item ) )
+        else if ( checkFileStatus( item ) )
         {
             TagDialog *dialog = new TagDialog( *item, item, instance() );
             dialog->show();