Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines

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

2 files changed, 24 insertions, 24 deletions

diff --git a/noatun-plugins/lyrics/cmodule.cpp b/noatun-plugins/lyrics/cmodule.cpp
index 56f64a6..6ebe81f 100644
--- a/noatun-plugins/lyrics/cmodule.cpp
+++ b/noatun-plugins/lyrics/cmodule.cpp
@@ -58,10 +58,10 @@ LyricsCModule::LyricsCModule(TQObject *_parent) : CModule(i18n("Lyrics"), i18n("
   boxlayout->addWidget(providersBox);
 
   boxButtons = new KButtonBox( this,TQt::Vertical );
-  boxButtons->addButton( i18n( "New Search Provider" ), this, TQT_SLOT( newSearch() ) );
-  boxButtons->addButton( i18n( "Delete Search Provider" ), this, TQT_SLOT( delSearch() ) );
-  boxButtons->addButton( i18n( "Move Up" ), this, TQT_SLOT( moveUpSearch() ) );
-  boxButtons->addButton( i18n( "Move Down" ), this, TQT_SLOT( moveDownSearch() ) );
+  boxButtons->addButton( i18n( "New Search Provider" ), this, TQ_SLOT( newSearch() ) );
+  boxButtons->addButton( i18n( "Delete Search Provider" ), this, TQ_SLOT( delSearch() ) );
+  boxButtons->addButton( i18n( "Move Up" ), this, TQ_SLOT( moveUpSearch() ) );
+  boxButtons->addButton( i18n( "Move Down" ), this, TQ_SLOT( moveDownSearch() ) );
   boxButtons->layout();
   boxlayout->addWidget( boxButtons );
 
@@ -82,9 +82,9 @@ LyricsCModule::LyricsCModule(TQObject *_parent) : CModule(i18n("Lyrics"), i18n("
   /* Signal/slots */
   nameEdit->setEnabled( false );
   queryEdit->setEnabled( false );
-  connect( providersBox, TQT_SIGNAL( highlighted( TQListBoxItem * ) ), this, TQT_SLOT( selected( TQListBoxItem * ) ) );
-  connect( nameEdit, TQT_SIGNAL( textChanged( const TQString &) ), this, TQT_SLOT( nameChanged( const TQString & ) ) );
-  connect( queryEdit, TQT_SIGNAL( textChanged( const TQString & ) ), this, TQT_SLOT( queryChanged( const TQString & ) ) );
+  connect( providersBox, TQ_SIGNAL( highlighted( TQListBoxItem * ) ), this, TQ_SLOT( selected( TQListBoxItem * ) ) );
+  connect( nameEdit, TQ_SIGNAL( textChanged( const TQString &) ), this, TQ_SLOT( nameChanged( const TQString & ) ) );
+  connect( queryEdit, TQ_SIGNAL( textChanged( const TQString & ) ), this, TQ_SLOT( queryChanged( const TQString & ) ) );
 
 
 
diff --git a/noatun-plugins/lyrics/lyrics.cpp b/noatun-plugins/lyrics/lyrics.cpp
index 4a552eb..353bef4 100644
--- a/noatun-plugins/lyrics/lyrics.cpp
+++ b/noatun-plugins/lyrics/lyrics.cpp
@@ -27,25 +27,25 @@ Lyrics::Lyrics() : TDEMainWindow(), Plugin(), active(false)
 {
   lyrics = this;
   /* Create default actions */
-  (void)KStdAction::close(this, TQT_SLOT(close()), actionCollection());
-  ( void )KStdAction::goTo( this, TQT_SLOT( goTo() ), actionCollection(), "go_web_goTo" );
-  //(void)KStdAction::print(this, TQT_SLOT(print()), actionCollection());
-  //(void)KStdAction::printPreview(this, TQT_SLOT(printPreview()), actionCollection());
-  //(void)KStdAction::mail(this, TQT_SLOT(mail()), actionCollection());
-  //(void)KStdAction::find(this, TQT_SLOT(find()), actionCollection());
+  (void)KStdAction::close(this, TQ_SLOT(close()), actionCollection());
+  ( void )KStdAction::goTo( this, TQ_SLOT( goTo() ), actionCollection(), "go_web_goTo" );
+  //(void)KStdAction::print(this, TQ_SLOT(print()), actionCollection());
+  //(void)KStdAction::printPreview(this, TQ_SLOT(printPreview()), actionCollection());
+  //(void)KStdAction::mail(this, TQ_SLOT(mail()), actionCollection());
+  //(void)KStdAction::find(this, TQ_SLOT(find()), actionCollection());
   follow_act = new TDEToggleAction(i18n("&Follow Noatun Playlist"), "goto", 0, actionCollection(), "follow");
-  KStdAction::redisplay(this, TQT_SLOT(viewLyrics()), actionCollection());
+  KStdAction::redisplay(this, TQ_SLOT(viewLyrics()), actionCollection());
   attach_act = new TDEToggleAction(i18n("&Link URL to File"), "attach", TDEShortcut("CTRL+ALT+A"), actionCollection(), "attach_url");
-  connect(attach_act, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(attach(bool)));
-  back_act = KStdAction::back(this, TQT_SLOT(back()), actionCollection());
+  connect(attach_act, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(attach(bool)));
+  back_act = KStdAction::back(this, TQ_SLOT(back()), actionCollection());
   back_act->setEnabled(false);
-  forward_act = KStdAction::forward(this, TQT_SLOT(forward()), actionCollection());
+  forward_act = KStdAction::forward(this, TQ_SLOT(forward()), actionCollection());
   forward_act->setEnabled(false);
   new KWidgetAction( new TQLabel(i18n("Search provider:"), this, "tde toolbar widget"), i18n("Search Provider"), 0, 0, 0, actionCollection(), "search_label");
-  site_act = new TDESelectAction(i18n("&Search Provider"), 0, this, TQT_SLOT(viewLyrics()), actionCollection(), "search_provider");
+  site_act = new TDESelectAction(i18n("&Search Provider"), 0, this, TQ_SLOT(viewLyrics()), actionCollection(), "search_provider");
 
   /* Add entry to menu */
-  menuID = napp->pluginMenuAdd(i18n("&View Lyrics"), this, TQT_SLOT(viewLyrics()));
+  menuID = napp->pluginMenuAdd(i18n("&View Lyrics"), this, TQ_SLOT(viewLyrics()));
 
   /* Create history manager and htmlpart */
   history = new HistoryManager(this);
@@ -53,11 +53,11 @@ Lyrics::Lyrics() : TDEMainWindow(), Plugin(), active(false)
 	//htmlpart->view()->setMinimumSize(350, 420);
 
   /* Connect signals/slots */
-	connect( htmlpart->browserExtension(), TQT_SIGNAL(openURLRequestDelayed( const KURL &, const KParts::URLArgs & )), this, TQT_SLOT(openURLRequest( const KURL &, const KParts::URLArgs & )));
-  connect( htmlpart, TQT_SIGNAL(started(TDEIO::Job *)), this, TQT_SLOT(loadingURL(TDEIO::Job *)) );
-  connect( htmlpart, TQT_SIGNAL(completed()), this, TQT_SLOT(loadedURL()) );
-  connect( history, TQT_SIGNAL(uiChanged(int, bool)), this, TQT_SLOT(changeUI(int, bool)) );
-  connect( napp->player(), TQT_SIGNAL(newSong()), this, TQT_SLOT(newSong()) );
+	connect( htmlpart->browserExtension(), TQ_SIGNAL(openURLRequestDelayed( const KURL &, const KParts::URLArgs & )), this, TQ_SLOT(openURLRequest( const KURL &, const KParts::URLArgs & )));
+  connect( htmlpart, TQ_SIGNAL(started(TDEIO::Job *)), this, TQ_SLOT(loadingURL(TDEIO::Job *)) );
+  connect( htmlpart, TQ_SIGNAL(completed()), this, TQ_SLOT(loadedURL()) );
+  connect( history, TQ_SIGNAL(uiChanged(int, bool)), this, TQ_SLOT(changeUI(int, bool)) );
+  connect( napp->player(), TQ_SIGNAL(newSong()), this, TQ_SLOT(newSong()) );
 
   /* Status bar */
   statusBar()->insertItem(i18n("Ready"), 0, 1);