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
---
 libkpimidentities/identity.cpp        | 2 +-
 libkpimidentities/identitycombo.cpp   | 8 ++++----
 libkpimidentities/identitymanager.cpp | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'libkpimidentities')

diff --git a/libkpimidentities/identity.cpp b/libkpimidentities/identity.cpp
index 0855f8c37..1305a2603 100644
--- a/libkpimidentities/identity.cpp
+++ b/libkpimidentities/identity.cpp
@@ -102,7 +102,7 @@ TQString Signature::textFromCommand( bool * ok ) const
   if ( rc != 0 ) {
     if ( ok ) *ok = false;
     TQString wmsg = i18n("<qt>Failed to execute signature script<br><b>%1</b>:<br>%2</qt>")
-      .arg( mUrl ).arg( strerror(rc) );
+      .tqarg( mUrl ).tqarg( strerror(rc) );
     KMessageBox::error(0, wmsg);
     return TQString();
   }
diff --git a/libkpimidentities/identitycombo.cpp b/libkpimidentities/identitycombo.cpp
index e1ae08b30..a673e5675 100644
--- a/libkpimidentities/identitycombo.cpp
+++ b/libkpimidentities/identitycombo.cpp
@@ -66,7 +66,7 @@ void IdentityCombo::setCurrentIdentity( const Identity & identity ) {
 }
 
 void IdentityCombo::setCurrentIdentity( const TQString & name ) {
-  int idx = mIdentityManager->identities().findIndex( name );
+  int idx = mIdentityManager->identities().tqfindIndex( name );
   if ( idx < 0 ) return;
   if ( idx == currentItem() ) return;
 
@@ -78,7 +78,7 @@ void IdentityCombo::setCurrentIdentity( const TQString & name ) {
 }
 
 void IdentityCombo::setCurrentIdentity( uint uoid ) {
-  int idx = mUoidList.findIndex( uoid );
+  int idx = mUoidList.tqfindIndex( uoid );
   if ( idx < 0 ) return;
   if ( idx == currentItem() ) return;
 
@@ -93,7 +93,7 @@ void IdentityCombo::reloadCombo() {
   TQStringList identities = mIdentityManager->identities();
   // the IM should prevent this from happening:
   assert( !identities.isEmpty() );
-  identities.first() = i18n("%1 (Default)").arg( identities.first() );
+  identities.first() = i18n("%1 (Default)").tqarg( identities.first() );
   clear();
   insertStringList( identities );
 }
@@ -109,7 +109,7 @@ void IdentityCombo::slotIdentityManagerChanged() {
   uint oldIdentity = mUoidList[ currentItem() ];
 
   reloadUoidList();
-  int idx = mUoidList.findIndex( oldIdentity );
+  int idx = mUoidList.tqfindIndex( oldIdentity );
 
   blockSignals( true );
   reloadCombo();
diff --git a/libkpimidentities/identitymanager.cpp b/libkpimidentities/identitymanager.cpp
index dd8479d85..4cc53e816 100644
--- a/libkpimidentities/identitymanager.cpp
+++ b/libkpimidentities/identitymanager.cpp
@@ -201,7 +201,7 @@ void IdentityManager::writeConfig() const {
   int i = 0;
   for ( ConstIterator it = mIdentities.begin() ;
 	it != mIdentities.end() ; ++it, ++i ) {
-    KConfigGroup cg( mConfig, TQString::tqfromLatin1("Identity #%1").arg(i) );
+    KConfigGroup cg( mConfig, TQString::tqfromLatin1("Identity #%1").tqarg(i) );
     (*it).writeConfig( &cg );
     if ( (*it).isDefault() ) {
       // remember which one is default:
-- 
cgit v1.2.1