From 1c93fca14d9ce37499bcfdf994c660186a0b6f17 Mon Sep 17 00:00:00 2001
From: tpearson
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
---
kmail/templatesconfiguration.cpp | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
(limited to 'kmail/templatesconfiguration.cpp')
diff --git a/kmail/templatesconfiguration.cpp b/kmail/templatesconfiguration.cpp
index 0e52599c4..00bf87d90 100644
--- a/kmail/templatesconfiguration.cpp
+++ b/kmail/templatesconfiguration.cpp
@@ -102,7 +102,7 @@ TemplatesConfiguration::TemplatesConfiguration( TQWidget *tqparent, const char *
"if they are specified.
"
"" );
}
- mHelp->setText( i18n( "How does this work?" ).arg( help ) );
+ mHelp->setText( i18n( "How does this work?" ).tqarg( help ) );
}
void TemplatesConfiguration::slotTextChanged()
@@ -163,7 +163,7 @@ void TemplatesConfiguration::saveToGlobal()
void TemplatesConfiguration::loadFromIdentity( uint id )
{
- Templates t( TQString("IDENTITY_%1").arg( id ) );
+ Templates t( TQString("IDENTITY_%1").tqarg( id ) );
TQString str;
@@ -215,7 +215,7 @@ void TemplatesConfiguration::loadFromIdentity( uint id )
void TemplatesConfiguration::saveToIdentity( uint id )
{
- Templates t( TQString("IDENTITY_%1").arg( id ) );
+ Templates t( TQString("IDENTITY_%1").tqarg( id ) );
t.setTemplateNewMessage( strOrBlank( textEdit_new->text() ) );
t.setTemplateReply( strOrBlank( textEdit_reply->text() ) );
@@ -231,7 +231,7 @@ void TemplatesConfiguration::loadFromFolder( TQString id, uint identity )
Templates* tid = 0;
if ( identity ) {
- tid = new Templates( TQString("IDENTITY_%1").arg( identity ) );
+ tid = new Templates( TQString("IDENTITY_%1").tqarg( identity ) );
}
TQString str;
@@ -344,7 +344,7 @@ void TemplatesConfiguration::loadFromPhrases()
"---------- %1 ----------\n"
"%TEXT\n"
"-------------------------------------------------------\n"
- ) ).arg( convertPhrases( str ) ) );
+ ) ).tqarg( convertPhrases( str ) ) );
}
else {
textEdit_forward->setText( defaultForward() );
@@ -400,7 +400,7 @@ void TemplatesConfiguration::importFromPhrases()
"\n"
"%TEXT\n"
"-------------------------------------------------------\n"
- ) ).arg( convertPhrases( str ) ) );
+ ) ).tqarg( convertPhrases( str ) ) );
}
else {
GlobalSettings::self()->setTemplateForward( defaultForward() );
--
cgit v1.2.1