From 3ca10fd9a2dc631429d3b5d5c5e42a7d211d5a12 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Thu, 15 Dec 2011 15:50:21 -0600
Subject: Rename a number of old tq methods that are no longer tq specific

---
 libkpgp/kpgp.cpp | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

(limited to 'libkpgp/kpgp.cpp')

diff --git a/libkpgp/kpgp.cpp b/libkpgp/kpgp.cpp
index 6035112c8..08557a727 100644
--- a/libkpgp/kpgp.cpp
+++ b/libkpgp/kpgp.cpp
@@ -313,7 +313,7 @@ Module::clearsign( Block& block,
 
 Kpgp::Result
 Module::encrypt( Block& block,
-                 const TQStringList& tqreceivers, const KeyID& keyId,
+                 const TQStringList& receivers, const KeyID& keyId,
                  bool sign, const TQCString& charset )
 {
   KeyIDList encryptionKeyIds; // list of keys which are used for encryption
@@ -324,8 +324,8 @@ Module::encrypt( Block& block,
 
   setUser( keyId );
 
-  if( !tqreceivers.empty() ) {
-    Kpgp::Result result = getEncryptionKeys( encryptionKeyIds, tqreceivers,
+  if( !receivers.empty() ) {
+    Kpgp::Result result = getEncryptionKeys( encryptionKeyIds, receivers,
                                              keyId );
     if( Kpgp::Ok != result ) {
       return result;
@@ -371,7 +371,7 @@ Module::encrypt( Block& block,
     TQString str = i18n("%1 = 'signing failed' error message",
                        "%1\nDo you want to send the message unsigned, "
                        "or cancel sending the message?")
-                  .tqarg( pgp->lastErrorMessage() );
+                  .arg( pgp->lastErrorMessage() );
     TQApplication::setOverrideCursor( TQCursor(TQCursor::ArrowCursor) );
     int ret = KMessageBox::warningContinueCancel( 0, str,
                                                   i18n("PGP Warning"),
@@ -389,7 +389,7 @@ Module::encrypt( Block& block,
     TQString str = i18n("%1 = 'bad keys' error message",
                        "%1\nDo you want to encrypt anyway, leave the "
                        "message as-is, or cancel sending the message?")
-                  .tqarg( pgp->lastErrorMessage() );
+                  .arg( pgp->lastErrorMessage() );
 
     TQApplication::setOverrideCursor( TQCursor(TQCursor::ArrowCursor) );
     int ret = KMessageBox::warningYesNoCancel( 0, str,
@@ -416,7 +416,7 @@ Module::encrypt( Block& block,
     TQString str = i18n("%1 = 'missing keys' error message",
                        "%1\nDo you want to leave the message as-is, "
                        "or cancel sending the message?")
-                  .tqarg( pgp->lastErrorMessage() );
+                  .arg( pgp->lastErrorMessage() );
     TQApplication::setOverrideCursor( TQCursor(TQCursor::ArrowCursor) );
     int ret = KMessageBox::warningContinueCancel( 0, str,
                                                   i18n("PGP Warning"),
@@ -432,10 +432,10 @@ Module::encrypt( Block& block,
   if( status & ERROR ) {
     // show error dialog
     errMsg = i18n( "The following error occurred:\n%1" )
-             .tqarg( pgp->lastErrorMessage() );
+             .arg( pgp->lastErrorMessage() );
     TQString details = i18n( "This is the error message of %1:\n%2" )
-                      .tqarg( ( pgpType == tGPG ) ? "GnuPG" : "PGP" )
-                      .tqarg( block.error().data() );
+                      .arg( ( pgpType == tGPG ) ? "GnuPG" : "PGP" )
+                      .arg( block.error().data() );
     TQApplication::setOverrideCursor( TQCursor(TQCursor::ArrowCursor) );
     KMessageBox::detailedSorry( 0, errMsg, details );
     TQApplication::restoreOverrideCursor();
@@ -1216,7 +1216,7 @@ Module::getEncryptionKeys( const TQString& person )
                                 "encryption key(s) for \"%1\".\n\n"
                                 "Please re-select the key(s) which should "
                                 "be used for this recipient."
-                                ).tqarg(person),
+                                ).arg(person),
                            keyIds,
                            allowedKeys );
       if( !keyIds.isEmpty() ) {
@@ -1280,7 +1280,7 @@ Module::getEncryptionKeys( const TQString& person )
                                         "found for \"%1\".\n\n"
                                         "Select the key(s) which should "
                                         "be used for this recipient."
-                                        ).tqarg(person),
+                                        ).arg(person),
                                    KeyIDList(),
                                    allowedKeys );
     if( !keyIds.isEmpty() ) {
@@ -1305,7 +1305,7 @@ Module::getEncryptionKeys( const TQString& person )
                                         "More than one key matches \"%1\".\n\n"
                                         "Select the key(s) which should "
                                         "be used for this recipient."
-                                        ).tqarg(person),
+                                        ).arg(person),
                                    KeyIDList(),
                                    allowedKeys );
     if( !keyIds.isEmpty() ) {
@@ -1744,7 +1744,7 @@ Module::readAddressData()
 
   addressDataDict.clear();
   for( int i=1; i<=num; i++ ) {
-    KConfigGroup addrGroup( config, TQString("Address #%1").tqarg(i).local8Bit() );
+    KConfigGroup addrGroup( config, TQString("Address #%1").arg(i).local8Bit() );
     address = addrGroup.readEntry( "Address" );
     data.keyIds = KeyIDList::fromStringList( addrGroup.readListEntry( "Key IDs" ) );
     data.encrPref = (EncryptPref) addrGroup.readNumEntry( "EncryptionPreference",
@@ -1769,7 +1769,7 @@ Module::writeAddressData()
   for ( i=1, it = addressDataDict.begin();
         it != addressDataDict.end();
         ++it, i++ ) {
-    KConfigGroup addrGroup( config, TQString("Address #%1").tqarg(i).local8Bit() );
+    KConfigGroup addrGroup( config, TQString("Address #%1").arg(i).local8Bit() );
     addrGroup.writeEntry( "Address", it.key() );
     addrGroup.writeEntry( "Key IDs", it.data().keyIds.toStringList() );
     addrGroup.writeEntry( "EncryptionPreference", it.data().encrPref );
-- 
cgit v1.2.1