Rename old tq methods that no longer need a unique name

5 files changed, 14 insertions, 14 deletions

diff --git a/krusader/VFS/krarchandler.cpp b/krusader/VFS/krarchandler.cpp
index c5507f4..8a183ba 100644
--- a/krusader/VFS/krarchandler.cpp
+++ b/krusader/VFS/krarchandler.cpp
@@ -201,7 +201,7 @@ long KRarcHandler::arcFileCount( TQString archive, TQString type, TQString passw
   
   krApp->stopWait();
   
-  if( !list.normalExit() || !checktqStatus( type, list.exitStatus() ) ) {
+  if( !list.normalExit() || !checkStatus( type, list.exitStatus() ) ) {
     KMessageBox::detailedError (krApp, i18n( "Failed to list the content of the archive (%1)!" ).tqarg( archive ), 
                                 list.getErrorMsg(), i18n("Error" ) );
     return 0;
@@ -258,7 +258,7 @@ bool KRarcHandler::unpack( TQString archive, TQString type, TQString password, T
     KrShellProcess cpio;
     cpio << KrServices::fullPathName( "rpm2cpio" ) << " " + KrServices::quote( archive ) << " > " << cpioName;
     cpio.start(KProcess::Block, KProcess::AllOutput );
-    if( !cpio.normalExit() || !checktqStatus( "cpio", cpio.exitStatus() ) ) {
+    if( !cpio.normalExit() || !checkStatus( "cpio", cpio.exitStatus() ) ) {
       KMessageBox::detailedError (krApp, i18n( "Failed to convert rpm (%1) to cpio!" ).tqarg( archive ), 
                                   cpio.getErrorMsg(), i18n("Error" ) );
       return 0;
@@ -275,7 +275,7 @@ bool KRarcHandler::unpack( TQString archive, TQString type, TQString password, T
     KrShellProcess dpkg;
     dpkg << KrServices::fullPathName( "dpkg" ) << " --fsys-tarfile " + KrServices::quote( archive ) << " > " << cpioName;
     dpkg.start(KProcess::Block, KProcess::AllOutput );
-    if( !dpkg.normalExit() || !checktqStatus( "-deb", dpkg.exitStatus() ) ) {
+    if( !dpkg.normalExit() || !checkStatus( "-deb", dpkg.exitStatus() ) ) {
       KMessageBox::detailedError (krApp, i18n( "Failed to convert deb (%1) to tar!" ).tqarg( archive ), 
                                   dpkg.getErrorMsg(), i18n("Error" ) );
       return 0;
@@ -335,7 +335,7 @@ bool KRarcHandler::unpack( TQString archive, TQString type, TQString password, T
     TQFile( cpioName ).remove();    /* remove the cpio file */
   
   // check the return value
-  if ( !proc.normalExit() || !checktqStatus( type, proc.exitStatus() ) ) {
+  if ( !proc.normalExit() || !checkStatus( type, proc.exitStatus() ) ) {
     KMessageBox::detailedError (krApp, i18n( "Failed to unpack %1!" ).tqarg( archive ), 
                                 krApp->wasWaitingCancelled() ? i18n( "User cancelled." ) : 
                                 proc.getErrorMsg(), i18n("Error" ) );
@@ -397,7 +397,7 @@ bool KRarcHandler::test( TQString archive, TQString type, TQString password, lon
   krApp->stopWait();
 
   // check the return value
-  if ( !proc.normalExit() || !checktqStatus( type, proc.exitStatus() ) )
+  if ( !proc.normalExit() || !checkStatus( type, proc.exitStatus() ) )
     return false;
 
   return true; // SUCCESS
@@ -504,7 +504,7 @@ bool KRarcHandler::pack( TQStringList fileNames, TQString type, TQString dest, l
   krApp->stopWait();
 
   // check the return value
-  if ( !proc.normalExit() || !checktqStatus( type, proc.exitStatus() ) ) {
+  if ( !proc.normalExit() || !checkStatus( type, proc.exitStatus() ) ) {
     KMessageBox::detailedError (krApp, i18n( "Failed to pack %1!" ).tqarg( dest ), 
                                 krApp->wasWaitingCancelled() ? i18n( "User cancelled." ) : proc.getErrorMsg(), 
                                 i18n("Error" ) );
@@ -597,7 +597,7 @@ TQString KRarcHandler::getType( bool &encrypted, TQString fileName, TQString mim
 }
 
 
-bool KRarcHandler::checktqStatus( TQString type, int exitCode ) {
+bool KRarcHandler::checkStatus( TQString type, int exitCode ) {
 	if( type == "-zip" || type == "-rar" || type == "-7z" )
 		return exitCode == 0 || exitCode == 1;
 	else if( type == "-ace" || type == "zip2" || type == "-lha" || type == "-rpm" || type == "cpio" ||
diff --git a/krusader/VFS/krarchandler.h b/krusader/VFS/krarchandler.h
index 70dff00..6324976 100644
--- a/krusader/VFS/krarchandler.h
+++ b/krusader/VFS/krarchandler.h
@@ -64,7 +64,7 @@ public:
   static TQString detectArchive( bool &encrypted, TQString fileName, bool checkEncrypted = true );
 private:
   // checks if the returned status is correct
-  static bool checktqStatus( TQString type, int exitCode );
+  static bool checkStatus( TQString type, int exitCode );
 
   static KWallet::Wallet * wallet;
 };
diff --git a/krusader/VFS/krquery.cpp b/krusader/VFS/krquery.cpp
index 1735169..a3d3e84 100644
--- a/krusader/VFS/krquery.cpp
+++ b/krusader/VFS/krquery.cpp
@@ -571,16 +571,16 @@ void KRQuery::setContent( const TQString &content, bool cs, bool wholeWord, bool
   containOnRemote = remoteSearch;
 }
 
-void KRQuery::setMinimumFileSize( KIO::filesize_t tqminimumSize )
+void KRQuery::setMinimumFileSize( KIO::filesize_t minimumSize )
 {
   bNull = false;
-  minSize = tqminimumSize;
+  minSize = minimumSize;
 }
 
-void KRQuery::setMaximumFileSize( KIO::filesize_t tqmaximumSize )
+void KRQuery::setMaximumFileSize( KIO::filesize_t maximumSize )
 {
   bNull = false;
-  maxSize = tqmaximumSize;
+  maxSize = maximumSize;
 }
 
 void KRQuery::setNewerThan( time_t time )
diff --git a/krusader/VFS/normal_vfs.cpp b/krusader/VFS/normal_vfs.cpp
index 9db06a7..6ab0f55 100644
--- a/krusader/VFS/normal_vfs.cpp
+++ b/krusader/VFS/normal_vfs.cpp
@@ -337,7 +337,7 @@ TQString normal_vfs::getACL( const TQString & path, int type )
 		return TQString();
 	
 	char *aclString = acl_to_text( acl, 0 );
-	TQString ret = TQString::tqfromLatin1( aclString );
+	TQString ret = TQString::fromLatin1( aclString );
 	acl_free( (void*)aclString );
 	acl_free( acl );
 	
diff --git a/krusader/VFS/preservingcopyjob.cpp b/krusader/VFS/preservingcopyjob.cpp
index d374004..03b98c8 100644
--- a/krusader/VFS/preservingcopyjob.cpp
+++ b/krusader/VFS/preservingcopyjob.cpp
@@ -134,7 +134,7 @@ void PreservingCopyJob::slotAboutToCreate( KIO::Job */*job*/, const TQValueList<
       if( acl )
       {
         char *aclString = acl_to_text( acl, 0 );
-        aclStr = TQString::tqfromLatin1( aclString );
+        aclStr = TQString::fromLatin1( aclString );
         acl_free( (void*)aclString );
         acl_free( acl );
       }