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

1 files changed, 22 insertions, 22 deletions

diff --git a/src/optionseditor.cpp b/src/optionseditor.cpp
index 740f8dd..262bd8d 100755
--- a/src/optionseditor.cpp
+++ b/src/optionseditor.cpp
@@ -6,7 +6,7 @@
 #include "conversionoptions.h"
 #include "outputdirectory.h"
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqstring.h>
 #include <tqlabel.h>
 #include <tqdatetime.h>
@@ -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()),
@@ -81,7 +81,7 @@ OptionsEditor::OptionsEditor( TagEngine* _tagEngine, Config* _config, FileList*
     TQGridLayout* tagsGridLayout = new TQGridLayout( tags, 1, 1, 0, 6, "tagsGridLayout" );
 
     // add the inputs
-    // add a horizontal box tqlayout for the title and track number
+    // add a horizontal box layout for the title and track number
     TQHBoxLayout *titleBox = new TQHBoxLayout( -1, "titleBox" );
     tagsGridLayout->addLayout( titleBox, 0, 1 );
     // and fill it up
@@ -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,14 +109,14 @@ 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()),
                this, TQT_SLOT(editNumberClicked())
              );
 
-    // add a horizontal box tqlayout for the artist and the composer
+    // add a horizontal box layout for the artist and the composer
     TQHBoxLayout *artistBox = new TQHBoxLayout( -1, "artistBox" );
     tagsGridLayout->addLayout( artistBox, 1, 1 );
     // and fill it up
@@ -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,14 +144,14 @@ 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()),
                this, TQT_SLOT(editComposerClicked())
              );
 
-    // add a horizontal box tqlayout for the album
+    // add a horizontal box layout for the album
     TQHBoxLayout *albumBox = new TQHBoxLayout( -1, "albumBox" );
     tagsGridLayout->addLayout( albumBox, 2, 1 );
     // and fill it up
@@ -164,14 +164,14 @@ 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()),
                this, TQT_SLOT(editAlbumClicked())
              );
 
-    // add a horizontal box tqlayout for the disc number, year and genre
+    // add a horizontal box layout for the disc number, year and genre
     TQHBoxLayout *albumdataBox = new TQHBoxLayout( -1, "albumdataBox" );
     tagsGridLayout->addLayout( albumdataBox, 3, 1 );
     // and fill it up
@@ -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,14 +221,14 @@ 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()),
                this, TQT_SLOT(editGenreClicked())
              );
 
-    // add a horizontal box tqlayout for the comment
+    // add a horizontal box layout for the comment
     TQHBoxLayout *commentBox = new TQHBoxLayout( -1, "commentBox" );
     tagsGridLayout->addLayout( commentBox, 4, 1 );
     // and fill it up
@@ -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()),
@@ -384,7 +384,7 @@ void OptionsEditor::itemsSelected( TQValueList<FileListItem*> items )
         }
     }
     else {
-        setCaption( i18n("%1 Files").tqarg(items.count()) );
+        setCaption( i18n("%1 Files").arg(items.count()) );
         TQValueList<FileListItem*>::Iterator it = items.begin();
         ConversionOptions cOptions = (*it)->options;
         TQString title = ( (*it)->tags == 0 ) ? "" : (*it)->tags->title;
@@ -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() ) {