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
---
 libkpgp/kpgpui.cpp | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

(limited to 'libkpgp/kpgpui.cpp')

diff --git a/libkpgp/kpgpui.cpp b/libkpgp/kpgpui.cpp
index 11bd7929..5984c876 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 );
-- 
cgit v1.2.3