Rename a number of classes to enhance compatibility with KDE4

1 files changed, 18 insertions, 18 deletions

diff --git a/juk/playlistcollection.cpp b/juk/playlistcollection.cpp
index bff1e7c9..c2b2d80b 100644
--- a/juk/playlistcollection.cpp
+++ b/juk/playlistcollection.cpp
@@ -547,7 +547,7 @@ void PlaylistCollection::setHistoryPlaylistEnabled(bool enable)
         return;
 
     if(enable) {
-        action<KToggleAction>("showHistory")->setChecked(true);
+        action<TDEToggleAction>("showHistory")->setChecked(true);
         m_historyPlaylist = new HistoryPlaylist(this);
         m_historyPlaylist->setName(i18n("History"));
         setupPlaylist(m_historyPlaylist, "history");
@@ -569,14 +569,14 @@ void PlaylistCollection::setUpcomingPlaylistEnabled(bool enable)
         return;
 
     if(enable) {
-        action<KToggleAction>("showUpcoming")->setChecked(true);
+        action<TDEToggleAction>("showUpcoming")->setChecked(true);
         if(!m_upcomingPlaylist)
             m_upcomingPlaylist = new UpcomingPlaylist(this);
 
         setupPlaylist(m_upcomingPlaylist, "today");
     }
     else {
-        action<KToggleAction>("showUpcoming")->setChecked(false);
+        action<TDEToggleAction>("showUpcoming")->setChecked(false);
         bool raiseCollection = m_playlistStack->visibleWidget() == m_upcomingPlaylist;
         delete m_upcomingPlaylist;
         m_upcomingPlaylist = 0;
@@ -824,7 +824,7 @@ void PlaylistCollection::saveConfig()
 {
     TDEConfigGroup config(TDEGlobal::config(), "Playlists");
     config.writeEntry("ImportPlaylists", m_importPlaylists);
-    config.writeEntry("showUpcoming", action<KToggleAction>("showUpcoming")->isChecked());
+    config.writeEntry("showUpcoming", action<TDEToggleAction>("showUpcoming")->isChecked());
     config.writePathEntry("DirectoryList", m_folderList);
 }
 
@@ -836,11 +836,11 @@ PlaylistCollection::ActionHandler::ActionHandler(PlaylistCollection *collection)
     TQObject(0, "ActionHandler"),
     m_collection(collection)
 {
-    KActionMenu *menu;
+    TDEActionMenu *menu;
 
     // "New" menu
 
-    menu = new KActionMenu(i18n("&New"), "filenew", actions(), "file_new");
+    menu = new TDEActionMenu(i18n("&New"), "filenew", actions(), "file_new");
 
     menu->insert(createAction(i18n("&Empty Playlist..."), TQT_SLOT(slotCreatePlaylist()),
                               "newPlaylist", "window_new", "CTRL+n"));
@@ -852,7 +852,7 @@ PlaylistCollection::ActionHandler::ActionHandler(PlaylistCollection *collection)
     // Guess tag info menu
 
 #if HAVE_MUSICBRAINZ
-    menu = new KActionMenu(i18n("&Guess Tag Information"), TQString(), actions(), "guessTag");
+    menu = new TDEActionMenu(i18n("&Guess Tag Information"), TQString(), actions(), "guessTag");
     menu->setIconSet(SmallIconSet("wizard"));
 
     menu->insert(createAction(i18n("From &File Name"), TQT_SLOT(slotGuessTagFromFile()),
@@ -882,7 +882,7 @@ PlaylistCollection::ActionHandler::ActionHandler(PlaylistCollection *collection)
     createAction(i18n("Refresh"),         TQT_SLOT(slotRefreshItems()), "refresh", "reload");
     createAction(i18n("&Rename File"),    TQT_SLOT(slotRenameItems()),  "renameFile", "filesaveas", "CTRL+r");
 
-    menu = new KActionMenu(i18n("Cover Manager"), TQString(), actions(), "coverManager");
+    menu = new TDEActionMenu(i18n("Cover Manager"), TQString(), actions(), "coverManager");
     menu->setIconSet(SmallIconSet("image"));
     menu->insert(createAction(i18n("&View Cover"),
         TQT_SLOT(slotViewCovers()), "viewCover", "viewmag"));
@@ -897,30 +897,30 @@ PlaylistCollection::ActionHandler::ActionHandler(PlaylistCollection *collection)
     menu->insert(createAction(i18n("Show Cover &Manager"),
         TQT_SLOT(slotShowCoverManager()), "showCoverManager"));
 
-    KToggleAction *historyAction =
-        new KToggleAction(i18n("Show &History"), "history",  0, actions(), "showHistory");
+    TDEToggleAction *historyAction =
+        new TDEToggleAction(i18n("Show &History"), "history",  0, actions(), "showHistory");
     historyAction->setCheckedState(i18n("Hide &History"));
 
-    KToggleAction *upcomingAction =
-        new KToggleAction(i18n("Show &Play Queue"), "today", 0, actions(), "showUpcoming");
+    TDEToggleAction *upcomingAction =
+        new TDEToggleAction(i18n("Show &Play Queue"), "today", 0, actions(), "showUpcoming");
     upcomingAction->setCheckedState(i18n("Hide &Play Queue"));
 
-    connect(action<KToggleAction>("showHistory"), TQT_SIGNAL(toggled(bool)),
+    connect(action<TDEToggleAction>("showHistory"), TQT_SIGNAL(toggled(bool)),
             this, TQT_SLOT(slotSetHistoryPlaylistEnabled(bool)));
-    connect(action<KToggleAction>("showUpcoming"), TQT_SIGNAL(toggled(bool)),
+    connect(action<TDEToggleAction>("showUpcoming"), TQT_SIGNAL(toggled(bool)),
             this, TQT_SLOT(slotSetUpcomingPlaylistEnabled(bool)));
 }
 
-KAction *PlaylistCollection::ActionHandler::createAction(const TQString &text,
+TDEAction *PlaylistCollection::ActionHandler::createAction(const TQString &text,
                                                          const char *slot,
                                                          const char *name,
                                                          const TQString &icon,
-                                                         const KShortcut &shortcut)
+                                                         const TDEShortcut &shortcut)
 {
     if(icon.isNull())
-        return new KAction(text, shortcut, this, slot, actions(), name);
+        return new TDEAction(text, shortcut, this, slot, actions(), name);
     else
-        return new KAction(text, icon, shortcut, this, slot, actions(), name);
+        return new TDEAction(text, icon, shortcut, this, slot, actions(), name);
 }
 
 #undef widget