Rename a number of classes to enhance compatibility with KDE4

6 files changed, 12 insertions, 12 deletions

diff --git a/konq-plugins/kuick/kdirmenu.cpp b/konq-plugins/kuick/kdirmenu.cpp
index 754de2b..20c2033 100644
--- a/konq-plugins/kuick/kdirmenu.cpp
+++ b/konq-plugins/kuick/kdirmenu.cpp
@@ -50,7 +50,7 @@ KDirMenu::KDirMenu ( TQWidget *parent, const KURL &_src,
 
     TQFileInfo fileInfo(path);
     if (( src.path() != path || !src.isLocalFile()) && fileInfo.isWritable())
-        action = new KAction(name, 0, TQT_TQOBJECT(this), TQT_SLOT(new_slot( ) ), TQT_TQOBJECT(this));
+        action = new TDEAction(name, 0, TQT_TQOBJECT(this), TQT_SLOT(new_slot( ) ), TQT_TQOBJECT(this));
 }
 KDirMenu::~KDirMenu( ) {
     delete action;
diff --git a/konq-plugins/kuick/kdirmenu.h b/konq-plugins/kuick/kdirmenu.h
index 8906dc7..b01b902 100644
--- a/konq-plugins/kuick/kdirmenu.h
+++ b/konq-plugins/kuick/kdirmenu.h
@@ -25,7 +25,7 @@
 #include <tqptrlist.h>
 #include <tqmap.h>
 
-class KAction;
+class TDEAction;
 class KURL;
 
 class KDirMenu : public TQPopupMenu {
@@ -47,7 +47,7 @@ private:
     TQString path;
     TQString name;
     KURL src;
-    KAction *action;
+    TDEAction *action;
     TQPtrList<KDirMenu> children;
     void initIconMap( );
 public slots:
diff --git a/konq-plugins/kuick/kmetamenu.cpp b/konq-plugins/kuick/kmetamenu.cpp
index 7ba7a87..9309a74 100644
--- a/konq-plugins/kuick/kmetamenu.cpp
+++ b/konq-plugins/kuick/kmetamenu.cpp
@@ -111,7 +111,7 @@ KMetaMenu::KMetaMenu( TQWidget *parent, const KURL &url,
     }
 
 
-     m_browse = new KAction(i18n("&Browse..."), 0, TQT_TQOBJECT(this), TQT_SLOT(slotBrowse()), TQT_TQOBJECT(this) );
+     m_browse = new TDEAction(i18n("&Browse..."), 0, TQT_TQOBJECT(this), TQT_SLOT(slotBrowse()), TQT_TQOBJECT(this) );
      m_browse->plug(this);
      // read the last chosen dirs
      // first set the group according to our parameter
@@ -133,7 +133,7 @@ KMetaMenu::KMetaMenu( TQWidget *parent, const KURL &url,
              continue;
          }
          TQString escapedDir = *it;
-         KAction *action = new KAction(escapedDir.replace("&", "&&"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotFastPath()), TQT_TQOBJECT(this));
+         TDEAction *action = new TDEAction(escapedDir.replace("&", "&&"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotFastPath()), TQT_TQOBJECT(this));
          action->plug(this );
          actions.append( action );
          ++it;
@@ -158,8 +158,8 @@ void KMetaMenu::slotFileChosen(const TQString &path ){
 }
 
 void KMetaMenu::slotFastPath( ) {
-     KAction *action;
-     action = (KAction*) sender();
+     TDEAction *action;
+     action = (TDEAction*) sender();
      TQString text = action->plainText( );
      slotFileChosen( text );
 }
diff --git a/konq-plugins/kuick/kmetamenu.h b/konq-plugins/kuick/kmetamenu.h
index 3d60b86..e22ff19 100644
--- a/konq-plugins/kuick/kmetamenu.h
+++ b/konq-plugins/kuick/kmetamenu.h
@@ -57,11 +57,11 @@ private:
      KDirMenu *m_current;
      KIMContactMenu *m_contacts;
      KIMProxy *m_proxy;
-     KAction *m_browse;
+     TDEAction *m_browse;
      TQStringList list;
      TDEConfig *conf;
      TQString group;
-     TQPtrList<KAction> actions;
+     TQPtrList<TDEAction> actions;
 };
 
 #endif
diff --git a/konq-plugins/kuick/kuick_plugin.cpp b/konq-plugins/kuick/kuick_plugin.cpp
index b0ccaef..cb8730a 100644
--- a/konq-plugins/kuick/kuick_plugin.cpp
+++ b/konq-plugins/kuick/kuick_plugin.cpp
@@ -42,7 +42,7 @@ KTestMenu::KTestMenu( KonqPopupMenu *popupmenu, const char *name, const TQString
     popup= popupmenu ;
     meta_copy_mmu = 0L;
     meta_move_mmu = 0L;
-    my_action = new KAction( "kuick_plugin", 0, this, TQT_SLOT( slotPopupMaeh( ) ), actionCollection( ), "Do some funky stuff"  );
+    my_action = new TDEAction( "kuick_plugin", 0, this, TQT_SLOT( slotPopupMaeh( ) ), actionCollection( ), "Do some funky stuff"  );
     addAction( my_action );
     addSeparator();
     //popupmenu->addMerge();
diff --git a/konq-plugins/kuick/kuick_plugin.h b/konq-plugins/kuick/kuick_plugin.h
index caaba8d..d39fad2 100644
--- a/konq-plugins/kuick/kuick_plugin.h
+++ b/konq-plugins/kuick/kuick_plugin.h
@@ -24,7 +24,7 @@
 
 #include "kmetamenu.h"
 
-class KAction;
+class TDEAction;
 class KURL;
 class KTestMenu : public KonqPopupMenuPlugin {
   Q_OBJECT
@@ -37,7 +37,7 @@ public:
     KonqPopupMenu *popup;
 
 private:
-    KAction *my_action;
+    TDEAction *my_action;
 	KIMProxy *m_imProxy;
 	
 public slots: