diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-04-14 20:16:30 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-04-14 20:16:30 +0000 |
| commit | 1c93fca14d9ce37499bcfdf994c660186a0b6f17 (patch) | |
| tree | f2defe163a805a9e34a2142dfde4cdb5e49241e7 /kmail/callback.cpp | |
| parent | 67e29a054cfcb1b0d2fe6b0a316cf6b3eec087b7 (diff) | |
| download | tdepim-1c93fca14d9ce37499bcfdf994c660186a0b6f17.tar.gz tdepim-1c93fca14d9ce37499bcfdf994c660186a0b6f17.zip | |
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
Diffstat (limited to 'kmail/callback.cpp')
| -rw-r--r-- | kmail/callback.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/kmail/callback.cpp b/kmail/callback.cpp index 037f80900..923ff6be3 100644 --- a/kmail/callback.cpp +++ b/kmail/callback.cpp @@ -64,7 +64,7 @@ TQString Callback::askForTransport( bool nullIdentity ) const return transports.first(); const TQString defaultTransport = GlobalSettings::self()->defaultTransport(); - const int defaultIndex = TQMAX( 0, transports.findIndex( defaultTransport ) ); + const int defaultIndex = TQMAX( 0, transports.tqfindIndex( defaultTransport ) ); TQString text; if ( nullIdentity ) @@ -94,13 +94,13 @@ bool Callback::mailICal( const TQString& to, const TQString &iCal, msg->setSubject( subject ); if ( GlobalSettings::self()->exchangeCompatibleInvitations() ) { if ( status == TQString("cancel") ) - msg->setSubject( i18n( "Declined: %1" ).arg(subject).tqreplace("Answer: ","") ); + msg->setSubject( i18n( "Declined: %1" ).tqarg(subject).tqreplace("Answer: ","") ); else if ( status == TQString("tentative") ) - msg->setSubject( i18n( "Tentative: %1" ).arg(subject).tqreplace("Answer: ","") ); + msg->setSubject( i18n( "Tentative: %1" ).tqarg(subject).tqreplace("Answer: ","") ); else if ( status == TQString("accepted") ) - msg->setSubject( i18n( "Accepted: %1" ).arg(subject).tqreplace("Answer: ","") ); + msg->setSubject( i18n( "Accepted: %1" ).tqarg(subject).tqreplace("Answer: ","") ); else if ( status == TQString("delegated") ) - msg->setSubject( i18n( "Delegated: %1" ).arg(subject).tqreplace("Answer: ","") ); + msg->setSubject( i18n( "Delegated: %1" ).tqarg(subject).tqreplace("Answer: ","") ); } msg->setTo( to ); msg->setFrom( receiver() ); @@ -227,7 +227,7 @@ TQString Callback::receiver() const // select default identity by default const TQString defaultAddr = kmkernel->identityManager()->defaultIdentity().primaryEmailAddress(); - const int defaultIndex = TQMAX( 0, addrs.findIndex( defaultAddr ) ); + const int defaultIndex = TQMAX( 0, addrs.tqfindIndex( defaultAddr ) ); mReceiver = KInputDialog::getItem( i18n( "Select Address" ), |