Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines

Signed-off-by: Michele Calgaro <[email protected]>

1 files changed, 48 insertions, 48 deletions

diff --git a/src/optionseditor.cpp b/src/optionseditor.cpp
index fa54706..d07aac0 100644
--- a/src/optionseditor.cpp
+++ b/src/optionseditor.cpp
@@ -59,8 +59,8 @@ OptionsEditor::OptionsEditor( TagEngine* _tagEngine, Config* _config, FileList*
     // generate the options input area
     options = new Options( config, i18n("Choose your prefered output options and click on \"Close\"!"), conversionOptions, "options" );
     conversionOptionsGridLayout->addWidget( options, 0, 0 );
-    connect( options, TQT_SIGNAL(optionsChanged()),
-               this, TQT_SLOT(optionsChanged())
+    connect( options, TQ_SIGNAL(optionsChanged()),
+               this, TQ_SLOT(optionsChanged())
              );
     conversionOptionsGridLayout->setRowStretch( 1, 1 );
 
@@ -72,8 +72,8 @@ OptionsEditor::OptionsEditor( TagEngine* _tagEngine, Config* _config, FileList*
     pEditOptions->setFixedWidth( pEditOptions->sizeHint().width() );
     conversionOptionsGridLayout->addWidget( pEditOptions, 3, 0, TQt::AlignHCenter );
     pEditOptions->hide();
-    connect( pEditOptions, TQT_SIGNAL(clicked()),
-               this, TQT_SLOT(editOptionsClicked())
+    connect( pEditOptions, TQ_SIGNAL(clicked()),
+               this, TQ_SLOT(editOptionsClicked())
              );
 
     //// tags page ////
@@ -90,31 +90,31 @@ OptionsEditor::OptionsEditor( TagEngine* _tagEngine, Config* _config, FileList*
     tagsGridLayout->addWidget( lTitleLabel, 0, 0 );
     lTitle = new KLineEdit( tags, "lTitle" );
     titleBox->addWidget( lTitle );
-    connect( lTitle, TQT_SIGNAL(textChanged(const TQString&)),
-               this, TQT_SLOT(titleChanged(const TQString&))
+    connect( lTitle, TQ_SIGNAL(textChanged(const TQString&)),
+               this, TQ_SLOT(titleChanged(const TQString&))
              );
     pTitleEdit = new KPushButton( " ", tags, "pTitleEdit" );
     pTitleEdit->setPixmap( iconLoader->loadIcon("kwrite",TDEIcon::Small) );
     pTitleEdit->setFixedSize( lTitle->sizeHint().height(), lTitle->sizeHint().height() );
     pTitleEdit->hide();
     titleBox->addWidget( pTitleEdit );
-    connect( pTitleEdit, TQT_SIGNAL(clicked()),
-               this, TQT_SLOT(editTitleClicked())
+    connect( pTitleEdit, TQ_SIGNAL(clicked()),
+               this, TQ_SLOT(editTitleClicked())
              );
     lNumberLabel = new TQLabel( i18n("Track No.:"), tags, "lNumberLabel" );
     titleBox->addWidget( lNumberLabel );
     iNumber = new KIntSpinBox( 0, 999, 1, 1, 10, tags, "iNumber" );
     titleBox->addWidget( iNumber );
-    connect( iNumber, TQT_SIGNAL(valueChanged(int)),
-               this, TQT_SLOT(numberChanged(int))
+    connect( iNumber, TQ_SIGNAL(valueChanged(int)),
+               this, TQ_SLOT(numberChanged(int))
              );
     pNumberEdit = new KPushButton( " ", tags, "pNumberEdit" );
     pNumberEdit->setPixmap( iconLoader->loadIcon("kwrite",TDEIcon::Small) );
     pNumberEdit->setFixedSize( iNumber->sizeHint().height(), iNumber->sizeHint().height() );
     pNumberEdit->hide();
     titleBox->addWidget( pNumberEdit );
-    connect( pNumberEdit, TQT_SIGNAL(clicked()),
-               this, TQT_SLOT(editNumberClicked())
+    connect( pNumberEdit, TQ_SIGNAL(clicked()),
+               this, TQ_SLOT(editNumberClicked())
              );
 
     // add a horizontal box layout for the artist and the composer
@@ -125,31 +125,31 @@ OptionsEditor::OptionsEditor( TagEngine* _tagEngine, Config* _config, FileList*
     tagsGridLayout->addWidget( lArtistLabel, 1, 0 );
     lArtist = new KLineEdit( tags, "lArtist" );
     artistBox->addWidget( lArtist );
-    connect( lArtist, TQT_SIGNAL(textChanged(const TQString&)),
-               this, TQT_SLOT(artistChanged(const TQString&))
+    connect( lArtist, TQ_SIGNAL(textChanged(const TQString&)),
+               this, TQ_SLOT(artistChanged(const TQString&))
              );
     pArtistEdit = new KPushButton( " ", tags, "pArtistEdit" );
     pArtistEdit->setPixmap( iconLoader->loadIcon("kwrite",TDEIcon::Small) );
     pArtistEdit->setFixedSize( lArtist->sizeHint().height(), lArtist->sizeHint().height() );
     pArtistEdit->hide();
     artistBox->addWidget( pArtistEdit );
-    connect( pArtistEdit, TQT_SIGNAL(clicked()),
-               this, TQT_SLOT(editArtistClicked())
+    connect( pArtistEdit, TQ_SIGNAL(clicked()),
+               this, TQ_SLOT(editArtistClicked())
              );
     lComposerLabel = new TQLabel( i18n("Composer:"), tags, "lComposerLabel" );
     artistBox->addWidget( lComposerLabel );
     lComposer = new KLineEdit( tags, "lComposer" );
     artistBox->addWidget( lComposer );
-    connect( lComposer, TQT_SIGNAL(textChanged(const TQString&)),
-               this, TQT_SLOT(composerChanged(const TQString&))
+    connect( lComposer, TQ_SIGNAL(textChanged(const TQString&)),
+               this, TQ_SLOT(composerChanged(const TQString&))
              );
     pComposerEdit = new KPushButton( " ", tags, "pComposerEdit" );
     pComposerEdit->setPixmap( iconLoader->loadIcon("kwrite",TDEIcon::Small) );
     pComposerEdit->setFixedSize( lComposer->sizeHint().height(), lComposer->sizeHint().height() );
     pComposerEdit->hide();
     artistBox->addWidget( pComposerEdit );
-    connect( pComposerEdit, TQT_SIGNAL(clicked()),
-               this, TQT_SLOT(editComposerClicked())
+    connect( pComposerEdit, TQ_SIGNAL(clicked()),
+               this, TQ_SLOT(editComposerClicked())
              );
 
     // add a horizontal box layout for the album
@@ -160,16 +160,16 @@ OptionsEditor::OptionsEditor( TagEngine* _tagEngine, Config* _config, FileList*
     tagsGridLayout->addWidget( lAlbumLabel, 2, 0 );
     lAlbum = new KLineEdit( tags, "lAlbum" );
     albumBox->addWidget( lAlbum );
-    connect( lAlbum, TQT_SIGNAL(textChanged(const TQString&)),
-               this, TQT_SLOT(albumChanged(const TQString&))
+    connect( lAlbum, TQ_SIGNAL(textChanged(const TQString&)),
+               this, TQ_SLOT(albumChanged(const TQString&))
              );
     pAlbumEdit = new KPushButton( " ", tags, "pAlbumEdit" );
     pAlbumEdit->setPixmap( iconLoader->loadIcon("kwrite",TDEIcon::Small) );
     pAlbumEdit->setFixedSize( lAlbum->sizeHint().height(), lAlbum->sizeHint().height() );
     pAlbumEdit->hide();
     albumBox->addWidget( pAlbumEdit );
-    connect( pAlbumEdit, TQT_SIGNAL(clicked()),
-               this, TQT_SLOT(editAlbumClicked())
+    connect( pAlbumEdit, TQ_SIGNAL(clicked()),
+               this, TQ_SLOT(editAlbumClicked())
              );
 
     // add a horizontal box layout for the disc number, year and genre
@@ -180,32 +180,32 @@ OptionsEditor::OptionsEditor( TagEngine* _tagEngine, Config* _config, FileList*
     tagsGridLayout->addWidget( lDiscLabel, 3, 0 );
     iDisc = new KIntSpinBox( 0, 99, 1, 1, 10, tags, "iDisc" );
     albumdataBox->addWidget( iDisc );
-    connect( iDisc, TQT_SIGNAL(valueChanged(int)),
-               this, TQT_SLOT(discChanged(int))
+    connect( iDisc, TQ_SIGNAL(valueChanged(int)),
+               this, TQ_SLOT(discChanged(int))
              );
     pDiscEdit = new KPushButton( " ", tags, "pDiscEdit" );
     pDiscEdit->setPixmap( iconLoader->loadIcon("kwrite",TDEIcon::Small) );
     pDiscEdit->setFixedSize( iDisc->sizeHint().height(), iDisc->sizeHint().height() );
     pDiscEdit->hide();
     albumdataBox->addWidget( pDiscEdit );
-    connect( pDiscEdit, TQT_SIGNAL(clicked()),
-               this, TQT_SLOT(editDiscClicked())
+    connect( pDiscEdit, TQ_SIGNAL(clicked()),
+               this, TQ_SLOT(editDiscClicked())
              );
     albumdataBox->addStretch();
     lYearLabel = new TQLabel( i18n("Year:"), tags, "lYearLabel" );
     albumdataBox->addWidget( lYearLabel );
     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))
+    connect( iYear, TQ_SIGNAL(valueChanged(int)),
+               this, TQ_SLOT(yearChanged(int))
              );
     pYearEdit = new KPushButton( " ", tags, "pYearEdit" );
     pYearEdit->setPixmap( iconLoader->loadIcon("kwrite",TDEIcon::Small) );
     pYearEdit->setFixedSize( iYear->sizeHint().height(), iYear->sizeHint().height() );
     pYearEdit->hide();
     albumdataBox->addWidget( pYearEdit );
-    connect( pYearEdit, TQT_SIGNAL(clicked()),
-               this, TQT_SLOT(editYearClicked())
+    connect( pYearEdit, TQ_SIGNAL(clicked()),
+               this, TQ_SLOT(editYearClicked())
              );
     albumdataBox->addStretch();
     lGenreLabel = new TQLabel( i18n("Genre:"), tags, "lGenreLabel" );
@@ -217,16 +217,16 @@ OptionsEditor::OptionsEditor( TagEngine* _tagEngine, Config* _config, FileList*
     cGenreCompletion->insertItems( tagEngine->genreList );
     cGenreCompletion->setIgnoreCase( tags );
     albumdataBox->addWidget( cGenre );
-    connect( cGenre, TQT_SIGNAL(textChanged(const TQString&)),
-               this, TQT_SLOT(genreChanged(const TQString&))
+    connect( cGenre, TQ_SIGNAL(textChanged(const TQString&)),
+               this, TQ_SLOT(genreChanged(const TQString&))
              );
     pGenreEdit = new KPushButton( " ", tags, "pGenreEdit" );
     pGenreEdit->setPixmap( iconLoader->loadIcon("kwrite",TDEIcon::Small) );
     pGenreEdit->setFixedSize( cGenre->sizeHint().height(), cGenre->sizeHint().height() );
     pGenreEdit->hide();
     albumdataBox->addWidget( pGenreEdit );
-    connect( pGenreEdit, TQT_SIGNAL(clicked()),
-               this, TQT_SLOT(editGenreClicked())
+    connect( pGenreEdit, TQ_SIGNAL(clicked()),
+               this, TQ_SLOT(editGenreClicked())
              );
 
     // add a horizontal box layout for the comment
@@ -237,16 +237,16 @@ OptionsEditor::OptionsEditor( TagEngine* _tagEngine, Config* _config, FileList*
     tagsGridLayout->addWidget( lCommentLabel, 4, 0 );
     tComment = new KTextEdit( tags, "tComment" );
     commentBox->addWidget( tComment );
-    connect( tComment, TQT_SIGNAL(textChanged()),
-               this, TQT_SLOT(commentChanged())
+    connect( tComment, TQ_SIGNAL(textChanged()),
+               this, TQ_SLOT(commentChanged())
              );
     pCommentEdit = new KPushButton( " ", tags, "pCommentEdit" );
     pCommentEdit->setPixmap( iconLoader->loadIcon("kwrite",TDEIcon::Small) );
     pCommentEdit->setFixedSize( lTitle->sizeHint().height(), lTitle->sizeHint().height() );
     pCommentEdit->hide();
     commentBox->addWidget( pCommentEdit );
-    connect( pCommentEdit, TQT_SIGNAL(clicked()),
-               this, TQT_SLOT(editCommentClicked())
+    connect( pCommentEdit, TQ_SIGNAL(clicked()),
+               this, TQ_SLOT(editCommentClicked())
              );
     tagsGridLayout->setRowStretch( 4, 1 );
 
@@ -258,8 +258,8 @@ OptionsEditor::OptionsEditor( TagEngine* _tagEngine, Config* _config, FileList*
     pEditTags->setFixedWidth( pEditTags->sizeHint().width() );
     tagsGridLayout->addWidget( pEditTags, 6, 1, TQt::AlignHCenter );
     pEditTags->hide();
-    connect( pEditTags, TQT_SIGNAL(clicked()),
-               this, TQT_SLOT(editTagsClicked())
+    connect( pEditTags, TQ_SIGNAL(clicked()),
+               this, TQ_SLOT(editTagsClicked())
              );
 
     // delete the icon loader object
@@ -349,10 +349,10 @@ void OptionsEditor::itemsSelected( TQValueList<FileListItem*> items )
         setCaption( KURL::decode_string(items.first()->fileName).replace("%2f","/").replace("%%","%") );
         // HACK ...but seems to work...
         // FIXME directory does get set properly
-        disconnect( options, TQT_SIGNAL(optionsChanged()), 0, 0 );
+        disconnect( options, TQ_SIGNAL(optionsChanged()), 0, 0 );
         options->setCurrentOptions( items.first()->options );
-        connect( options, TQT_SIGNAL(optionsChanged()),
-                   this, TQT_SLOT(optionsChanged())
+        connect( options, TQ_SIGNAL(optionsChanged()),
+                   this, TQ_SLOT(optionsChanged())
                  );
         if( items.first()->tags == 0 && !items.first()->local ) {
             setTagInputEnabled( false );
@@ -466,10 +466,10 @@ void OptionsEditor::itemsSelected( TQValueList<FileListItem*> items )
         if( options->isEnabled() ) {
             // HACK ...but seems to work...
             // FIXME directory does get set properly
-            disconnect( options, TQT_SIGNAL(optionsChanged()), 0, 0 );
+            disconnect( options, TQ_SIGNAL(optionsChanged()), 0, 0 );
             options->setCurrentOptions( items.first()->options );
-            connect( options, TQT_SIGNAL(optionsChanged()),
-                       this, TQT_SLOT(optionsChanged())
+            connect( options, TQ_SIGNAL(optionsChanged()),
+                       this, TQ_SLOT(optionsChanged())
                      );
         }
         if( lTitle->isEnabled() ) {