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

1 files changed, 25 insertions, 25 deletions

diff --git a/amarok/src/covermanager.cpp b/amarok/src/covermanager.cpp
index 1ea6a28d..76530133 100644
--- a/amarok/src/covermanager.cpp
+++ b/amarok/src/covermanager.cpp
@@ -20,10 +20,10 @@
 #include <tqfontmetrics.h>    //paintItem()
 #include <tqimage.h>
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqobjectlist.h>    //used to delete all cover fetchers
 #include <tqpainter.h>    //paintItem()
-#include <tqpalette.h>    //paintItem()
+#include <palette.h>    //paintItem()
 #include <tqpixmap.h>
 #include <tqpoint.h>
 #include <tqprogressdialog.h>
@@ -73,9 +73,9 @@ class ArtistItem : public KListViewItem
         TQString a = text(0);
         TQString b = i->text(0);
 
-        if ( a.tqstartsWith( "the ", false ) )
+        if ( a.startsWith( "the ", false ) )
             CollectionView::manipulateThe( a, true );
-        if ( b.tqstartsWith( "the ", false ) )
+        if ( b.startsWith( "the ", false ) )
             CollectionView::manipulateThe( b, true );
 
         return TQString::localeAwareCompare( a.lower(), b.lower() );
@@ -276,10 +276,10 @@ CoverViewDialog::CoverViewDialog( const TQString& artist, const TQString& album,
 {
     KWin::setType( winId(), NET::Utility );
     kapp->setTopWidget( this );
-    setCaption( kapp->makeStdCaption( i18n("%1 - %2").tqarg( artist, album ) ) );
+    setCaption( kapp->makeStdCaption( i18n("%1 - %2").arg( artist, album ) ) );
 
-    m_tqlayout = new TQHBoxLayout( this );
-    m_tqlayout->setAutoAdd( true );
+    m_layout = new TQHBoxLayout( this );
+    m_layout->setAutoAdd( true );
     m_pixmapViewer = new PixmapViewer( this, m_pixmap );
 
     setFixedSize( m_pixmapViewer->maximalSize() );
@@ -396,7 +396,7 @@ void CoverManager::slotArtistSelected( TQListViewItem *item ) //SLOT
     //NOTE we MUST show the dialog, otherwise the closeEvents get processed
     // in the processEvents() calls below, GRUMBLE! TQt sux0rs
     progress.show();
-    progress.tqrepaint( false );  //ensures the dialog isn't blank
+    progress.repaint( false );  //ensures the dialog isn't blank
 
     //this is an extra processEvent call for the sake of init() and aesthetics
     //it isn't necessary
@@ -499,7 +499,7 @@ void CoverManager::showCoverMenu( TQIconViewItem *item, const TQPoint &p ) //SLO
     }
     else {
         menu.insertItem( SmallIconSet( Amarok::icon( "zoom" ) ), i18n( "&Show Fullsize" ), SHOW );
-        menu.insertItem( SmallIconSet( Amarok::icon( "download" ) ), i18n( "&Fetch From amazon.%1" ).tqarg( CoverManager::amazonTld() ), FETCH );
+        menu.insertItem( SmallIconSet( Amarok::icon( "download" ) ), i18n( "&Fetch From amazon.%1" ).arg( CoverManager::amazonTld() ), FETCH );
         menu.insertItem( SmallIconSet( Amarok::icon( "files" ) ), i18n( "Set &Custom Cover" ), CUSTOM );
         menu.insertItem( SmallIconSet( Amarok::icon( "add_playlist" ) ), i18n( "&Append to Playlist" ), APPEND );
         menu.insertSeparator();
@@ -817,9 +817,9 @@ void CoverManager::updateStatusBar()
             if ( values.count() >= 2 )
             {
                 if( values[0].isEmpty() )
-                    text = i18n( "Fetching cover for %1..." ).tqarg( values[1] );
+                    text = i18n( "Fetching cover for %1..." ).arg( values[1] );
                 else
-                    text = i18n( "Fetching cover for %1 - %2..." ).tqarg( values[0], values[1] );
+                    text = i18n( "Fetching cover for %1 - %2..." ).arg( values[0], values[1] );
             }
         }
         else if( m_fetchingCovers ) {
@@ -851,7 +851,7 @@ void CoverManager::updateStatusBar()
         }
 
         if( !m_filter.isEmpty() )
-            text = i18n( "1 result for \"%1\"", "%n results for \"%1\"", totalCounter ).tqarg( m_filter );
+            text = i18n( "1 result for \"%1\"", "%n results for \"%1\"", totalCounter ).arg( m_filter );
         else if( m_artistView->selectedItem() ) {
             text = i18n( "1 album", "%n albums", totalCounter );
             if( m_artistView->selectedItem() != m_artistView->firstChild() ) //showing albums by an artist
@@ -864,7 +864,7 @@ void CoverManager::updateStatusBar()
         }
 
         if( missingCounter )
-            text += i18n(" - ( <b>%1</b> without cover )" ).tqarg( missingCounter );
+            text += i18n(" - ( <b>%1</b> without cover )" ).arg( missingCounter );
 
         #ifdef AMAZON_SUPPORT
         m_fetchButton->setEnabled( missingCounter );
@@ -912,7 +912,7 @@ TQDragObject *CoverView::dragObject()
        return 0;
 
     const TQString sql = "SELECT tags.url FROM tags, album WHERE album.name %1 AND tags.album = album.id ORDER BY tags.track;";
-    const TQStringList values = CollectionDB::instance()->query( sql.tqarg( CollectionDB::likeCondition( item->album() ) ) );
+    const TQStringList values = CollectionDB::instance()->query( sql.arg( CollectionDB::likeCondition( item->album() ) ) );
 
     KURL::List urls;
     for( TQStringList::ConstIterator it = values.begin(), end = values.end(); it != end; ++it )
@@ -939,8 +939,8 @@ void CoverView::setStatusText( TQIconViewItem *item )
     //FIXME: Don't rely on other independent code, use an sql query
     if( item->artist().isEmpty() ) sampler = true;
 
-    TQString tipContent = i18n( "%1 - %2" ).tqarg( sampler ? i18n("Various Artists") : item->artist() )
-                                          .tqarg( item->album() );
+    TQString tipContent = i18n( "%1 - %2" ).arg( sampler ? i18n("Various Artists") : item->artist() )
+                                          .arg( item->album() );
 
     CoverManager::instance()->setStatusText( tipContent );
 
@@ -973,7 +973,7 @@ void CoverViewItem::loadCover()
     m_coverImagePath = CollectionDB::instance()->albumImage( m_artist, m_album, false, 1, &m_embedded );
     m_coverPixmap = TQPixmap( m_coverImagePath );  //create the scaled cover
 
-    tqrepaint();
+    repaint();
 }
 
 
