Rename old tq methods that no longer need a unique name

9 files changed, 65 insertions, 65 deletions

diff --git a/src/cdopener.cpp b/src/cdopener.cpp
index 12779be..318abfe 100755
--- a/src/cdopener.cpp
+++ b/src/cdopener.cpp
@@ -64,13 +64,13 @@ CDOpener::CDOpener( Config* _config, CDManager* _cdManager, TagEngine* _tagEngin
     topGridLayout->addLayout( artistBox, 0, 3 );
     // and fill it up
     TQLabel* lComposerLabel = new TQLabel( i18n("Composer:"), this, "lComposerLabel" );
-    lComposerLabel->tqsetAlignment( TQt::AlignRight | TQt::AlignVCenter );
+    lComposerLabel->setAlignment( TQt::AlignRight | TQt::AlignVCenter );
     topGridLayout->addWidget( lComposerLabel, 0, 2 );
     cComposer = new KComboBox( true, this, "cComposer" );
     artistBox->addWidget( cComposer );
     cComposer->insertItem( i18n("Various Composer") );
     cComposer->setCurrentText( "" );
-    //cComposer->tqsetSizePolicy( TQSizePolicy::Maximum );
+    //cComposer->setSizePolicy( TQSizePolicy::Maximum );
     connect( cComposer, TQT_SIGNAL(textChanged(const TQString&)),
                this, TQT_SLOT(composerChanged(const TQString&))
              );
@@ -89,13 +89,13 @@ CDOpener::CDOpener( Config* _config, CDManager* _cdManager, TagEngine* _tagEngin
     topGridLayout->addLayout( albumBox, 1, 3 );
     // and fill it up
     TQLabel* lDiscLabel = new TQLabel( i18n("Disc No.:"), this, "lDiscLabel" );
-    lDiscLabel->tqsetAlignment( TQt::AlignRight | TQt::AlignVCenter );
+    lDiscLabel->setAlignment( TQt::AlignRight | TQt::AlignVCenter );
     topGridLayout->addWidget( lDiscLabel, 1, 2 );
     iDisc = new KIntSpinBox( 1, 99, 1, 1, 10, this, "iDisc" );
     albumBox->addWidget( iDisc );
     TQLabel* lYearLabel = new TQLabel( i18n("Year:"), this, "lYearLabel" );
     albumBox->addWidget( lYearLabel );
-    iYear = new KIntSpinBox( 0, 99999, 1, TQDate::tqcurrentDate().year(), 10, this, "iYear" );
+    iYear = new KIntSpinBox( 0, 99999, 1, TQDate::currentDate().year(), 10, this, "iYear" );
     albumBox->addWidget( iYear );
     TQLabel* lGenreLabel = new TQLabel( i18n("Genre:"), this, "lGenreLabel" );
     albumBox->addWidget( lGenreLabel );
@@ -165,7 +165,7 @@ CDOpener::CDOpener( Config* _config, CDManager* _cdManager, TagEngine* _tagEngin
              );
     pTrackTitleEdit = new KPushButton( " ", tagGroupBox, "pTrackTitleEdit" );
     pTrackTitleEdit->setPixmap( iconLoader->loadIcon("kwrite",KIcon::Small) );
-    pTrackTitleEdit->setFixedSize( lTrackTitle->tqsizeHint().height(), lTrackTitle->tqsizeHint().height() );
+    pTrackTitleEdit->setFixedSize( lTrackTitle->sizeHint().height(), lTrackTitle->sizeHint().height() );
     pTrackTitleEdit->hide();
     trackTitleBox->addWidget( pTrackTitleEdit );
     connect( pTrackTitleEdit, TQT_SIGNAL(clicked()),
@@ -184,7 +184,7 @@ CDOpener::CDOpener( Config* _config, CDManager* _cdManager, TagEngine* _tagEngin
              );
     pTrackArtistEdit = new KPushButton( " ", tagGroupBox, "pTrackArtistEdit" );
     pTrackArtistEdit->setPixmap( iconLoader->loadIcon("kwrite",KIcon::Small) );
-    pTrackArtistEdit->setFixedSize( lTrackArtist->tqsizeHint().height(), lTrackArtist->tqsizeHint().height() );
+    pTrackArtistEdit->setFixedSize( lTrackArtist->sizeHint().height(), lTrackArtist->sizeHint().height() );
     pTrackArtistEdit->hide();
     trackArtistBox->addWidget( pTrackArtistEdit );
     connect( pTrackArtistEdit, TQT_SIGNAL(clicked()),
@@ -199,7 +199,7 @@ CDOpener::CDOpener( Config* _config, CDManager* _cdManager, TagEngine* _tagEngin
              );
     pTrackComposerEdit = new KPushButton( " ", tagGroupBox, "pTrackComposerEdit" );
     pTrackComposerEdit->setPixmap( iconLoader->loadIcon("kwrite",KIcon::Small) );
-    pTrackComposerEdit->setFixedSize( lTrackComposer->tqsizeHint().height(), lTrackComposer->tqsizeHint().height() );
+    pTrackComposerEdit->setFixedSize( lTrackComposer->sizeHint().height(), lTrackComposer->sizeHint().height() );
     pTrackComposerEdit->hide();
     trackArtistBox->addWidget( pTrackComposerEdit );
     connect( pTrackComposerEdit, TQT_SIGNAL(clicked()),
@@ -219,7 +219,7 @@ CDOpener::CDOpener( Config* _config, CDManager* _cdManager, TagEngine* _tagEngin
              );
     pTrackCommentEdit = new KPushButton( " ", tagGroupBox, "pTrackCommentEdit" );
     pTrackCommentEdit->setPixmap( iconLoader->loadIcon("kwrite",KIcon::Small) );
-    pTrackCommentEdit->setFixedSize( lTrackTitle->tqsizeHint().height(), lTrackTitle->tqsizeHint().height() );
+    pTrackCommentEdit->setFixedSize( lTrackTitle->sizeHint().height(), lTrackTitle->sizeHint().height() );
     pTrackCommentEdit->hide();
     trackCommentBox->addWidget( pTrackCommentEdit );
     connect( pTrackCommentEdit, TQT_SIGNAL(clicked()),
diff --git a/src/combobutton.cpp b/src/combobutton.cpp
index 9b71947..d36b49c 100755
--- a/src/combobutton.cpp
+++ b/src/combobutton.cpp
@@ -43,11 +43,11 @@ void ComboButton::balanceSize()
     int width;
 
     if( m_sizeMode == Max )
-        width = m_box->tqsizeHint().width()-17;
+        width = m_box->sizeHint().width()-17;
     else
-        width = m_button->tqsizeHint().width();
+        width = m_button->sizeHint().width();
 
-    int height = ( m_box->tqsizeHint().height() > m_button->tqsizeHint().height() ) ? m_box->tqsizeHint().height() : m_button->tqsizeHint().height();
+    int height = ( m_box->sizeHint().height() > m_button->sizeHint().height() ) ? m_box->sizeHint().height() : m_button->sizeHint().height();
 
     m_box->setFixedSize( width+17, height+m_increaseHeight );
     m_button->setFixedSize( width, height+m_increaseHeight );
diff --git a/src/configbackendspage.cpp b/src/configbackendspage.cpp
index 7a5f16a..d6ece16 100755
--- a/src/configbackendspage.cpp
+++ b/src/configbackendspage.cpp
@@ -271,7 +271,7 @@ void ConfigBackendsPage::rebuild()
         options.grid->addWidget( options.cEncoder, 0, 1 );
 
         options.lStrength = new TQLabel( i18n("Strength")+":", options.group, options.format );
-        options.lStrength->tqsetAlignment( TQt::AlignRight | TQt::AlignVCenter );
+        options.lStrength->setAlignment( TQt::AlignRight | TQt::AlignVCenter );
         options.lStrength->show();
         options.grid->addWidget( options.lStrength, 0, 2 );
         options.sStrength = new TQSlider( Qt::Horizontal, options.group, options.format );
@@ -296,7 +296,7 @@ void ConfigBackendsPage::rebuild()
                    this, TQT_SLOT(cfgChanged())
                  );
         options.lStrengthDisplay = new TQLabel( "", options.group, options.format );
-        options.lStrengthDisplay->tqsetAlignment( TQt::AlignRight | TQt::AlignVCenter );
+        options.lStrengthDisplay->setAlignment( TQt::AlignRight | TQt::AlignVCenter );
         options.lStrengthDisplay->setEnabled( false );
         options.grid->addWidget( options.lStrengthDisplay, 1, 3 );
 
diff --git a/src/filelist.cpp b/src/filelist.cpp
index de6e46e..771ff47 100755
--- a/src/filelist.cpp
+++ b/src/filelist.cpp
@@ -152,11 +152,11 @@ FileList::FileList( CDManager* _cdManager, TagEngine* _tagEngine, Config* _confi
     grid->setRowStretch( 2, 1 );
     grid->setColStretch( 0, 1 );
     grid->setColStretch( 2, 1 );
-    pScantqStatus = new KProgress( this, "pScanStatus" );
-    pScantqStatus->setMinimumHeight( pScantqStatus->height() );
-    pScantqStatus->setFormat( "%v / %m" );
-    pScantqStatus->hide();
-    grid->addWidget( pScantqStatus, 1, 1 );
+    pScanStatus = new KProgress( this, "pScanStatus" );
+    pScanStatus->setMinimumHeight( pScanStatus->height() );
+    pScanStatus->setFormat( "%v / %m" );
+    pScanStatus->hide();
+    grid->addWidget( pScanStatus, 1, 1 );
     grid->setColStretch( 1, 2 );
 
     contextMenu = new KPopupMenu( this );
@@ -226,9 +226,9 @@ void FileList::viewportPaintEvent( TQPaintEvent* e )
         const uint w = bubble->width() + 20;
         const uint h = bubble->height() + 20;
 
-        p.setBrush( tqcolorGroup().background() );
+        p.setBrush( colorGroup().background() );
         p.drawRoundRect( 15, 15, w, h, (8*200)/w, (8*200)/h );
-        bubble->draw( &p, 20, 20, TQRect(), tqcolorGroup() );
+        bubble->draw( &p, 20, 20, TQRect(), colorGroup() );
     }
 }
 
@@ -379,15 +379,15 @@ int FileList::listDir( const TQString& directory, TQStringList filter, bool recu
             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).tqendsWith("."+(*jt),false) ) {
+                    if( (*it).endsWith("."+(*jt),false) ) {
                         count++;
-                        pScantqStatus->setTotalSteps( count );
+                        pScanStatus->setTotalSteps( count );
                         break;
                     }
                 }
                 if( filter.first() == "" ) {
                     count++;
-                    pScantqStatus->setTotalSteps( count );
+                    pScanStatus->setTotalSteps( count );
                 }
             }
         }
@@ -398,17 +398,17 @@ int FileList::listDir( const TQString& directory, TQStringList filter, bool recu
             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).tqendsWith("."+(*jt),false) ) {
+                    if( (*it).endsWith("."+(*jt),false) ) {
                         addFiles( KURL::encode_string(directory + "/" + *it) );
                         count++;
-                        pScantqStatus->setProgress( count );
+                        pScanStatus->setProgress( count );
                         break;
                     }
                 }
                 if( filter.first() == "" ) {
                     addFiles( KURL::encode_string(directory + "/" + *it) );
                     count++;
-                    pScantqStatus->setProgress( count );
+                    pScanStatus->setProgress( count );
                 }
             }
         }
