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

This reverts commit 4614cf2e7bce250f5b9cdef409cb89330d60bb1d.

1 files changed, 52 insertions, 52 deletions

diff --git a/src/replaygainfilelist.cpp b/src/replaygainfilelist.cpp
index 0ddfb55..c260d17 100755
--- a/src/replaygainfilelist.cpp
+++ b/src/replaygainfilelist.cpp
@@ -11,7 +11,7 @@
 #include <tqsimplerichtext.h>
 #include <tqapplication.h>
 #include <tqheader.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqtimer.h>
 
 #include <klocale.h>
@@ -63,7 +63,7 @@ ReplayGainFileListItem::ReplayGainFileListItem( ReplayGainFileListItem* parent )
 ReplayGainFileListItem::~ReplayGainFileListItem()
 {}
 
-void ReplayGainFileListItem::paintCell( TQPainter *p, const TQColorGroup &cg, int column, int width, int alignment )
+void ReplayGainFileListItem::paintCell( TQPainter *p, const TQColorGroup &cg, int column, int width, int tqalignment )
 {
     // NOTE speed up this function
     // NOTE calculate the red color
@@ -76,46 +76,46 @@ void ReplayGainFileListItem::paintCell( TQPainter *p, const TQColorGroup &cg, in
         int margin = listView()->itemMargin();
         int w = width - 2*margin;
         int h = height();
-        TQRect textRect = p->boundingRect( margin, 0, w, h, alignment, text(column) );
+        TQRect textRect = p->boundingRect( margin, 0, w, h, tqalignment, text(column) );
 
         if( textRect.width() > w ) {
-            alignment = TQt::AlignRight | TQt::SingleLine;
+            tqalignment = TQt::AlignRight | TQt::SingleLine;
         }
     }
 
     if( isSelected() && addingReplayGain ) {
         _cg.setColor( TQColorGroup::Highlight, TQColor( 215, 62, 62 ) );
-        TQListViewItem::paintCell( p, _cg, column, width, alignment );
+        TQListViewItem::paintCell( p, _cg, column, width, tqalignment );
         return;
     }
     else if( addingReplayGain && column != listView()->sortColumn() ) {
         _cg.setColor( TQColorGroup::Base, TQColor( 255, 234, 234 ) );
-        TQListViewItem::paintCell( p, _cg, column, width, alignment );
+        TQListViewItem::paintCell( p, _cg, column, width, tqalignment );
         return;
     }
     else if( addingReplayGain && column == listView()->sortColumn() ) {
         _cg.setColor( TQColorGroup::Base, TQColor( 247, 227, 227 ) );
-        TQListViewItem::paintCell( p, _cg, column, width, alignment );
+        TQListViewItem::paintCell( p, _cg, column, width, tqalignment );
         return;
     }
 
     if( isSelected() && queued ) {
         _cg.setColor( TQColorGroup::Highlight, TQColor( 230, 232, 100 ) );
-        TQListViewItem::paintCell( p, _cg, column, width, alignment );
+        TQListViewItem::paintCell( p, _cg, column, width, tqalignment );
         return;
     }
     else if( queued && column != listView()->sortColumn() ) {
         _cg.setColor( TQColorGroup::Base, TQColor( 255, 255, 190 ) );
-        TQListViewItem::paintCell( p, _cg, column, width, alignment );
+        TQListViewItem::paintCell( p, _cg, column, width, tqalignment );
         return;
     }
     else if( queued && column == listView()->sortColumn() ) {
         _cg.setColor( TQColorGroup::Base, TQColor( 255, 243, 168 ) );
-        TQListViewItem::paintCell( p, _cg, column, width, alignment );
+        TQListViewItem::paintCell( p, _cg, column, width, tqalignment );
         return;
     }
 
-    KListViewItem::paintCell( p, _cg, column, width, alignment );
+    KListViewItem::paintCell( p, _cg, column, width, tqalignment );
 }
 
 void ReplayGainFileListItem::setType( Type type )
