Rename a number of classes to enhance compatibility with KDE4

5 files changed, 25 insertions, 25 deletions

diff --git a/kscd/configWidgetUI.ui b/kscd/configWidgetUI.ui
index de755edf..7631bfde 100644
--- a/kscd/configWidgetUI.ui
+++ b/kscd/configWidgetUI.ui
@@ -113,7 +113,7 @@
                         <string>The foreground color that will be used in the LCD display.</string>
                     </property>
                 </widget>
-                <widget class="KFontRequester" row="0" column="1" rowspan="1" colspan="2">
+                <widget class="TDEFontRequester" row="0" column="1" rowspan="1" colspan="2">
                     <property name="name">
                         <cstring>kcfg_ledFont</cstring>
                     </property>
diff --git a/kscd/docking.cpp b/kscd/docking.cpp
index 1483611c..d3c0964f 100644
--- a/kscd/docking.cpp
+++ b/kscd/docking.cpp
@@ -44,7 +44,7 @@ DockWidget::DockWidget( KSCD* parent, const char *name)
     m_popup = 0;
     setPixmap( loadIcon("cdsmall") );
 
-    KActionCollection* actionCollection = parent->actionCollection();
+    TDEActionCollection* actionCollection = parent->actionCollection();
     m_backAction = actionCollection->action("Previous");
     m_forwardAction = actionCollection->action("Next");
     m_backPix = loadIcon("player_start");
diff --git a/kscd/docking.h b/kscd/docking.h
index 2efeac16..b4f84b1c 100644
--- a/kscd/docking.h
+++ b/kscd/docking.h
@@ -39,8 +39,8 @@
 
 class KSCD;
 
-class KAction;
-class KToggleAction;
+class TDEAction;
+class TDEToggleAction;
 class KPassivePopup;
 
 class DockWidget : public KSystemTray
@@ -61,8 +61,8 @@ private:
 
     KPassivePopup* m_popup;
 
-    KAction* m_forwardAction;
-    KAction* m_backAction;
+    TDEAction* m_forwardAction;
+    TDEAction* m_backAction;
 
     TQPixmap m_backPix;
     TQPixmap m_forwardPix;
diff --git a/kscd/kscd.cpp b/kscd/kscd.cpp
index 7781601f..581c71e9 100644
--- a/kscd/kscd.cpp
+++ b/kscd/kscd.cpp
@@ -167,27 +167,27 @@ KSCD::KSCD( TQWidget *parent, const char *name )
 
 
   // set up the actions and keyboard accels
-  m_actions = new KActionCollection(this);
+  m_actions = new TDEActionCollection(this);
 
-  KAction* action;
-  action = new KAction(i18n("Play/Pause"), Key_P, TQT_TQOBJECT(this), TQT_SLOT(playClicked()), m_actions, "Play/Pause");
-  action = new KAction(i18n("Stop"), Key_S, TQT_TQOBJECT(this), TQT_SLOT(stopClicked()), m_actions, "Stop");
-  action = new KAction(i18n("Previous"), Key_B, TQT_TQOBJECT(this), TQT_SLOT(prevClicked()), m_actions, "Previous");
-  action = new KAction(i18n("Next"), Key_N, TQT_TQOBJECT(this), TQT_SLOT(nextClicked()), m_actions, "Next");
+  TDEAction* action;
+  action = new TDEAction(i18n("Play/Pause"), Key_P, TQT_TQOBJECT(this), TQT_SLOT(playClicked()), m_actions, "Play/Pause");
+  action = new TDEAction(i18n("Stop"), Key_S, TQT_TQOBJECT(this), TQT_SLOT(stopClicked()), m_actions, "Stop");
+  action = new TDEAction(i18n("Previous"), Key_B, TQT_TQOBJECT(this), TQT_SLOT(prevClicked()), m_actions, "Previous");
+  action = new TDEAction(i18n("Next"), Key_N, TQT_TQOBJECT(this), TQT_SLOT(nextClicked()), m_actions, "Next");
   action = KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(quitClicked()), m_actions);
   action = KStdAction::keyBindings(TQT_TQOBJECT(this), TQT_SLOT(configureKeys()), m_actions, "options_configure_shortcuts");
   action = KStdAction::keyBindings(TQT_TQOBJECT(this), TQT_SLOT(configureGlobalKeys()), m_actions, "options_configure_globals");
   action = KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT(showConfig()), m_actions);