@@ -567,15 +567,15 @@ void FileList::addFiles( TQStringList fileList, FileListItem* after, bool enable
 
 void FileList::addDir( const TQString& directory, const TQStringList& filter, bool recursive )
 {
-    pScantqStatus->setProgress( 0 );
-    pScantqStatus->setTotalSteps( 0 );
-    pScantqStatus->show(); // show the status while scanning the directories
+    pScanStatus->setProgress( 0 );
+    pScanStatus->setTotalSteps( 0 );
+    pScanStatus->show(); // show the status while scanning the directories
     kapp->processEvents();
 
     int count = listDir( directory, filter, recursive, true );
     listDir( directory, filter, recursive );
 
-    pScantqStatus->hide(); // hide the status bar, when the scan is done
+    pScanStatus->hide(); // hide the status bar, when the scan is done
 }
 
 void FileList::addTracks( const TQString& device, TQValueList<int> trackList )
diff --git a/src/filelist.h b/src/filelist.h
index e34dcf2..3aae97f 100755
--- a/src/filelist.h
+++ b/src/filelist.h
@@ -118,7 +118,7 @@ private:
     int listDir( const TQString& directory, TQStringList filter, bool recursive = true, bool fast = false, int count = 0 );
 
     /** A progressbar, that is shown, when a directory is added recursive */
-    KProgress* pScantqStatus;
+    KProgress* pScanStatus;
 
     void convertNextItem();
 
diff --git a/src/optionsdetailed.cpp b/src/optionsdetailed.cpp
index 7072474..aa1ad24 100755
--- a/src/optionsdetailed.cpp
+++ b/src/optionsdetailed.cpp
@@ -53,7 +53,7 @@ OptionsDetailed::OptionsDetailed( Config* _config, TQWidget *parent, const char
                this, TQT_SLOT(somethingChanged())
              );
     cQualityMode = new KComboBox( normalOptions, "cQualityMode" );
-    cQualityMode->setFixedSize( cQualityMode->tqsizeHint() );
+    cQualityMode->setFixedSize( cQualityMode->sizeHint() );
     normalTopBox->addWidget( cQualityMode, 0, TQt::AlignVCenter );
     connect( cQualityMode, TQT_SIGNAL(activated(int)),
                this, TQT_SLOT(qualityModeChanged())
diff --git a/src/optionseditor.cpp b/src/optionseditor.cpp
index 740f8dd..c31597d 100755
--- a/src/optionseditor.cpp
+++ b/src/optionseditor.cpp
@@ -65,10 +65,10 @@ OptionsEditor::OptionsEditor( TagEngine* _tagEngine, Config* _config, FileList*
 
     lEditOptions = new TQLabel( "", conversionOptions, "lEditOptions" );
     conversionOptionsGridLayout->addWidget( lEditOptions, 2, 0 );
-    lEditOptions->tqsetAlignment( TQt::AlignHCenter );
+    lEditOptions->setAlignment( TQt::AlignHCenter );
     lEditOptions->hide();
     pEditOptions = new KPushButton( i18n("Edit conversion options"), conversionOptions, "pEditOptions" );
-    pEditOptions->setFixedWidth( pEditOptions->tqsizeHint().width() );
+    pEditOptions->setFixedWidth( pEditOptions->sizeHint().width() );
     conversionOptionsGridLayout->addWidget( pEditOptions, 3, 0, TQt::AlignHCenter );
     pEditOptions->hide();
     connect( pEditOptions, TQT_SIGNAL(clicked()),
@@ -94,7 +94,7 @@ OptionsEditor::OptionsEditor( TagEngine* _tagEngine, Config* _config, FileList*
              );
     pTitleEdit = new KPushButton( " ", tags, "pTitleEdit" );
     pTitleEdit->setPixmap( iconLoader->loadIcon("kwrite",KIcon::Small) );
-    pTitleEdit->setFixedSize( lTitle->tqsizeHint().height(), lTitle->tqsizeHint().height() );
+    pTitleEdit->setFixedSize( lTitle->sizeHint().height(), lTitle->sizeHint().height() );
     pTitleEdit->hide();
     titleBox->addWidget( pTitleEdit );
     connect( pTitleEdit, TQT_SIGNAL(clicked()),
@@ -109,7 +109,7 @@ OptionsEditor::OptionsEditor( TagEngine* _tagEngine, Config* _config, FileList*
              );
     pNumberEdit = new KPushButton( " ", tags, "pNumberEdit" );
     pNumberEdit->setPixmap( iconLoader->loadIcon("kwrite",KIcon::Small) );
-    pNumberEdit->setFixedSize( iNumber->tqsizeHint().height(), iNumber->tqsizeHint().height() );
+    pNumberEdit->setFixedSize( iNumber->sizeHint().height(), iNumber->sizeHint().height() );
     pNumberEdit->hide();
     titleBox->addWidget( pNumberEdit );
     connect( pNumberEdit, TQT_SIGNAL(clicked()),
@@ -129,7 +129,7 @@ OptionsEditor::OptionsEditor( TagEngine* _tagEngine, Config* _config, FileList*
              );
     pArtistEdit = new KPushButton( " ", tags, "pArtistEdit" );
     pArtistEdit->setPixmap( iconLoader->loadIcon("kwrite",KIcon::Small) );
-    pArtistEdit->setFixedSize( lArtist->tqsizeHint().height(), lArtist->tqsizeHint().height() );
+    pArtistEdit->setFixedSize( lArtist->sizeHint().height(), lArtist->sizeHint().height() );
     pArtistEdit->hide();
     artistBox->addWidget( pArtistEdit );
     connect( pArtistEdit, TQT_SIGNAL(clicked()),
@@ -144,7 +144,7 @@ OptionsEditor::OptionsEditor( TagEngine* _tagEngine, Config* _config, FileList*
              );
     pComposerEdit = new KPushButton( " ", tags, "pComposerEdit" );
     pComposerEdit->setPixmap( iconLoader->loadIcon("kwrite",KIcon::Small) );
-    pComposerEdit->setFixedSize( lComposer->tqsizeHint().height(), lComposer->tqsizeHint().height() );
+    pComposerEdit->setFixedSize( lComposer->sizeHint().height(), lComposer->sizeHint().height() );
     pComposerEdit->hide();
     artistBox->addWidget( pComposerEdit );
     connect( pComposerEdit, TQT_SIGNAL(clicked()),
@@ -164,7 +164,7 @@ OptionsEditor::OptionsEditor( TagEngine* _tagEngine, Config* _config, FileList*
              );
     pAlbumEdit = new KPushButton( " ", tags, "pAlbumEdit" );
     pAlbumEdit->setPixmap( iconLoader->loadIcon("kwrite",KIcon::Small) );
-    pAlbumEdit->setFixedSize( lAlbum->tqsizeHint().height(), lAlbum->tqsizeHint().height() );
+    pAlbumEdit->setFixedSize( lAlbum->sizeHint().height(), lAlbum->sizeHint().height() );
     pAlbumEdit->hide();
     albumBox->addWidget( pAlbumEdit );
     connect( pAlbumEdit, TQT_SIGNAL(clicked()),
@@ -184,7 +184,7 @@ OptionsEditor::OptionsEditor( TagEngine* _tagEngine, Config* _config, FileList*
              );
     pDiscEdit = new KPushButton( " ", tags, "pDiscEdit" );
     pDiscEdit->setPixmap( iconLoader->loadIcon("kwrite",KIcon::Small) );
-    pDiscEdit->setFixedSize( iDisc->tqsizeHint().height(), iDisc->tqsizeHint().height() );
+    pDiscEdit->setFixedSize( iDisc->sizeHint().height(), iDisc->sizeHint().height() );
     pDiscEdit->hide();
     albumdataBox->addWidget( pDiscEdit );
     connect( pDiscEdit, TQT_SIGNAL(clicked()),
@@ -193,14 +193,14 @@ OptionsEditor::OptionsEditor( TagEngine* _tagEngine, Config* _config, FileList*
     albumdataBox->addStretch();
     lYearLabel = new TQLabel( i18n("Year:"), tags, "lYearLabel" );
     albumdataBox->addWidget( lYearLabel );
-    iYear = new KIntSpinBox( 0, 99999, 1, TQDate::tqcurrentDate().year(), 10, tags, "iYear" );
+    iYear = new KIntSpinBox( 0, 99999, 1, TQDate::currentDate().year(), 10, tags, "iYear" );
     albumdataBox->addWidget( iYear );
     connect( iYear, TQT_SIGNAL(valueChanged(int)),
                this, TQT_SLOT(yearChanged(int))
              );
     pYearEdit = new KPushButton( " ", tags, "pYearEdit" );
     pYearEdit->setPixmap( iconLoader->loadIcon("kwrite",KIcon::Small) );
-    pYearEdit->setFixedSize( iYear->tqsizeHint().height(), iYear->tqsizeHint().height() );
+    pYearEdit->setFixedSize( iYear->sizeHint().height(), iYear->sizeHint().height() );
     pYearEdit->hide();
     albumdataBox->addWidget( pYearEdit );
     connect( pYearEdit, TQT_SIGNAL(clicked()),
@@ -221,7 +221,7 @@ OptionsEditor::OptionsEditor( TagEngine* _tagEngine, Config* _config, FileList*
              );
     pGenreEdit = new KPushButton( " ", tags, "pGenreEdit" );
     pGenreEdit->setPixmap( iconLoader->loadIcon("kwrite",KIcon::Small) );
-    pGenreEdit->setFixedSize( cGenre->tqsizeHint().height(), cGenre->tqsizeHint().height() );
+    pGenreEdit->setFixedSize( cGenre->sizeHint().height(), cGenre->sizeHint().height() );
     pGenreEdit->hide();
     albumdataBox->addWidget( pGenreEdit );
     connect( pGenreEdit, TQT_SIGNAL(clicked()),
@@ -241,7 +241,7 @@ OptionsEditor::OptionsEditor( TagEngine* _tagEngine, Config* _config, FileList*
              );
     pCommentEdit = new KPushButton( " ", tags, "pCommentEdit" );
     pCommentEdit->setPixmap( iconLoader->loadIcon("kwrite",KIcon::Small) );
-    pCommentEdit->setFixedSize( lTitle->tqsizeHint().height(), lTitle->tqsizeHint().height() );
+    pCommentEdit->setFixedSize( lTitle->sizeHint().height(), lTitle->sizeHint().height() );
     pCommentEdit->hide();
     commentBox->addWidget( pCommentEdit );
     connect( pCommentEdit, TQT_SIGNAL(clicked()),
@@ -251,10 +251,10 @@ OptionsEditor::OptionsEditor( TagEngine* _tagEngine, Config* _config, FileList*
 
     lEditTags = new TQLabel( "", tags, "lEditTags" );
     tagsGridLayout->addWidget( lEditTags, 5, 1 );
-    lEditTags->tqsetAlignment( TQt::AlignHCenter );
+    lEditTags->setAlignment( TQt::AlignHCenter );
     lEditTags->hide();
     pEditTags = new KPushButton( i18n("Edit tags"), tags, "pEditTags" );
-    pEditTags->setFixedWidth( pEditTags->tqsizeHint().width() );
+    pEditTags->setFixedWidth( pEditTags->sizeHint().width() );
     tagsGridLayout->addWidget( pEditTags, 6, 1, TQt::AlignHCenter );
     pEditTags->hide();
     connect( pEditTags, TQT_SIGNAL(clicked()),
@@ -446,7 +446,7 @@ void OptionsEditor::itemsSelected( TQValueList<FileListItem*> items )
             }
             if( year != (*it)->tags->year && iYear->isEnabled() ) {
                 iYear->setEnabled( false );
-                iYear->setValue( TQDate::tqcurrentDate().year() );
+                iYear->setValue( TQDate::currentDate().year() );
                 pYearEdit->show();
             }
             if( genre != (*it)->tags->genre && cGenre->isEnabled() ) {
diff --git a/src/replaygainfilelist.cpp b/src/replaygainfilelist.cpp
index c260d17..8c8e70d 100755
--- a/src/replaygainfilelist.cpp
+++ b/src/replaygainfilelist.cpp
@@ -195,11 +195,11 @@ ReplayGainFileList::ReplayGainFileList( TagEngine* _tagEngine, Config* _config,
     grid->setRowStretch( 2, 1 );
     grid->setColStretch( 0, 1 );
     grid->setColStretch( 2, 1 );
-    pScantqStatus = new KProgress( this, "pScanStatus" );
-    pScantqStatus->setMinimumHeight( pScantqStatus->height() );
-    pScantqStatus->setFormat( "%v / %m" );
-    pScantqStatus->hide();
-    grid->addWidget( pScantqStatus, 1, 1 );
+    pScanStatus = new KProgress( this, "pScanStatus" );
+    pScanStatus->setMinimumHeight( pScanStatus->height() );
+    pScanStatus->setFormat( "%v / %m" );
+    pScanStatus->hide();
+    grid->addWidget( pScanStatus, 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( tqcolorGroup().background() );
+        p.setBrush( colorGroup().background() );
         p.drawRoundRect( 15, 15, w, h, (8*200)/w, (8*200)/h );
-        bubble->draw( &p, 20, 20, TQRect(), tqcolorGroup() );
+        bubble->draw( &p, 20, 20, TQRect(), colorGroup() );
     }
 }
 
@@ -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).tqendsWith("."+(*jt),false) ) {
+                    if( (*it).endsWith("."+(*jt),false) ) {
                         count++;
-                        pScantqStatus->setTotalSteps( count );
+                        pScanStatus->setTotalSteps( count );
                         break;
                     }
                 }
                 if( filter.first() == "" ) {
                     count++;
-                    pScantqStatus->setTotalSteps( count );
+                    pScanStatus->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).tqendsWith("."+(*jt),false) ) {
+                    if( (*it).endsWith("."+(*jt),false) ) {
                         addFile( KURL::encode_string(directory + "/" + *it) );
                         count++;
-                        pScantqStatus->setProgress( count );
+                        pScanStatus->setProgress( count );
                         break;
                     }
                 }
                 if( filter.first() == "" ) {
                     addFile( KURL::encode_string(directory + "/" + *it) );
                     count++;
-                    pScantqStatus->setProgress( count );
+                    pScanStatus->setProgress( count );
                 }
             }
         }
@@ -742,15 +742,15 @@ void ReplayGainFileList::addFile( const TQString& file )
 
 void ReplayGainFileList::addDir( const TQString& directory, const TQStringList& filter, bool recursive )
 {
-    pScantqStatus->setProgress( 0 );
-    pScantqStatus->setTotalSteps( 0 );
-    pScantqStatus->show(); // show the status while scanning the directories
+    pScanStatus->setProgress( 0 );
+    pScanStatus->setTotalSteps( 0 );
+    pScanStatus->show(); // show the status while scanning the directories
     kapp->processEvents();
 
     int count = listDir( directory, filter, recursive, true );
     listDir( directory, filter, recursive );
 
-    pScantqStatus->hide(); // hide the status bar, when the scan is done
+    pScanStatus->hide(); // hide the status bar, when the scan is done
 }
 
 void ReplayGainFileList::openAlbums()
diff --git a/src/replaygainfilelist.h b/src/replaygainfilelist.h
index 6cd882c..f888cb5 100755
--- a/src/replaygainfilelist.h
+++ b/src/replaygainfilelist.h
@@ -149,7 +149,7 @@ private:
     int listDir( const TQString& directory, TQStringList filter, bool recursive = true, bool fast = false, int count = 0 );
 
     /** A progressbar, that is shown, when a directory is added recursive */
-    KProgress* pScantqStatus;
+    KProgress* pScanStatus;
 
     TagEngine* tagEngine;
     Config* config;