@@ -195,11 +195,11 @@ ReplayGainFileList::ReplayGainFileList( TagEngine* _tagEngine, Config* _config,
     grid->setRowStretch( 2, 1 );
     grid->setColStretch( 0, 1 );
     grid->setColStretch( 2, 1 );
-    pScanStatus = new KProgress( this, "pScanStatus" );
-    pScanStatus->setMinimumHeight( pScanStatus->height() );
-    pScanStatus->setFormat( "%v / %m" );
-    pScanStatus->hide();
-    grid->addWidget( pScanStatus, 1, 1 );
+    pScantqStatus = new KProgress( this, "pScanStatus" );
+    pScantqStatus->setMinimumHeight( pScantqStatus->height() );
+    pScantqStatus->setFormat( "%v / %m" );
+    pScantqStatus->hide();
+    grid->addWidget( pScantqStatus, 1, 1 );
     grid->setColStretch( 1, 2 );
 
     contextMenu = new KPopupMenu( this );
@@ -279,9 +279,9 @@ void ReplayGainFileList::viewportPaintEvent( TQPaintEvent* e )
         const uint w = bubble->width() + 20;
         const uint h = bubble->height() + 20;
 
-        p.setBrush( colorGroup().background() );
+        p.setBrush( tqcolorGroup().background() );
         p.drawRoundRect( 15, 15, w, h, (8*200)/w, (8*200)/h );
-        bubble->draw( &p, 20, 20, TQRect(), colorGroup() );
+        bubble->draw( &p, 20, 20, TQRect(), tqcolorGroup() );
     }
 }
 
