Remove additional unneeded tq method conversions

6 files changed, 18 insertions, 18 deletions

diff --git a/krusader/VFS/arc_vfs.cpp b/krusader/VFS/arc_vfs.cpp
index dca82ae..bcbc401 100755
--- a/krusader/VFS/arc_vfs.cpp
+++ b/krusader/VFS/arc_vfs.cpp
@@ -215,7 +215,7 @@ bool arc_vfs::getDirs(){
     proc.start(KProcess::Block);
     if( !proc.normalExit() || !proc.exitStatus() == 0 ){
       if (!quietMode) KMessageBox::error(krApp, i18n("<qt>Can't read <b>%1</b>. Archive "
-                      "might be corrupted!</qt>").tqarg(arcFile.mid(arcFile.findRev('/')+1)));
+                      "might be corrupted!</qt>").arg(arcFile.mid(arcFile.findRev('/')+1)));
      error = true;
 		 return false;
     }
diff --git a/krusader/VFS/ftp_vfs.cpp b/krusader/VFS/ftp_vfs.cpp
index 28d8412..237ac1a 100644
--- a/krusader/VFS/ftp_vfs.cpp
+++ b/krusader/VFS/ftp_vfs.cpp
@@ -161,12 +161,12 @@ void ftp_vfs::slotListResult( KIO::Job *job ) {
 bool ftp_vfs::populateVfsList( const KURL& origin, bool showHidden ) {
 	TQString errorMsg = TQString();
 	if ( !origin.isValid() )
-		errorMsg = i18n( "Malformed URL:\n%1" ).tqarg( origin.url() );
+		errorMsg = i18n( "Malformed URL:\n%1" ).arg( origin.url() );
 	if ( !KProtocolInfo::supportsListing( origin ) ) {
 		if( origin.protocol() == "ftp" && KProtocolInfo::supportsReading( origin ) ) 
 			errorMsg = i18n( "Krusader doesn't support FTP access via HTTP.\nIf it is not the case, please check and change the Proxy settings in kcontrol." );
 		else
-			errorMsg = i18n( "Protocol not supported by Krusader:\n%1" ).tqarg( origin.url() );
+			errorMsg = i18n( "Protocol not supported by Krusader:\n%1" ).arg( origin.url() );
 	}
 
 	if ( !errorMsg.isEmpty() ) {
diff --git a/krusader/VFS/krarchandler.cpp b/krusader/VFS/krarchandler.cpp
index 8a183ba..56aeaed 100644
--- a/krusader/VFS/krarchandler.cpp
+++ b/krusader/VFS/krarchandler.cpp
@@ -202,7 +202,7 @@ long KRarcHandler::arcFileCount( TQString archive, TQString type, TQString passw
   krApp->stopWait();
   
   if( !list.normalExit() || !checkStatus( type, list.exitStatus() ) ) {
-    KMessageBox::detailedError (krApp, i18n( "Failed to list the content of the archive (%1)!" ).tqarg( archive ), 
+    KMessageBox::detailedError (krApp, i18n( "Failed to list the content of the archive (%1)!" ).arg( archive ), 
                                 list.getErrorMsg(), i18n("Error" ) );
     return 0;
   }
@@ -259,7 +259,7 @@ bool KRarcHandler::unpack( TQString archive, TQString type, TQString password, T
     cpio << KrServices::fullPathName( "rpm2cpio" ) << " " + KrServices::quote( archive ) << " > " << cpioName;
     cpio.start(KProcess::Block, KProcess::AllOutput );
     if( !cpio.normalExit() || !checkStatus( "cpio", cpio.exitStatus() ) ) {
-      KMessageBox::detailedError (krApp, i18n( "Failed to convert rpm (%1) to cpio!" ).tqarg( archive ), 
+      KMessageBox::detailedError (krApp, i18n( "Failed to convert rpm (%1) to cpio!" ).arg( archive ), 
                                   cpio.getErrorMsg(), i18n("Error" ) );
       return 0;
     }
@@ -276,7 +276,7 @@ bool KRarcHandler::unpack( TQString archive, TQString type, TQString password, T
     dpkg << KrServices::fullPathName( "dpkg" ) << " --fsys-tarfile " + KrServices::quote( archive ) << " > " << cpioName;
     dpkg.start(KProcess::Block, KProcess::AllOutput );
     if( !dpkg.normalExit() || !checkStatus( "-deb", dpkg.exitStatus() ) ) {
-      KMessageBox::detailedError (krApp, i18n( "Failed to convert deb (%1) to tar!" ).tqarg( archive ), 
+      KMessageBox::detailedError (krApp, i18n( "Failed to convert deb (%1) to tar!" ).arg( archive ), 
                                   dpkg.getErrorMsg(), i18n("Error" ) );
       return 0;
     }
@@ -336,7 +336,7 @@ bool KRarcHandler::unpack( TQString archive, TQString type, TQString password, T
   
   // check the return value
   if ( !proc.normalExit() || !checkStatus( type, proc.exitStatus() ) ) {
-    KMessageBox::detailedError (krApp, i18n( "Failed to unpack %1!" ).tqarg( archive ), 
+    KMessageBox::detailedError (krApp, i18n( "Failed to unpack %1!" ).arg( archive ), 
                                 krApp->wasWaitingCancelled() ? i18n( "User cancelled." ) : 
                                 proc.getErrorMsg(), i18n("Error" ) );
     return false;
@@ -446,7 +446,7 @@ bool KRarcHandler::pack( TQStringList fileNames, TQString type, TQString dest, l
 
      if( size >= 10000 ) {
        if( type == "-arj" || type == "-rar" )
-           packer += TQString( " -v%1b" ).tqarg( sizeStr );
+           packer += TQString( " -v%1b" ).arg( sizeStr );
      }
   }
 
@@ -459,24 +459,24 @@ bool KRarcHandler::pack( TQStringList fileNames, TQString type, TQString dest, l
 
      if( type == "-rar" ) {
        static const int rarLevels[] = { 0, 1, 2, 2, 3, 3, 4, 4, 5 };
-       packer += TQString( " -m%1" ).tqarg( rarLevels[ level ] );
+       packer += TQString( " -m%1" ).arg( rarLevels[ level ] );
      }
      else if( type == "-arj" ) {
        static const int arjLevels[] = { 0, 4, 4, 3, 3, 2, 2, 1, 1 };
-       packer += TQString( " -m%1" ).tqarg( arjLevels[ level ] );
+       packer += TQString( " -m%1" ).arg( arjLevels[ level ] );
      }
      else if( type == "-zip" ) {
        static const int zipLevels[] = { 0, 1, 2, 4, 5, 6, 7, 8, 9 };
-       packer += TQString( " -%1" ).tqarg( zipLevels[ level ] );
+       packer += TQString( " -%1" ).arg( zipLevels[ level ] );
      }
      else if( type == "-7z" ) {
        static const int sevenZipLevels[] = { 0, 1, 2, 4, 5, 6, 7, 8, 9 };
-       packer += TQString( " -mx%1" ).tqarg( sevenZipLevels[ level ] );
+       packer += TQString( " -mx%1" ).arg( sevenZipLevels[ level ] );
      }
   }
 
   if( extraProps.count( "CommandLineSwitches" ) > 0 )
-     packer += TQString( " %1" ).tqarg( extraProps[ "CommandLineSwitches" ] );
+     packer += TQString( " %1" ).arg( extraProps[ "CommandLineSwitches" ] );
   
   // prepare to pack
   KrShellProcess proc;
@@ -505,7 +505,7 @@ bool KRarcHandler::pack( TQStringList fileNames, TQString type, TQString dest, l
 
   // check the return value
   if ( !proc.normalExit() || !checkStatus( type, proc.exitStatus() ) ) {
-    KMessageBox::detailedError (krApp, i18n( "Failed to pack %1!" ).tqarg( dest ), 
+    KMessageBox::detailedError (krApp, i18n( "Failed to pack %1!" ).arg( dest ), 
                                 krApp->wasWaitingCancelled() ? i18n( "User cancelled." ) : proc.getErrorMsg(), 
                                 i18n("Error" ) );
     return false;
diff --git a/krusader/VFS/krquery.cpp b/krusader/VFS/krquery.cpp
index a3d3e84..d6dc625 100644
--- a/krusader/VFS/krquery.cpp
+++ b/krusader/VFS/krquery.cpp
@@ -451,7 +451,7 @@ bool KRQuery::checkTimer() const {
   if( timer.elapsed() >= STATUS_SEND_DELAY ) {
     int pcnt = (int)(100.*(double)receivedBytes/(double)totalBytes + .5);
     TQString message = i18n( "Searching content of '%1' (%2%)" )
-                      .tqarg( fileName ).tqarg( pcnt );
+                      .arg( fileName ).arg( pcnt );
     timer.start();
     emit ((KRQuery *)this)->status( message );
     return true;
diff --git a/krusader/VFS/normal_vfs.cpp b/krusader/VFS/normal_vfs.cpp
index 6ab0f55..370b943 100644
--- a/krusader/VFS/normal_vfs.cpp
+++ b/krusader/VFS/normal_vfs.cpp
@@ -87,7 +87,7 @@ bool normal_vfs::populateVfsList(const KURL& origin, bool showHidden){
 	// check that the new origin exists
 	if ( !TQDir(path).exists() )
 	{
-		if( !quietMode ) KMessageBox::error(krApp, i18n("Directory %1 does not exist!").tqarg( path ), i18n("Error"));
+		if( !quietMode ) KMessageBox::error(krApp, i18n("Directory %1 does not exist!").arg( path ), i18n("Error"));
 		return false;
 	}
     
@@ -97,7 +97,7 @@ bool normal_vfs::populateVfsList(const KURL& origin, bool showHidden){
 	DIR* dir = opendir(path.local8Bit());
 	if(!dir) 
 	{
-		if( !quietMode ) KMessageBox::error(krApp, i18n("Can't open the %1 directory!").tqarg( path ), i18n("Error"));
+		if( !quietMode ) KMessageBox::error(krApp, i18n("Can't open the %1 directory!").arg( path ), i18n("Error"));
 		return false;
 	}
 
diff --git a/krusader/VFS/vfs.h b/krusader/VFS/vfs.h
index 4c47fa2..60fcfe7 100644
--- a/krusader/VFS/vfs.h
+++ b/krusader/VFS/vfs.h
@@ -124,7 +124,7 @@ public slots:
 	bool vfs_refresh();
 	void vfs_setQuiet(bool beQuiet){ quietMode=beQuiet; }
 	void vfs_enableRefresh(bool enable);        
-	void vfs_tqinvalidate() { invalidated = true; }          
+	void vfs_invalidate() { invalidated = true; }          
 
 signals:
 	void startUpdate(); //< emitted when the VFS starts to refresh its list of vfiles.