From 1c93fca14d9ce37499bcfdf994c660186a0b6f17 Mon Sep 17 00:00:00 2001
From: tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>
Date: Thu, 14 Apr 2011 20:16:30 +0000
Subject: 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
---
 certmanager/certificatewizardimpl.cpp | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'certmanager/certificatewizardimpl.cpp')

diff --git a/certmanager/certificatewizardimpl.cpp b/certmanager/certificatewizardimpl.cpp
index 3c618e738..89f4d66eb 100644
--- a/certmanager/certificatewizardimpl.cpp
+++ b/certmanager/certificatewizardimpl.cpp
@@ -88,10 +88,10 @@ static TQString attributeLabel( const TQString & attr, bool required ) {
   if ( !label.isEmpty() )
     if ( required )
       return i18n("Format string for the labels in the \"Your Personal Data\" page - required field",
-		  "*%1 (%2):").arg( label, attr );
+		  "*%1 (%2):").tqarg( label, attr );
     else
       return i18n("Format string for the labels in the \"Your Personal Data\" page",
-		  "%1 (%2):").arg( label, attr );
+		  "%1 (%2):").tqarg( label, attr );
 
   else if ( required )
     return '*' + attr + ':';
@@ -196,7 +196,7 @@ void CertificateWizardImpl::slotGenerateCertificate()
     TQString certParms;
     certParms += "<GnupgKeyParms format=\"internal\">\n";
     certParms += "Key-Type: RSA\n";
-    certParms += TQString( "Key-Length: %1\n" ).arg( keyLengths[keyLengthCB->currentItem()] );
+    certParms += TQString( "Key-Length: %1\n" ).tqarg( keyLengths[keyLengthCB->currentItem()] );
     certParms += "Key-Usage: ";
     if ( signOnlyCB->isChecked() )
       certParms += "Sign";
@@ -255,7 +255,7 @@ void CertificateWizardImpl::slotGenerateCertificate()
     if ( err )
       KMessageBox::error( this,
 			  i18n( "Could not start certificate generation: %1" )
-			  .arg( TQString::fromLocal8Bit( err.asString() ) ),
+			  .tqarg( TQString::fromLocal8Bit( err.asString() ) ),
 			  i18n( "Certificate Manager Error" ) );
     else {
       generatePB->setEnabled( false );
@@ -278,7 +278,7 @@ void CertificateWizardImpl::slotResult( const GpgME::KeyGenerationResult & res,
 	  if ( !res.error().isCanceled() )
 	    KMessageBox::error( this,
 				i18n( "Could not generate certificate: %1" )
-				.arg( TQString::tqfromLatin1( res.error().asString() ) ),
+				.tqarg( TQString::tqfromLatin1( res.error().asString() ) ),
 				i18n( "Certificate Manager Error" ) );
     } else {
         // next will stay enabled until the user clicks Generate
@@ -362,7 +362,7 @@ void CertificateWizardImpl::createPersonalDataPage()
     if ( config.entryIsImmutable( attr ) )
       le->setEnabled( false );
 
-    _attrPairList.append(qMakePair(key, le));
+    _attrPairList.append(tqMakePair(key, le));
 
     connect( le, TQT_SIGNAL(textChanged(const TQString&)),
 	     TQT_SLOT(slotEnablePersonalDataPageExit()) );
@@ -391,7 +391,7 @@ void CertificateWizardImpl::slotURLSelected( const TQString& _url )
   // The application/pkcs10 mimetype didn't have a native extension,
   // so the filedialog didn't have the checkbox for auto-adding it.
   TQString fileName = url.fileName();
-  int pos = fileName.findRev( '.' );
+  int pos = fileName.tqfindRev( '.' );
   if ( pos < 0 ) // no extension
     url.setFileName( fileName + ".p10" );
 #endif
@@ -434,7 +434,7 @@ void CertificateWizardImpl::sendCertificate( const TQString& email, const TQByte
   if ( result != 0 ) {
     kdDebug() << "Couldn't connect to KMail\n";
     KMessageBox::error( this,
-                        i18n( "DCOP Communication Error, unable to send certificate using KMail.\n%1" ).arg( error ) );
+                        i18n( "DCOP Communication Error, unable to send certificate using KMail.\n%1" ).tqarg( error ) );
     return;
   }
 
@@ -481,7 +481,7 @@ void CertificateWizardImpl::accept()
       if ( KMessageBox::Cancel == KMessageBox::warningContinueCancel(
                                                                      this,
                                                                      i18n( "A file named \"%1\" already exists. "
-                                                                           "Are you sure you want to overwrite it?" ).arg( url.prettyURL() ),
+                                                                           "Are you sure you want to overwrite it?" ).tqarg( url.prettyURL() ),
                                                                      i18n( "Overwrite File?" ),
                                                                      i18n( "&Overwrite" ) ) )
         return;
-- 
cgit v1.2.1