summaryrefslogtreecommitdiffstats
path: root/plugins/kmail
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-04-14 20:16:30 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-04-14 20:16:30 +0000
commit1c93fca14d9ce37499bcfdf994c660186a0b6f17 (patch)
treef2defe163a805a9e34a2142dfde4cdb5e49241e7 /plugins/kmail
parent67e29a054cfcb1b0d2fe6b0a316cf6b3eec087b7 (diff)
downloadtdepim-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 'plugins/kmail')
-rw-r--r--plugins/kmail/bodypartformatter/text_calendar.cpp28
-rw-r--r--plugins/kmail/bodypartformatter/text_vcard.cpp8
2 files changed, 18 insertions, 18 deletions
diff --git a/plugins/kmail/bodypartformatter/text_calendar.cpp b/plugins/kmail/bodypartformatter/text_calendar.cpp
index 87d29875d..d07e6cb11 100644
--- a/plugins/kmail/bodypartformatter/text_calendar.cpp
+++ b/plugins/kmail/bodypartformatter/text_calendar.cpp
@@ -344,16 +344,16 @@ class UrlHandler : public KMail::Interface::BodyPartURLHandler
TQString subject;
switch ( type ) {
case Answer:
- subject = i18n( "Answer: %1" ).arg( summary );
+ subject = i18n( "Answer: %1" ).tqarg( summary );
break;
case Delegation:
- subject = i18n( "Delegated: %1" ).arg( summary );
+ subject = i18n( "Delegated: %1" ).tqarg( summary );
break;
case Forward:
- subject = i18n( "Forwarded: %1" ).arg( summary );
+ subject = i18n( "Forwarded: %1" ).tqarg( summary );
break;
case DeclineCounter:
- subject = i18n( "Declined Counter Proposal: %1" ).arg( summary );
+ subject = i18n( "Declined Counter Proposal: %1" ).tqarg( summary );
break;
}
@@ -434,13 +434,13 @@ class UrlHandler : public KMail::Interface::BodyPartURLHandler
Q_ASSERT( event );
if ( !event->doesFloat() ) {
if ( event->dtEnd() < now ) {
- warnStr = i18n( "\"%1\" occurred already." ).arg( event->summary() );
+ warnStr = i18n( "\"%1\" occurred already." ).tqarg( event->summary() );
} else if ( event->dtStart() <= now && now <= event->dtEnd() ) {
- warnStr = i18n( "\"%1\" is currently in-progress." ).arg( event->summary() );
+ warnStr = i18n( "\"%1\" is currently in-progress." ).tqarg( event->summary() );
}
} else {
if ( event->dtEnd().date() < today ) {
- warnStr = i18n( "\"%1\" occurred already." ).arg( event->summary() );
+ warnStr = i18n( "\"%1\" occurred already." ).tqarg( event->summary() );
} else if ( event->dtStart().date() <= today && today <= event->dtEnd().date() ) {
warnStr = i18n( "\"%1\", happening all day today, is currently in-progress." ).
arg( event->summary() );
@@ -451,19 +451,19 @@ class UrlHandler : public KMail::Interface::BodyPartURLHandler
if ( !todo->doesFloat() ) {
if ( todo->hasDueDate() ) {
if ( todo->dtDue() < now ) {
- warnStr = i18n( "\"%1\" is past due." ).arg( todo->summary() );
+ warnStr = i18n( "\"%1\" is past due." ).tqarg( todo->summary() );
} else if ( todo->hasStartDate() && todo->dtStart() <= now && now <= todo->dtDue() ) {
- warnStr = i18n( "\"%1\" is currently in-progress." ).arg( todo->summary() );
+ warnStr = i18n( "\"%1\" is currently in-progress." ).tqarg( todo->summary() );
}
} else if ( todo->hasStartDate() ) {
if ( todo->dtStart() < now ) {
- warnStr = i18n( "\"%1\" has already started." ).arg( todo->summary() );
+ warnStr = i18n( "\"%1\" has already started." ).tqarg( todo->summary() );
}
}
} else {
if ( todo->hasDueDate() ) {
if ( todo->dtDue().date() < today) {
- warnStr = i18n( "\"%1\" is past due." ).arg( todo->summary() );
+ warnStr = i18n( "\"%1\" is past due." ).tqarg( todo->summary() );
} else if ( todo->hasStartDate() &&
todo->dtStart().date() <= today && today <= todo->dtDue().date() ) {
warnStr = i18n( "\"%1\", happening all-day today, is currently in-progress." ).
@@ -526,12 +526,12 @@ class UrlHandler : public KMail::Interface::BodyPartURLHandler
} else if ( path.startsWith( "ATTACH:" ) ) {
return false;
} else {
- queryStr = i18n( "%1?" ).arg( path );
+ queryStr = i18n( "%1?" ).tqarg( path );
}
if ( KMessageBox::warningYesNo(
0,
- i18n( "%1\n%2" ).arg( warnStr ).arg( queryStr ) ) == KMessageBox::No ) {
+ i18n( "%1\n%2" ).tqarg( warnStr ).tqarg( queryStr ) ) == KMessageBox::No ) {
return true;
}
}
@@ -820,7 +820,7 @@ class UrlHandler : public KMail::Interface::BodyPartURLHandler
case KMessageBox::No: // means "send email"
summary = incidence->summary();
if ( !summary.isEmpty() ) {
- summary = i18n( "Re: %1" ).arg( summary );
+ summary = i18n( "Re: %1" ).tqarg( summary );
}
KApplication::kApplication()->invokeMailer( incidence->organizer().email(), summary );
diff --git a/plugins/kmail/bodypartformatter/text_vcard.cpp b/plugins/kmail/bodypartformatter/text_vcard.cpp
index 014493a96..a084aea13 100644
--- a/plugins/kmail/bodypartformatter/text_vcard.cpp
+++ b/plugins/kmail/bodypartformatter/text_vcard.cpp
@@ -104,7 +104,7 @@ namespace {
writer->queue( contact );
TQString addToLinkText = i18n( "[Add this contact to the addressbook]" );
- TQString op = TQString::tqfromLatin1( "addToAddressBook:%1" ).arg( count );
+ TQString op = TQString::tqfromLatin1( "addToAddressBook:%1" ).tqarg( count );
writer->queue(
"<div align=\"center\"><a href=\"" +
bodyPart->makeLink( op ) +
@@ -133,7 +133,7 @@ namespace {
#else
Addressee::List al = vcc.parseVCards( vCard );
#endif
- int index = path.right( path.length() - path.findRev( ":" ) - 1 ).toInt();
+ int index = path.right( path.length() - path.tqfindRev( ":" ) - 1 ).toInt();
if ( index == -1 ) return true;
KABC::Addressee a = al[index];
if ( a.isEmpty() ) return true;
@@ -151,7 +151,7 @@ namespace {
#else
Addressee::List al = vcc.parseVCards( vCard );
#endif
- int index = path.right( path.length() - path.findRev( ":" ) - 1 ).toInt();
+ int index = path.right( path.length() - path.tqfindRev( ":" ) - 1 ).toInt();
if ( index >= 0 ) {
return al[index];
}
@@ -195,7 +195,7 @@ namespace {
if ( a.realName().isEmpty() ) {
return i18n( "Add this contact to the address book." );
} else {
- return i18n( "Add \"%1\" to the address book." ).arg( a.realName() );
+ return i18n( "Add \"%1\" to the address book." ).tqarg( a.realName() );
}
}