Rename a number of classes to enhance compatibility with KDE4

4 files changed, 12 insertions, 12 deletions

diff --git a/noatun-plugins/lyrics/cmodule.cpp b/noatun-plugins/lyrics/cmodule.cpp
index 8791f30..f79b88e 100644
--- a/noatun-plugins/lyrics/cmodule.cpp
+++ b/noatun-plugins/lyrics/cmodule.cpp
@@ -54,7 +54,7 @@ LyricsCModule::LyricsCModule(TQObject *_parent) : CModule(i18n("Lyrics"), i18n("
   // Search box
   TQVBoxLayout *boxlayout = new TQVBoxLayout( hlayout, KDialog::spacingHint() );
   boxlayout->addWidget( new TQLabel( i18n("Search providers:" ), this ) );
-  providersBox = new KListBox( this, "providersBox" );
+  providersBox = new TDEListBox( this, "providersBox" );
   boxlayout->addWidget(providersBox);
 
   boxButtons = new KButtonBox( this,Qt::Vertical );
diff --git a/noatun-plugins/lyrics/cmodule.h b/noatun-plugins/lyrics/cmodule.h
index d95baf9..792625a 100644
--- a/noatun-plugins/lyrics/cmodule.h
+++ b/noatun-plugins/lyrics/cmodule.h
@@ -6,7 +6,7 @@
 #include <klocale.h>
 
 class KLineEdit;
-class KListBox;
+class TDEListBox;
 class KButtonBox;
 
 struct SearchProvider {
@@ -30,7 +30,7 @@ class LyricsCModule : public CModule {
     void nameChanged( const TQString &name );
     void queryChanged( const TQString &query );
   protected:
-    KListBox *providersBox;
+    TDEListBox *providersBox;
     KButtonBox *boxButtons;
     KLineEdit *nameEdit;
     KLineEdit *queryEdit;
diff --git a/noatun-plugins/lyrics/lyrics.cpp b/noatun-plugins/lyrics/lyrics.cpp
index 9f45f57..ee359b3 100644
--- a/noatun-plugins/lyrics/lyrics.cpp
+++ b/noatun-plugins/lyrics/lyrics.cpp
@@ -23,7 +23,7 @@ extern "C"
 
 Lyrics *lyrics;
 
-Lyrics::Lyrics() : KMainWindow(), Plugin(), active(false)
+Lyrics::Lyrics() : TDEMainWindow(), Plugin(), active(false)
 {
   lyrics = this;
   /* Create default actions */
@@ -33,16 +33,16 @@ Lyrics::Lyrics() : KMainWindow(), Plugin(), active(false)
   //(void)KStdAction::printPreview(TQT_TQOBJECT(this), TQT_SLOT(printPreview()), actionCollection());
   //(void)KStdAction::mail(TQT_TQOBJECT(this), TQT_SLOT(mail()), actionCollection());
   //(void)KStdAction::find(TQT_TQOBJECT(this), TQT_SLOT(find()), actionCollection());
-  follow_act = new KToggleAction(i18n("&Follow Noatun Playlist"), "goto", 0, actionCollection(), "follow");
+  follow_act = new TDEToggleAction(i18n("&Follow Noatun Playlist"), "goto", 0, actionCollection(), "follow");
   KStdAction::redisplay(TQT_TQOBJECT(this), TQT_SLOT(viewLyrics()), actionCollection());
-  attach_act = new KToggleAction(i18n("&Link URL to File"), "attach", KShortcut("CTRL+ALT+A"), actionCollection(), "attach_url");
+  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(TQT_TQOBJECT(this), TQT_SLOT(back()), actionCollection());
   back_act->setEnabled(false);
   forward_act = KStdAction::forward(TQT_TQOBJECT(this), TQT_SLOT(forward()), actionCollection());
   forward_act->setEnabled(false);
   new KWidgetAction( new TQLabel(i18n("Search provider:"), this, "kde toolbar widget"), i18n("Search Provider"), 0, 0, 0, actionCollection(), "search_label");
-  site_act = new KSelectAction(i18n("&Search Provider"), 0, TQT_TQOBJECT(this), TQT_SLOT(viewLyrics()), actionCollection(), "search_provider");
+  site_act = new TDESelectAction(i18n("&Search Provider"), 0, TQT_TQOBJECT(this), TQT_SLOT(viewLyrics()), actionCollection(), "search_provider");
 
   /* Add entry to menu */
   menuID = napp->pluginMenuAdd(i18n("&View Lyrics"), TQT_TQOBJECT(this), TQT_SLOT(viewLyrics()));
diff --git a/noatun-plugins/lyrics/lyrics.h b/noatun-plugins/lyrics/lyrics.h
index db7252b..a5b411b 100644
--- a/noatun-plugins/lyrics/lyrics.h
+++ b/noatun-plugins/lyrics/lyrics.h
@@ -12,7 +12,7 @@
 
 class HistoryManager;
 
-class Lyrics : public KMainWindow, public Plugin {
+class Lyrics : public TDEMainWindow, public Plugin {
 Q_OBJECT
   
 
@@ -41,10 +41,10 @@ protected slots:
 
 private:
 	int menuID;
-  KAction *back_act, *forward_act;
-  KToggleAction *follow_act;
-  KToggleAction *attach_act;
-  KSelectAction *site_act;
+  TDEAction *back_act, *forward_act;
+  TDEToggleAction *follow_act;
+  TDEToggleAction *attach_act;
+  TDESelectAction *site_act;
 	TDEHTMLPart *htmlpart;
   TQValueVector<SearchProvider> mSites;
   HistoryManager *history;