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

1 files changed, 18 insertions, 18 deletions

diff --git a/src/cdopener.cpp b/src/cdopener.cpp
index 12779be..77cbe04 100755
--- a/src/cdopener.cpp
+++ b/src/cdopener.cpp
@@ -17,7 +17,7 @@
 #include <kfiledialog.h>
 #include <kmessagebox.h>
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlabel.h>
 #include <tqgroupbox.h>
 #include <tqdatetime.h>
@@ -59,18 +59,18 @@ CDOpener::CDOpener( Config* _config, CDManager* _cdManager, TagEngine* _tagEngin
     connect( cArtist, TQT_SIGNAL(textChanged(const TQString&)),
                this, TQT_SLOT(artistChanged(const TQString&))
              );
-    // add a horizontal box tqlayout for the composer
+    // add a horizontal box layout for the composer
     TQHBoxLayout* artistBox = new TQHBoxLayout( -1, "artistBox" );
     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&))
              );
@@ -84,18 +84,18 @@ CDOpener::CDOpener( Config* _config, CDManager* _cdManager, TagEngine* _tagEngin
     topGridLayout->addWidget( lAlbumLabel, 1, 0 );
     lAlbum = new KLineEdit( this, "lAlbum" );
     topGridLayout->addWidget( lAlbum, 1, 1 );
-    // 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* albumBox = new TQHBoxLayout( -1, "albumBox" );
     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 );
@@ -131,9 +131,9 @@ CDOpener::CDOpener( Config* _config, CDManager* _cdManager, TagEngine* _tagEngin
     tagGroupBox = new TQGroupBox( i18n("No track selected"), this, "tagGroupBox" );
     gridLayout->addWidget( tagGroupBox, 2, 0 );
     tagGroupBox->setColumnLayout( 0, Qt::Vertical );
-    tagGroupBox->tqlayout()->setSpacing( 6 );
-    tagGroupBox->tqlayout()->setMargin( 6 );
-    TQGridLayout* tagGridLayout = new TQGridLayout( tagGroupBox->tqlayout(), 1, 1, -1, "tagGridLayout" );
+    tagGroupBox->layout()->setSpacing( 6 );
+    tagGroupBox->layout()->setMargin( 6 );
+    TQGridLayout* tagGridLayout = new TQGridLayout( tagGroupBox->layout(), 1, 1, -1, "tagGridLayout" );
 
     // add the up and down buttons
     pTrackUp = new KPushButton( " ", tagGroupBox, "pTrackUp" );
@@ -152,7 +152,7 @@ CDOpener::CDOpener( Config* _config, CDManager* _cdManager, TagEngine* _tagEngin
     tagGridLayout->addWidget( pTrackDown, 1, 0 );
 
     // add the inputs
-    // add a horizontal box tqlayout for the title
+    // add a horizontal box layout for the title
     TQHBoxLayout* trackTitleBox = new TQHBoxLayout( -1, "trackTitleBox" );
     tagGridLayout->addLayout( trackTitleBox, 0, 2 );
     // and fill it up
@@ -165,13 +165,13 @@ 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()),
                this, TQT_SLOT(editTrackTitleClicked())
              );
-    // add a horizontal box tqlayout for the composer
+    // add a horizontal box layout for the composer
     TQHBoxLayout* trackArtistBox = new TQHBoxLayout( -1, "trackArtistBox" );
     tagGridLayout->addLayout( trackArtistBox, 1, 2 );
     // and fill it up
@@ -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,13 +199,13 @@ 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()),
                this, TQT_SLOT(editTrackComposerClicked())
              );
-    // add a horizontal box tqlayout for the comment
+    // add a horizontal box layout for the comment
     TQHBoxLayout* trackCommentBox = new TQHBoxLayout( -1, "trackCommentBox" );
     tagGridLayout->addLayout( trackCommentBox, 2, 2 );
     // and fill it up
@@ -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()),
@@ -234,7 +234,7 @@ CDOpener::CDOpener( Config* _config, CDManager* _cdManager, TagEngine* _tagEngin
     gridLayout->addWidget( lineFrame, 3, 0 );
     gridLayout->setRowSpacing( 3, 16 );
 
-    // add a horizontal box tqlayout for the control elements
+    // add a horizontal box layout for the control elements
     TQHBoxLayout* controlBox = new TQHBoxLayout( -1, "controlBox" );
     gridLayout->addLayout( controlBox, 4, 0 );