Enable kdepim compilation under Qt4

This will likely break Qt3 compilation temporarily, which is an unintended side effect.
A third and final kdepim commit will repair Qt3 compilation shortly.


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

5 files changed, 41 insertions, 41 deletions

diff --git a/libkpgp/kpgp.cpp b/libkpgp/kpgp.cpp
index f3227ac31..3abd1d79f 100644
--- a/libkpgp/kpgp.cpp
+++ b/libkpgp/kpgp.cpp
@@ -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?")
-                  .arg( pgp->lastErrorMessage() );
+                  .tqarg( 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?")
-                  .arg( pgp->lastErrorMessage() );
+                  .tqarg( 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?")
-                  .arg( pgp->lastErrorMessage() );
+                  .tqarg( 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" )
-             .arg( pgp->lastErrorMessage() );
+             .tqarg( pgp->lastErrorMessage() );
     TQString details = i18n( "This is the error message of %1:\n%2" )
-                      .arg( ( pgpType == tGPG ) ? "GnuPG" : "PGP" )
-                      .arg( block.error().data() );
+                      .tqarg( ( pgpType == tGPG ) ? "GnuPG" : "PGP" )
+                      .tqarg( 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."
-                                ).arg(person),
+                                ).tqarg(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."
-                                        ).arg(person),
+                                        ).tqarg(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."
-                                        ).arg(person),
+                                        ).tqarg(person),
                                    KeyIDList(),
                                    allowedKeys );
     if( !keyIds.isEmpty() ) {
@@ -1502,7 +1502,7 @@ Module::canonicalAddress( const TQString& _adress )
   }
   else
   {
-    int index1 = address.findRev(" ",index);
+    int index1 = address.tqfindRev(" ",index);
     int index2 = address.tqfind(" ",index);
     if(index2 == -1) index2 = address.length();
     return "<" + address.mid(index1+1 ,index2-index1-1) + ">";
@@ -1744,7 +1744,7 @@ Module::readAddressData()
 
   addressDataDict.clear();
   for( int i=1; i<=num; i++ ) {
-    KConfigGroup addrGroup( config, TQString("Address #%1").arg(i).local8Bit() );
+    KConfigGroup addrGroup( config, TQString("Address #%1").tqarg(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").arg(i).local8Bit() );
+    KConfigGroup addrGroup( config, TQString("Address #%1").tqarg(i).local8Bit() );
     addrGroup.writeEntry( "Address", it.key() );
     addrGroup.writeEntry( "Key IDs", it.data().keyIds.toStringList() );
     addrGroup.writeEntry( "EncryptionPreference", it.data().encrPref );
diff --git a/libkpgp/kpgpbase2.cpp b/libkpgp/kpgpbase2.cpp
index da0038819..be96b5da9 100644
--- a/libkpgp/kpgpbase2.cpp
+++ b/libkpgp/kpgpbase2.cpp
@@ -139,12 +139,12 @@ Base2::encsign( Block& block, const KeyIDList& recipients,
 	  errMsg = i18n("Could not find public keys matching the userid(s)\n"
                         "%1;\n"
                         "the message is not encrypted.")
-                       .arg( badkeys.data() );
+                       .tqarg( badkeys.data() );
         else
           errMsg = i18n("Could not find public keys matching the userid(s)\n"
                         "%1;\n"
                         "these persons will not be able to read the message.")
-                       .arg( badkeys.data() );
+                       .tqarg( badkeys.data() );
         status |= MISSINGKEY;
         status |= ERROR;
       }
@@ -171,13 +171,13 @@ Base2::encsign( Block& block, const KeyIDList& recipients,
                         "for userid(s)\n"
                         "%1.\n"
                         "The message is not encrypted.")
-                       .arg( badkeys.data() );
+                       .tqarg( badkeys.data() );
         else
 	  errMsg = i18n("Public keys not certified with trusted signature "
                         "for userid(s)\n"
                         "%1;\n"
                         "these persons will not be able to read the message.")
-                       .arg( badkeys.data() );
+                       .tqarg( badkeys.data() );
         status |= BADKEYS;
         status |= ERROR;
         return status;
@@ -448,7 +448,7 @@ Base2::decrypt( Block& block, const char *passphrase )
       index = error.tqfind('\'', index) + 1;
       index2 = error.tqfind('\'', index);
       block.setSignatureUserId( i18n("The keyring file %1 does not exist.\n"
-      "Please check your PGP setup.").arg(error.mid(index, index2-index)) );
+      "Please check your PGP setup.").tqarg(TQString(error.mid(index, index2-index))) );
     }
     else
     {
diff --git a/libkpgp/kpgpbase5.cpp b/libkpgp/kpgpbase5.cpp
index d78998475..46ded2c73 100644
--- a/libkpgp/kpgpbase5.cpp
+++ b/libkpgp/kpgpbase5.cpp
@@ -156,7 +156,7 @@ Base5::encsign( Block& block, const KeyIDList& recipients,
       else
 	errMsg = i18n("The following key(s) are not trusted:\n%1\n"
                       "Their owner(s) will not be able to decrypt the message.")
-		     .arg(aStr);
+		     .tqarg(TQString(aStr));
       status |= ERROR;
       status |= BADKEYS;
     }
@@ -167,9 +167,9 @@ Base5::encsign( Block& block, const KeyIDList& recipients,
     int index2 = error.tqfind('\n',index);
 
     errMsg = i18n("Missing encryption key(s) for:\n%1")
-      .arg(error.mid(index,index2-index));
+      .tqarg(TQString(error.mid(index,index2-index)));
 //    errMsg = TQString("Missing encryption key(s) for: %1")
-//      .arg(error.mid(index,index2-index));
+//      .tqarg(error.mid(index,index2-index));
     status |= ERROR;
     status |= MISSINGKEY;
   }
diff --git a/libkpgp/kpgpbaseG.cpp b/libkpgp/kpgpbaseG.cpp
index d9adb11a2..b04b31bf2 100644
--- a/libkpgp/kpgpbaseG.cpp
+++ b/libkpgp/kpgpbaseG.cpp
@@ -40,7 +40,7 @@ BaseG::BaseG()
   runGpg( "--version", 0 );
   int eol = output.tqfind( '\n' );
   if( eol > 0 ) {
-    int pos = output.findRev( ' ', eol - 1 );
+    int pos = output.tqfindRev( ' ', eol - 1 );
     if( pos != -1 ) {
       mVersion = output.mid( pos + 1, eol - pos - 1 );
       kdDebug(5100) << "found GnuPG " << mVersion << endl;
@@ -153,12 +153,12 @@ BaseG::encsign( Block& block, const KeyIDList& recipients,
         errMsg = i18n("Could not find public keys matching the userid(s)\n"
                       "%1;\n"
                       "the message is not encrypted.")
-                     .arg( badkeys.data() );
+                     .tqarg( badkeys.data() );
       else
         errMsg = i18n("Could not find public keys matching the userid(s)\n"
                       "%1;\n"
                       "these persons will not be able to read the message.")
-                     .arg( badkeys.data() );
+                     .tqarg( badkeys.data() );
       status |= MISSINGKEY;
       status |= ERROR;
     }
@@ -262,8 +262,8 @@ BaseG::decrypt( Block& block, const char *passphrase )
         else
         {
           // Search backwards the user ID of the needed key
-          index2 = error.findRev('"', index) - 1;
-          index = error.findRev("      \"", index2) + 7;
+          index2 = error.tqfindRev('"', index) - 1;
+          index = error.tqfindRev("      \"", index2) + 7;
           // The conversion from UTF8 is necessary because gpg stores and
           // prints user IDs in UTF8
           block.setRequiredUserId( TQString::fromUtf8( error.mid( index, index2 - index + 1 ) ) );
@@ -332,7 +332,7 @@ BaseG::decrypt( Block& block, const char *passphrase )
       // get the primary user ID of the signer
       index = error.tqfind('"',index);
       index2 = error.tqfind('\n',index+1);
-      index2 = error.findRev('"', index2-1);
+      index2 = error.tqfindRev('"', index2-1);
       block.setSignatureUserId( error.mid( index+1, index2-index-1 ) );
     }
     else if( error.tqfind("BAD signature", index) != -1 )
@@ -342,7 +342,7 @@ BaseG::decrypt( Block& block, const char *passphrase )
       // get the primary user ID of the signer
       index = error.tqfind('"',index);
       index2 = error.tqfind('\n',index+1);
-      index2 = error.findRev('"', index2-1);
+      index2 = error.tqfindRev('"', index2-1);
       block.setSignatureUserId( error.mid( index+1, index2-index-1 ) );
     }
     else if( error.tqfind("Can't find the right public key", index) != -1 )
diff --git a/libkpgp/kpgpui.cpp b/libkpgp/kpgpui.cpp
index 11bd79294..5984c8764 100644
--- a/libkpgp/kpgpui.cpp
+++ b/libkpgp/kpgpui.cpp
@@ -76,7 +76,7 @@ PassphraseDialog::PassphraseDialog( TQWidget *tqparent,
   if (keyID.isNull())
     label = new TQLabel(i18n("Please enter your OpenPGP passphrase:"),rightArea);
   else
-    label = new TQLabel(i18n("Please enter the OpenPGP passphrase for\n\"%1\":").arg(keyID),
+    label = new TQLabel(i18n("Please enter the OpenPGP passphrase for\n\"%1\":").tqarg(keyID),
                        rightArea);
   lineedit = new KPasswordEdit( rightArea );
   lineedit->setEchoMode(TQLineEdit::Password);
@@ -432,7 +432,7 @@ void KeySelectionDialog::initKeylist( const KeyList& keyList,
                                                       (*it)->primaryUserID() );
 
     // select and open the given key
-    if( keyIds.findIndex( curKeyId ) != -1 ) {
+    if( keyIds.tqfindIndex( curKeyId ) != -1 ) {
       if( 0 == firstSelectedItem ) {
         firstSelectedItem = primaryUserID;
       }
@@ -461,7 +461,7 @@ void KeySelectionDialog::initKeylist( const KeyList& keyList,
 
     childItem = new TQListViewItem( primaryUserID, "",
                                    i18n( "Fingerprint: %1" )
-                                   .arg( beautifyFingerprint( (*it)->primaryFingerprint() ) ) );
+                                   .tqarg( beautifyFingerprint( (*it)->primaryFingerprint() ) ) );
     if( primaryUserID->isSelected() && mListView->isMultiSelection() ) {
       mListView->setSelected( childItem, true );
     }
@@ -543,15 +543,15 @@ TQString KeySelectionDialog::keyInfo( const Kpgp::Key *key ) const
   if( remark.isEmpty() ) {
     return " " + i18n("creation date and status of an OpenPGP key",
                       "Creation date: %1, tqStatus: %2")
-                     .arg( KGlobal::locale()->formatDate( dt.date(), true ) )
-                     .arg( status );
+                     .tqarg( KGlobal::locale()->formatDate( dt.date(), true ) )
+                     .tqarg( status );
   }
   else {
     return " " + i18n("creation date, status and remark of an OpenPGP key",
                       "Creation date: %1, tqStatus: %2 (%3)")
-                     .arg( KGlobal::locale()->formatDate( dt.date(), true ) )
-                     .arg( status )
-                     .arg( remark );
+                     .tqarg( KGlobal::locale()->formatDate( dt.date(), true ) )
+                     .tqarg( status )
+                     .tqarg( remark );
   }
 }
 
@@ -920,7 +920,7 @@ void KeySelectionDialog::slotCheckSelection( TQListViewItem* plvi /* = 0 */ )
         //         extended selection mode a normal left click deselects
         //         the not clicked items.
         if( 0 < selectedCount ) {
-          if( -1 == mKeyIds.findIndex( lvi->text(0).local8Bit() ) ) {
+          if( -1 == mKeyIds.tqfindIndex( lvi->text(0).local8Bit() ) ) {
             // some items of this key are selected and the key wasn't selected
             // before => the user selected something
             kdDebug(5100) << "selectedCount: "<<selectedCount<<"/"<<itemCount
@@ -928,7 +928,7 @@ void KeySelectionDialog::slotCheckSelection( TQListViewItem* plvi /* = 0 */ )
             userAction = SELECTED;
           }
           else if( ( itemCount > selectedCount ) &&
-                   ( -1 != mKeyIds.findIndex( lvi->text(0).local8Bit() ) ) ) {
+                   ( -1 != mKeyIds.tqfindIndex( lvi->text(0).local8Bit() ) ) ) {
             // some items of this key are unselected and the key was selected
             // before => the user deselected something
             kdDebug(5100) << "selectedCount: "<<selectedCount<<"/"<<itemCount
@@ -1014,7 +1014,7 @@ bool KeySelectionDialog::checkKeys( const TQValueList<TQListViewItem*>& keys ) c
        ++it ) {
     kdDebug(5100) << "Checking key 0x" << getKeyId( *it ) << "...\n";
     pProgressDlg->setLabel( i18n("Checking key 0x%1...")
-                            .arg( getKeyId( *it ) ) );
+                            .tqarg( TQString( getKeyId( *it ) ) ) );
     kapp->processEvents();
     keysAllowed = keysAllowed && ( -1 != keyAdmissibility( *it, AllowExpensiveTrustCheck ) );
     pProgressDlg->progressBar()->advance( 1 );
@@ -1383,7 +1383,7 @@ KeyApprovalDialog::KeyApprovalDialog( const TQStringList& addresses,
     //hbox->setStretchFactor( keyidLB, 10 );
     //mKeyIdListBoxes.insert( 0, keyidLB );
 
-    new KSeparator( Horizontal, bigvbox );
+    new KSeparator( Qt::Horizontal, bigvbox );
   }
   else {
     mEncryptToSelf = 0;
@@ -1402,7 +1402,7 @@ KeyApprovalDialog::KeyApprovalDialog( const TQStringList& addresses,
       ++kit; // skip the sender's key id
     }
     else {
-      new KSeparator( Horizontal, bigvbox );
+      new KSeparator( Qt::Horizontal, bigvbox );
     }
 
     TQHBox *hbox = new TQHBox( bigvbox );
@@ -1543,7 +1543,7 @@ KeyApprovalDialog::slotChangeEncryptionKey( int nr )
                                          "Select the key(s) which should "
                                          "be used to encrypt the message "
                                          "for\n%1")
-                                    .arg( mAddressLabels[nr-1]->text() ),
+                                    .tqarg( mAddressLabels[nr-1]->text() ),
                                     keyIds,
                                     mAddressLabels[nr-1]->text(),
                                     mAllowedKeys );