-  action = new KAction(i18n("Loop"), Key_L, TQT_TQOBJECT(this), TQT_SLOT(loopClicked()), m_actions, "Loop");
-  action = new KAction(i18n("Eject"), CTRL + Key_E, TQT_TQOBJECT(this), TQT_SLOT(ejectClicked()), m_actions, "Eject");
-  action = new KAction(i18n("Increase Volume"), Key_Plus, TQT_TQOBJECT(this), TQT_SLOT(incVolume()), m_actions, "IncVolume");
-  KShortcut increaseVolume = action->shortcut();
+  action = new TDEAction(i18n("Loop"), Key_L, TQT_TQOBJECT(this), TQT_SLOT(loopClicked()), m_actions, "Loop");
+  action = new TDEAction(i18n("Eject"), CTRL + Key_E, TQT_TQOBJECT(this), TQT_SLOT(ejectClicked()), m_actions, "Eject");
+  action = new TDEAction(i18n("Increase Volume"), Key_Plus, TQT_TQOBJECT(this), TQT_SLOT(incVolume()), m_actions, "IncVolume");
+  TDEShortcut increaseVolume = action->shortcut();
   increaseVolume.append( KKey( Key_Equal ) );
   action->setShortcut( increaseVolume );
-  action = new KAction(i18n("Decrease Volume"), Key_Minus, TQT_TQOBJECT(this), TQT_SLOT(decVolume()), m_actions, "DecVolume");
-  action = new KAction(i18n("Options"), CTRL + Key_T, TQT_TQOBJECT(this), TQT_SLOT(showConfig()), m_actions, "Options");
-  action = new KAction(i18n("Shuffle"), Key_R, TQT_TQOBJECT(this), TQT_SLOT(randomSelected()), m_actions, "Shuffle");
-  action = new KAction(i18n("CDDB"), CTRL + Key_D, TQT_TQOBJECT(this), TQT_SLOT(CDDialogSelected()), m_actions, "CDDB");
+  action = new TDEAction(i18n("Decrease Volume"), Key_Minus, TQT_TQOBJECT(this), TQT_SLOT(decVolume()), m_actions, "DecVolume");
+  action = new TDEAction(i18n("Options"), CTRL + Key_T, TQT_TQOBJECT(this), TQT_SLOT(showConfig()), m_actions, "Options");
+  action = new TDEAction(i18n("Shuffle"), Key_R, TQT_TQOBJECT(this), TQT_SLOT(randomSelected()), m_actions, "Shuffle");
+  action = new TDEAction(i18n("CDDB"), CTRL + Key_D, TQT_TQOBJECT(this), TQT_SLOT(CDDialogSelected()), m_actions, "CDDB");
   
   m_actions->readShortcutSettings("Shortcuts");
   
diff --git a/kscd/kscd.h b/kscd/kscd.h
index fc1ab6ef..9d33b696 100644
--- a/kscd/kscd.h
+++ b/kscd/kscd.h
@@ -62,8 +62,8 @@ class KCompactDisc;
 class CDDBDlg;
 class DockWidget;
 class TQGridLayout;
-class KActionCollection;
-class KToggleAction;
+class TDEActionCollection;
+class TDEToggleAction;
 
 using namespace KCDDB;
 
@@ -118,7 +118,7 @@ public:
     void setDevicePaths();
     TQStringList audioSystems() { return audio_systems_list; }
 
-    KActionCollection* actionCollection() { return m_actions; }
+    TDEActionCollection* actionCollection() { return m_actions; }
 
 signals:
     void trackChanged(const TQString&);
@@ -223,9 +223,9 @@ private:
     KCDDB::CDInfo cddbInfo;
     TQStringList     playlist;
     KCDDB::Client*  cddb;
-    KActionCollection* m_actions;
+    TDEActionCollection* m_actions;
     TDEGlobalAccel* m_globalAccel;
-    KToggleAction* m_togglePopupsAction;
+    TDEToggleAction* m_togglePopupsAction;
     DockWidget* m_dockWidget;
     void lookupDevice();
     void initGlobalShortcuts();