@@ -512,15 +512,15 @@ int ReplayGainFileList::listDir( const TQString& directory, TQStringList filter,
             else if( !fileInfo.isDir() || !recursive ) { // NOTE checking for isFile may not work with all file names
                 // NOTE filter feature
                 for( TQStringList::Iterator jt = filter.begin(); jt != filter.end(); ++jt ) {
-                    if( (*it).endsWith("."+(*jt),false) ) {
+                    if( (*it).tqendsWith("."+(*jt),false) ) {
                         count++;
-                        pScanStatus->setTotalSteps( count );
+                        pScantqStatus->setTotalSteps( count );
                         break;
                     }
                 }
                 if( filter.first() == "" ) {
                     count++;
-                    pScanStatus->setTotalSteps( count );
+                    pScantqStatus->setTotalSteps( count );
                 }
             }
         }
@@ -531,17 +531,17 @@ int ReplayGainFileList::listDir( const TQString& directory, TQStringList filter,
             else if( !fileInfo.isDir() || !recursive ) { // NOTE checking for isFile may not work with all file names
                 // NOTE filter feature
                 for( TQStringList::Iterator jt = filter.begin(); jt != filter.end(); ++jt ) {
-                    if( (*it).endsWith("."+(*jt),false) ) {
+                    if( (*it).tqendsWith("."+(*jt),false) ) {
                         addFile( KURL::encode_string(directory + "/" + *it) );
                         count++;
-                        pScanStatus->setProgress( count );
+                        pScantqStatus->setProgress( count );
                         break;
                     }
                 }
                 if( filter.first() == "" ) {
                     addFile( KURL::encode_string(directory + "/" + *it) );
                     count++;
-                    pScanStatus->setProgress( count );
+                    pScantqStatus->setProgress( count );
                 }
             }
         }
@@ -742,15 +742,15 @@ void ReplayGainFileList::addFile( const TQString& file )
 
 void ReplayGainFileList::addDir( const TQString& directory, const TQStringList& filter, bool recursive )
 {
-    pScanStatus->setProgress( 0 );
-    pScanStatus->setTotalSteps( 0 );
-    pScanStatus->show(); // show the status while scanning the directories
+    pScantqStatus->setProgress( 0 );
+    pScantqStatus->setTotalSteps( 0 );
+    pScantqStatus->show(); // show the status while scanning the directories
     kapp->processEvents();
 
     int count = listDir( directory, filter, recursive, true );
     listDir( directory, filter, recursive );
 
-    pScanStatus->hide(); // hide the status bar, when the scan is done
+    pScantqStatus->hide(); // hide the status bar, when the scan is done
 }
 
 void ReplayGainFileList::openAlbums()
@@ -836,18 +836,18 @@ void ReplayGainFileList::calcSelectedItemsGain()
         if( item->type() == ReplayGainFileListItem::File ) {
             if( item->isSelected() ) {
                 item->queued = true;
-                item->repaint();
+                item->tqrepaint();
                 item->mode = ReplayGainFileListItem::force;
             }
         }
         else {
             if( item->isSelected() ) {
                 item->queued = true;
-                item->repaint();
+                item->tqrepaint();
                 item->mode = ReplayGainFileListItem::force;
                 for( ReplayGainFileListItem* sub_item = item->firstChild(); sub_item != 0; sub_item = sub_item->nextSibling() ) {
                     sub_item->queued = true;
-                    sub_item->repaint();
+                    sub_item->tqrepaint();
                     sub_item->mode = ReplayGainFileListItem::force;
                 }
             }
@@ -855,11 +855,11 @@ void ReplayGainFileList::calcSelectedItemsGain()
                 for( ReplayGainFileListItem* sub_item = item->firstChild(); sub_item != 0; sub_item = sub_item->nextSibling() ) {
                     if( sub_item->isSelected() ) {
                         item->queued = true;
-                        item->repaint();
+                        item->tqrepaint();
                         item->mode = ReplayGainFileListItem::force;
                         for( ReplayGainFileListItem* sub_item2 = item->firstChild(); sub_item2 != 0; sub_item2 = sub_item2->nextSibling() ) {
                             sub_item2->queued = true;
-                            sub_item2->repaint();
+                            sub_item2->tqrepaint();
                             sub_item2->mode = ReplayGainFileListItem::force;
                         }
                         break;
@@ -878,18 +878,18 @@ void ReplayGainFileList::removeSelectedItemsGain()
         if( item->type() == ReplayGainFileListItem::File ) {
             if( item->isSelected() && !item->addingReplayGain ) {
                 item->queued = true;
-                item->repaint();
+                item->tqrepaint();
                 item->mode = ReplayGainFileListItem::remove;
             }
         }
         else {
             if( item->isSelected() && !item->addingReplayGain ) {
                 item->queued = true;
-                item->repaint();
+                item->tqrepaint();
                 item->mode = ReplayGainFileListItem::remove;
                 for( ReplayGainFileListItem* sub_item = item->firstChild(); sub_item != 0; sub_item = sub_item->nextSibling() ) {
                     sub_item->queued = true;
-                    sub_item->repaint();
+                    sub_item->tqrepaint();
                     sub_item->mode = ReplayGainFileListItem::remove;
                 }
             }
@@ -897,7 +897,7 @@ void ReplayGainFileList::removeSelectedItemsGain()
                 for( ReplayGainFileListItem* sub_item = item->firstChild(); sub_item != 0; sub_item = sub_item->nextSibling() ) {
                     if( sub_item->isSelected() && !sub_item->addingReplayGain ) {
                         sub_item->queued = true;
-                        sub_item->repaint();
+                        sub_item->tqrepaint();
                         sub_item->mode = ReplayGainFileListItem::remove;
                     }
                 }
@@ -926,12 +926,12 @@ void ReplayGainFileList::calcReplayGain( ReplayGainFileListItem* item )
     if( item->type() == ReplayGainFileListItem::Album ) {
         item->queued = false;
         item->addingReplayGain = true;
-        item->repaint();
+        item->tqrepaint();
         for( ReplayGainFileListItem* sub_item = item->firstChild(); sub_item != 0; sub_item = sub_item->nextSibling() ) {
             if( sub_item->queued && sub_item->mode & ReplayGainFileListItem::force ) force = true; // NOTE can this be replaced by checking item?
             sub_item->queued = false;
             sub_item->addingReplayGain = true;
-            sub_item->repaint();
+            sub_item->tqrepaint();
 
             fileList += sub_item->filePathName;
             files++;
@@ -953,10 +953,10 @@ void ReplayGainFileList::calcReplayGain( ReplayGainFileListItem* item )
         else {
             logger->processCompleted( logID, 0 );
             item->addingReplayGain = false;
-            item->repaint();
+            item->tqrepaint();
             for( ReplayGainFileListItem* sub_item = item->firstChild(); sub_item != 0; sub_item = sub_item->nextSibling() ) {
                 sub_item->addingReplayGain = false;
-                sub_item->repaint();
+                sub_item->tqrepaint();
             }
             processNextFile();
         }
@@ -966,7 +966,7 @@ void ReplayGainFileList::calcReplayGain( ReplayGainFileListItem* item )
 
         item->queued = false;
         item->addingReplayGain = true;
-        item->repaint();
+        item->tqrepaint();
 
         files = 1;
         timeCount = item->time;
@@ -989,13 +989,13 @@ void ReplayGainFileList::removeReplayGain( ReplayGainFileListItem* item )
     if( item->type() == ReplayGainFileListItem::File ) {
         item->queued = false;
         item->addingReplayGain = true;
-        item->repaint();
+        item->tqrepaint();
         timeCount = item->time;
         replayGain->apply( item->filePathName, item->mimeType, process, logID, ReplayGain::remove );
     }
     else {
         item->queued = false;
-        item->repaint();
+        item->tqrepaint();
         processNextFile();
     }
 }
@@ -1201,43 +1201,43 @@ void ReplayGainFileList::processExit( KProcess* proc )
             if( item->addingReplayGain ) {
                 processedTime += item->time;
                 item->addingReplayGain = false;
-                item->repaint();
+                item->tqrepaint();
                 item->updateReplayGainCells( tagEngine->readTags(KURL::decode_string(item->filePathName)) );
             }
             if( item->queued && proc->signalled() ) {
                 item->queued = false;
-                item->repaint();
+                item->tqrepaint();
             }
         }
         else {
             if( item->addingReplayGain ) {
                 item->addingReplayGain = false;
-                item->repaint();
+                item->tqrepaint();
                 for( ReplayGainFileListItem* sub_item = item->firstChild(); sub_item != 0; sub_item = sub_item->nextSibling() ) {
                     processedTime += sub_item->time;
                     sub_item->addingReplayGain = false;
-                    sub_item->repaint();
+                    sub_item->tqrepaint();
                     sub_item->updateReplayGainCells( tagEngine->readTags(KURL::decode_string(sub_item->filePathName)) );
                 }
             }
             if( item->queued && proc->signalled() ) {
                 item->queued = false;
-                item->repaint();
+                item->tqrepaint();
                 for( ReplayGainFileListItem* sub_item = item->firstChild(); sub_item != 0; sub_item = sub_item->nextSibling() ) {
                     sub_item->queued = false;
-                    sub_item->repaint();
+                    sub_item->tqrepaint();
                 }
             }
             for( ReplayGainFileListItem* sub_item = item->firstChild(); sub_item != 0; sub_item = sub_item->nextSibling() ) {
                 if( sub_item->addingReplayGain ) {
                     processedTime += sub_item->time;
                     sub_item->addingReplayGain = false;
-                    sub_item->repaint();
+                    sub_item->tqrepaint();
                     sub_item->updateReplayGainCells( tagEngine->readTags(KURL::decode_string(sub_item->filePathName)) );
                 }
                 if( sub_item->queued && proc->signalled() ) {
                     sub_item->queued = false;
-                    sub_item->repaint();
+                    sub_item->tqrepaint();
                 }
             }
         }