TQt4 port kdeaddons

This enables compilation under both Qt3 and Qt4


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdeaddons@1237404 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

2 files changed, 13 insertions, 12 deletions

diff --git a/konq-plugins/arkplugin/arkplugin.cpp b/konq-plugins/arkplugin/arkplugin.cpp
index f1687fc..c1d18a1 100644
--- a/konq-plugins/arkplugin/arkplugin.cpp
+++ b/konq-plugins/arkplugin/arkplugin.cpp
@@ -73,7 +73,7 @@ ArkMenu::ArkMenu( KonqPopupMenu * popupmenu, const char *name, const TQStringLis
     while ( ( item = it.current() ) != 0 )
     {
         ++it;
-        if ( m_extractMimeTypes.contains( item->mimetype() ) )
+        if ( m_extractMimeTypes.tqcontains( item->mimetype() ) )
         {
             hasArchives = true;
         }
@@ -98,7 +98,7 @@ ArkMenu::ArkMenu( KonqPopupMenu * popupmenu, const char *name, const TQStringLis
         {
             item = itemList.first();
             m_name = itemList.first()->name();
-            action = new KAction( i18n( "Compress as %1" ).arg( m_name + m_ext ), 0, this,
+            action = new KAction( i18n( "Compress as %1" ).tqarg( m_name + m_ext ), 0, this,
                                     TQT_SLOT( slotCompressAsDefault() ), actionCollection() );
         }
         else
@@ -126,7 +126,7 @@ ArkMenu::ArkMenu( KonqPopupMenu * popupmenu, const char *name, const TQStringLis
         action = new KAction( i18n( "Add to Archive..." ), 0, this,
                                 TQT_SLOT( slotAdd() ), actionCollection() );
         actionMenu->insert( action );
-        addAction( actionMenu );
+        tqaddAction( actionMenu );
     }
 
     if ( !hasOther && hasArchives )
@@ -143,7 +143,7 @@ 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 KAction( i18n( "Extract to %1" ).tqarg( targetName ), 0, this,
                                         TQT_SLOT( slotExtractToSubfolders() ), actionCollection() );
             }
             else
@@ -155,12 +155,12 @@ ArkMenu::ArkMenu( KonqPopupMenu * popupmenu, const char *name, const TQStringLis
             action = new KAction( i18n( "Extract To..." ), 0 , this,
                                     TQT_SLOT( slotExtractTo() ), actionCollection() );
             actionMenu->insert( action );
-            addAction( actionMenu );
+            tqaddAction( actionMenu );
         }
         else
         {
            action = new KAction( i18n( "Extract To..." ), "ark", 0,  this, TQT_SLOT( slotExtractTo() ), actionCollection(), "ark_extract_menu" );
-           addAction( action );
+           tqaddAction( action );
         }
     }
     addSeparator();
@@ -442,7 +442,7 @@ void ArkMenu::stripExtension( TQString & name )
         ext = (*it).remove( '*' );
         if ( name.endsWith( ext ) )
         {
-            name = name.left( name.findRev( ext ) ) + '/';
+            name = name.left( name.tqfindRev( ext ) ) + '/';
             break;
         }
     }
@@ -456,13 +456,13 @@ void ArkMenu::slotCompressAs( int pos )
     TQStringList filelist( m_urlStringList );
 
     //if KMimeType returns .ZIP, .7Z or .RAR. convert them to lowercase
-    if ( m_extensionList[ pos ].contains ( ".ZIP" ) )
+    if ( m_extensionList[ pos ].tqcontains ( ".ZIP" ) )
          m_extensionList[ pos ] = ".zip";
 
-    if ( m_extensionList[ pos ].contains ( ".RAR" ) )
+    if ( m_extensionList[ pos ].tqcontains ( ".RAR" ) )
          m_extensionList[ pos ] = ".rar";
 
-    if ( m_extensionList[ pos ].contains ( ".7Z" ) )
+    if ( m_extensionList[ pos ].tqcontains ( ".7Z" ) )
          m_extensionList[ pos ] = ".7z";
 
     if ( filelist.count() == 1)
@@ -473,7 +473,7 @@ void ArkMenu::slotCompressAs( int pos )
         int i=1;
         while ( KIO::NetAccess::exists(target, true, 0 ) )
         {
-            target = m_dir + i18n("Archive %1").arg(i) + m_extensionList[ pos ];
+            target = m_dir + i18n("Archive %1").tqarg(i) + m_extensionList[ pos ];
             i++;
         }
     }
@@ -517,7 +517,7 @@ void ArkMenu::slotCompressAsDefault()
         int i=1;
         while ( KIO::NetAccess::exists(name, true, 0 ) )
         {
-            name = m_dir + i18n("Archive %1").arg(i) + m_ext;
+            name = m_dir + i18n("Archive %1").tqarg(i) + m_ext;
             i++;
         }
     }
diff --git a/konq-plugins/arkplugin/arkplugin.h b/konq-plugins/arkplugin/arkplugin.h
index 797d2d9..8cfdb94 100644
--- a/konq-plugins/arkplugin/arkplugin.h
+++ b/konq-plugins/arkplugin/arkplugin.h
@@ -30,6 +30,7 @@ class TQSignalMapper;
 
 class ArkMenu : public KonqPopupMenuPlugin {
   Q_OBJECT
+  TQ_OBJECT
 public:
     ArkMenu( KonqPopupMenu *, const char *name, const TQStringList & list );
     virtual ~ArkMenu();