Rename a number of classes to enhance compatibility with KDE4

2 files changed, 16 insertions, 16 deletions

diff --git a/lib/util/tdescriptactionmanager.cpp b/lib/util/tdescriptactionmanager.cpp
index 619b974d..a74841e5 100644
--- a/lib/util/tdescriptactionmanager.cpp
+++ b/lib/util/tdescriptactionmanager.cpp
@@ -32,7 +32,7 @@
 #include <tqfileinfo.h>
 #include <tqtimer.h>
 
-KScriptAction::KScriptAction( const TQString &scriptDesktopFile, TQObject *interface, KActionCollection *ac )
+KScriptAction::KScriptAction( const TQString &scriptDesktopFile, TQObject *interface, TDEActionCollection *ac )
     : TQObject(interface), KScriptClientInterface( )
 {
     m_interface = 0L;
@@ -52,7 +52,7 @@ KScriptAction::KScriptAction( const TQString &scriptDesktopFile, TQObject *inter
 	TDETrader::OfferList offers = TDETrader::self()->query( "KScriptRunner/KScriptRunner", scriptTypeQuery );
         if ( !offers.isEmpty() )
         {
-            m_action = new KAction(m_scriptName, KShortcut(), this, TQT_SLOT(activate()), ac, "script");
+            m_action = new TDEAction(m_scriptName, TDEShortcut(), this, TQT_SLOT(activate()), ac, "script");
             m_isValid = true;
             m_timeout = new TQTimer(this);
             TQString icon = desktop.readIcon();
@@ -73,7 +73,7 @@ KScriptAction::~KScriptAction()
 
 
 
-KAction * KScriptAction::action( )
+TDEAction * KScriptAction::action( )
 {
     return m_action;
 }
@@ -119,7 +119,7 @@ void KScriptAction::scriptFinished()
     m_refs--;
 }
 
-KScriptActionManager::KScriptActionManager(  TQObject *parent, KActionCollection * ac ) : TQObject(parent), m_ac(ac)
+KScriptActionManager::KScriptActionManager(  TQObject *parent, TDEActionCollection * ac ) : TQObject(parent), m_ac(ac)
 {
     m_actions.setAutoDelete(true);
 }
@@ -129,10 +129,10 @@ KScriptActionManager::~ KScriptActionManager( )
     m_actions.clear();
 }
 
-TQPtrList< KAction > KScriptActionManager::scripts( TQObject * interface , const TQStringList &dirs) const
+TQPtrList< TDEAction > KScriptActionManager::scripts( TQObject * interface , const TQStringList &dirs) const
 {
     m_actions.clear();
-    TQPtrList<KAction> actions;
+    TQPtrList<TDEAction> actions;
     TQStringList scripts;
 
     scripts += TDEGlobal::dirs()->findAllResources("data",
diff --git a/lib/util/tdescriptactionmanager.h b/lib/util/tdescriptactionmanager.h
index c2e43238..6c68457b 100644
--- a/lib/util/tdescriptactionmanager.h
+++ b/lib/util/tdescriptactionmanager.h
@@ -24,14 +24,14 @@
 #include <tqobject.h>
 #include <tqptrlist.h>
 
-class KAction;
-class KActionCollection;
+class TDEAction;
+class TDEActionCollection;
 class KScriptInterface;
 class KScriptActionManager;
 class TQTimer;
 
 /**
-* Connects a KAction to a script runner.
+* Connects a TDEAction to a script runner.
 * 
 * @author ian geiser geiseri@sourcextreme.com
 */
@@ -40,14 +40,14 @@ class KScriptAction : public TQObject, public KScriptClientInterface {
   
 public:
 
-    KScriptAction( const TQString &scriptDesktopFile, TQObject *interface, KActionCollection *ac );
+    KScriptAction( const TQString &scriptDesktopFile, TQObject *interface, TDEActionCollection *ac );
 
     virtual ~KScriptAction();
 
     /**
-    * KAction for the current script
+    * TDEAction for the current script
      */
-    KAction *action();
+    TDEAction *action();
 
     /**
     * Returns the validity of the current script.
@@ -75,7 +75,7 @@ private slots:
     void scriptFinished();
 
 private:
-    KAction *m_action;
+    TDEAction *m_action;
     TQString m_scriptName;
     TQString m_scriptType;
     TQString m_scriptFile;
@@ -99,7 +99,7 @@ public:
     /**
     * Create a script manager that is attached to an action collection.
      */
-    KScriptActionManager( TQObject *parent, KActionCollection *ac );
+    KScriptActionManager( TQObject *parent, TDEActionCollection *ac );
     ~KScriptActionManager();
 
     /**
@@ -110,7 +110,7 @@ public:
     * the manager will search in $KDEPATH/data/coolapp/data for all desktop
     * files that are scripts.
      */
-    TQPtrList<KAction> scripts( TQObject *interface, const TQStringList &dirs = TQStringList() ) const;
+    TQPtrList<TDEAction> scripts( TQObject *interface, const TQStringList &dirs = TQStringList() ) const;
 
 signals:
     /**
@@ -136,6 +136,6 @@ signals:
 
 private:
     mutable TQPtrList<KScriptAction> m_actions;
-    KActionCollection *m_ac;
+    TDEActionCollection *m_ac;
 };
 #endif