@@ -983,27 +983,27 @@ void CoverViewItem::calcRect( const TQString& )
 
     TQFontMetrics fm = iconView()->fontMetrics();
     TQRect itemPixmapRect( 5, 1, thumbWidth, thumbWidth );
-    TQRect tqitemRect = rect();
-    tqitemRect.setWidth( thumbWidth + 10 );
-    tqitemRect.setHeight( thumbWidth + fm.lineSpacing() + 2 );
-    TQRect itemTextRect( 0, thumbWidth+2, tqitemRect.width(), fm.lineSpacing() );
+    TQRect itemRect = rect();
+    itemRect.setWidth( thumbWidth + 10 );
+    itemRect.setHeight( thumbWidth + fm.lineSpacing() + 2 );
+    TQRect itemTextRect( 0, thumbWidth+2, itemRect.width(), fm.lineSpacing() );
 
     setPixmapRect( itemPixmapRect );
     setTextRect( itemTextRect );
-    setItemRect( tqitemRect );
+    setItemRect( itemRect );
 }
 
 
 void CoverViewItem::paintItem(TQPainter* p, const TQColorGroup& cg)
 {
-    TQRect tqitemRect = rect();
+    TQRect itemRect = rect();
 
     p->save();
-    p->translate( tqitemRect.x(), tqitemRect.y() );
+    p->translate( itemRect.x(), itemRect.y() );
 
     // draw the border
     p->setPen( cg.mid() );
-    p->drawRect( 0, 0, tqitemRect.width(), pixmapRect().height()+2 );
+    p->drawRect( 0, 0, itemRect.width(), pixmapRect().height()+2 );
 
     // draw the cover image
     if( !m_coverPixmap.isNull() )