From 9cc13dcbb01a96c9e60a07ca63c61d24b374f50d Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Fri, 16 Dec 2011 09:59:50 -0600
Subject: Revert "Rename a number of old tq methods that are no longer tq
 specific"

This reverts commit 3ca10fd9a2dc631429d3b5d5c5e42a7d211d5a12.
---
 certmanager/lib/backends/qgpgme/qgpgmecryptoconfig.cpp | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'certmanager/lib/backends/qgpgme/qgpgmecryptoconfig.cpp')

diff --git a/certmanager/lib/backends/qgpgme/qgpgmecryptoconfig.cpp b/certmanager/lib/backends/qgpgme/qgpgmecryptoconfig.cpp
index 65ed93811..51f8f68c8 100644
--- a/certmanager/lib/backends/qgpgme/qgpgmecryptoconfig.cpp
+++ b/certmanager/lib/backends/qgpgme/qgpgmecryptoconfig.cpp
@@ -41,7 +41,7 @@
 #include <ktempfile.h>
 #include <tqfile.h>
 #include <stdlib.h>
-#include <textcodec.h>
+#include <tqtextcodec.h>
 
 // Just for the Q_ASSERT in the dtor. Not thread-safe, but who would
 // have 2 threads talking to gpgconf anyway? :)
@@ -89,11 +89,11 @@ void QGpgMECryptoConfig::runGpgConf( bool showErrors )
   if ( showErrors && rc != 0 ) {
     TQString wmsg = i18n("<qt>Failed to execute gpgconf:<br>%1</qt>");
     if ( rc == -1 )
-        wmsg = wmsg.arg( i18n( "program not found" ) );
+        wmsg = wmsg.tqarg( i18n( "program not found" ) );
     else if ( rc == -2 )
-        wmsg = wmsg.arg( i18n( "program cannot be executed" ) );
+        wmsg = wmsg.tqarg( i18n( "program cannot be executed" ) );
     else
-        wmsg = wmsg.arg( strerror(rc) );
+        wmsg = wmsg.tqarg( strerror(rc) );
     kdWarning(5150) << wmsg << endl; // to see it from test_cryptoconfig.cpp
     KMessageBox::error(0, wmsg);
   }
@@ -306,7 +306,7 @@ void QGpgMECryptoConfigComponent::sync( bool runtime )
   }
   else if( rc != 0 ) // Happens due to bugs in gpgconf (e.g. issues 104/115)
   {
-    TQString wmsg = i18n( "Error from gpgconf while saving configuration: %1" ).arg( TQString::fromLocal8Bit( strerror( rc ) ) );
+    TQString wmsg = i18n( "Error from gpgconf while saving configuration: %1" ).tqarg( TQString::fromLocal8Bit( strerror( rc ) ) );
     kdWarning(5150) << k_funcinfo << ":" << strerror( rc ) << endl;
     KMessageBox::error(0, wmsg);
   }
@@ -809,7 +809,7 @@ TQString QGpgMECryptoConfigEntry::toString( bool escape ) const
   if ( !isList() ) // non-list non-string
   {
     if ( mArgType == ArgType_None ) {
-      return mValue.toBool() ? TQString::fromLatin1( "1" ) : TQString();
+      return mValue.toBool() ? TQString::tqfromLatin1( "1" ) : TQString();
     } else { // some int
       Q_ASSERT( mArgType == ArgType_Int || mArgType == ArgType_UInt );
       return mValue.toString(); // int to string conversion
-- 
cgit v1.2.1