Rename a number of classes to enhance compatibility with KDE4

2 files changed, 22 insertions, 22 deletions

diff --git a/konq-plugins/arkplugin/arkplugin.cpp b/konq-plugins/arkplugin/arkplugin.cpp
index 4bfc14b..9e812c3 100644
--- a/konq-plugins/arkplugin/arkplugin.cpp
+++ b/konq-plugins/arkplugin/arkplugin.cpp
@@ -87,33 +87,33 @@ ArkMenu::ArkMenu( KonqPopupMenu * popupmenu, const char *name, const TQStringLis
     }
 
     TQString ext;
-    KActionMenu * actionMenu;
-    KAction * action;
+    TDEActionMenu * actionMenu;
+    TDEAction * action;
     if ( hasOther &&  itemList.first()->name()!="." && popupmenu->protocolInfo().supportsWriting() )	// don't try to compress if we right click on a folder without files selected
     {
         compMimeTypes();
-        actionMenu = new KActionMenu( i18n( "Compress" ), "ark", actionCollection(), "ark_compress_menu"  );
+        actionMenu = new TDEActionMenu( i18n( "Compress" ), "ark", actionCollection(), "ark_compress_menu"  );
         m_ext = m_conf->readEntry( "LastExtension", ".tar.gz" );
         if ( itemCount == 1 )
         {
             item = itemList.first();
             m_name = itemList.first()->name();
-            action = new KAction( i18n( "Compress as %1" ).arg( m_name + m_ext ), 0, this,
+            action = new TDEAction( i18n( "Compress as %1" ).arg( m_name + m_ext ), 0, this,
                                     TQT_SLOT( slotCompressAsDefault() ), actionCollection() );
         }
         else
         {
-            action = new KAction( KMimeType::mimeType( m_conf->readEntry(
+            action = new TDEAction( KMimeType::mimeType( m_conf->readEntry(
                                     "LastMimeType", "application/x-tgz" ) )->comment(),
                                     0, this, TQT_SLOT( slotCompressAsDefault() ), actionCollection() );
         }
         actionMenu->insert( action );
 
-        m_compAsMenu = new KActionMenu( i18n( "Compress As" ), actionCollection(), "arkcmpasmnu" );
+        m_compAsMenu = new TDEActionMenu( i18n( "Compress As" ), actionCollection(), "arkcmpasmnu" );
         actionMenu->insert( m_compAsMenu );
 
 
-        m_addToMenu = new KActionMenu( i18n( "Add To" ), actionCollection(), "arkaddtomnu" );
+        m_addToMenu = new TDEActionMenu( i18n( "Add To" ), actionCollection(), "arkaddtomnu" );
         if ( itemList.first()->url().isLocalFile() )
             actionMenu->insert( m_addToMenu );
 
@@ -123,7 +123,7 @@ ArkMenu::ArkMenu( KonqPopupMenu * popupmenu, const char *name, const TQStringLis
                 this, TQT_SLOT( slotPrepareAddToMenu() ) );
 
 
-        action = new KAction( i18n( "Add to Archive..." ), 0, this,
+        action = new TDEAction( i18n( "Add to Archive..." ), 0, this,
                                 TQT_SLOT( slotAdd() ), actionCollection() );
         actionMenu->insert( action );
         addAction( actionMenu );
@@ -133,9 +133,9 @@ ArkMenu::ArkMenu( KonqPopupMenu * popupmenu, const char *name, const TQStringLis
     {
         if ( popupmenu->protocolInfo().supportsWriting() )
         {
-            actionMenu = new KActionMenu( i18n( "Extract" ), "ark", actionCollection(), "ark_extract_menu"  );
+            actionMenu = new TDEActionMenu( i18n( "Extract" ), "ark", actionCollection(), "ark_extract_menu"  );
 
-            action = new KAction( i18n( "Extract Here" ), 0, this,
+            action = new TDEAction( i18n( "Extract Here" ), 0, this,
                                     TQT_SLOT( slotExtractHere() ), actionCollection() );
             actionMenu->insert( action );
             // stolen from arkwidget.cpp
@@ -143,23 +143,23 @@ ArkMenu::ArkMenu( KonqPopupMenu * popupmenu, const char *name, const TQStringLis
             {
                 TQString targetName = itemList.first()->name();
                 stripExtension( targetName );
-                action = new KAction( i18n( "Extract to %1" ).arg( targetName ), 0, this,
+                action = new TDEAction( i18n( "Extract to %1" ).arg( targetName ), 0, this,
                                         TQT_SLOT( slotExtractToSubfolders() ), actionCollection() );
             }
             else
             {
-                action = new KAction( i18n( "Extract to Subfolders" ), 0, this,
+                action = new TDEAction( i18n( "Extract to Subfolders" ), 0, this,
                                         TQT_SLOT( slotExtractToSubfolders() ), actionCollection() );
             }
             actionMenu->insert( action );
-            action = new KAction( i18n( "Extract To..." ), 0 , this,
+            action = new TDEAction( i18n( "Extract To..." ), 0 , this,
                                     TQT_SLOT( slotExtractTo() ), actionCollection() );
             actionMenu->insert( action );
             addAction( actionMenu );
         }
         else
         {
-           action = new KAction( i18n( "Extract To..." ), "ark", 0,  this, TQT_SLOT( slotExtractTo() ), actionCollection(), "ark_extract_menu" );
+           action = new TDEAction( i18n( "Extract To..." ), "ark", 0,  this, TQT_SLOT( slotExtractTo() ), actionCollection(), "ark_extract_menu" );
            addAction( action );
         }
     }
@@ -176,7 +176,7 @@ void ArkMenu::slotPrepareCompAsMenu()
     disconnect( m_compAsMenu->popupMenu(), TQT_SIGNAL( aboutToShow() ),
                 this, TQT_SLOT( slotPrepareCompAsMenu() ) );
 
-    KAction * action;
+    TDEAction * action;
     m_compAsMapper = new TQSignalMapper( this, "compAsMapper" );
     TQString ext;
     TQStringList newExt;
@@ -194,13 +194,13 @@ void ArkMenu::slotPrepareCompAsMenu()
             *eit = ".tar.bz2";
         if ( m_urlList.count() == 1 )
         {
-            action = new KAction( m_name + (*eit), 0, m_compAsMapper,
+            action = new TDEAction( m_name + (*eit), 0, m_compAsMapper,
                     TQT_SLOT( map() ), actionCollection() );
         }
         else
         {
             ext = KMimeType::mimeType(*mit)->comment();
-            action = new KAction( ext, 0, m_compAsMapper,
+            action = new TDEAction( ext, 0, m_compAsMapper,
                     TQT_SLOT( map() ), actionCollection() );
         }
 
@@ -231,7 +231,7 @@ void ArkMenu::slotPrepareAddToMenu()
         slotPrepareCompAsMenu();
 
     unsigned int counter = 0;
-    KAction * action;
+    TDEAction * action;
     m_addToMapper = new TQSignalMapper( this, "addToMapper" );
     TQCString actionName;
     TQStringList::Iterator mit;
@@ -244,7 +244,7 @@ void ArkMenu::slotPrepareAddToMenu()
         for ( mit = m_extensionList.begin(); mit != m_extensionList.end(); ++mit )
             if ( (*uit).endsWith(*mit) )
             {
-                action = new KAction( *uit, 0, m_addToMapper,
+                action = new TDEAction( *uit, 0, m_addToMapper,
                                       TQT_SLOT( map() ), actionCollection() );
                 m_addToMenu->insert( action );
                 m_addToMapper->setMapping( action, counter );
diff --git a/konq-plugins/arkplugin/arkplugin.h b/konq-plugins/arkplugin/arkplugin.h
index 0d13158..b59697c 100644
--- a/konq-plugins/arkplugin/arkplugin.h
+++ b/konq-plugins/arkplugin/arkplugin.h
@@ -25,7 +25,7 @@
 #include <tdefileitem.h>
 #include <tdeconfig.h>
 
-class KAction;
+class TDEAction;
 class TQSignalMapper;
 
 class ArkMenu : public KonqPopupMenuPlugin {
@@ -61,8 +61,8 @@ private:
     TQStringList m_archiveMimeTypes;
     TQStringList m_extractMimeTypes;
     TQStringList m_extensionList;
-    KActionMenu * m_compAsMenu;
-    KActionMenu * m_addToMenu;
+    TDEActionMenu * m_compAsMenu;
+    TDEActionMenu * m_addToMenu;
     TQSignalMapper * m_compAsMapper;
     TQSignalMapper * m_addToMapper;
     TDEConfig * m_conf;