summaryrefslogtreecommitdiffstats
path: root/libkpimidentities
diff options
context:
space:
mode:
Diffstat (limited to 'libkpimidentities')
-rw-r--r--libkpimidentities/identity.cpp10
-rw-r--r--libkpimidentities/identitycombo.cpp2
-rw-r--r--libkpimidentities/identitymanager.cpp2
3 files changed, 7 insertions, 7 deletions
diff --git a/libkpimidentities/identity.cpp b/libkpimidentities/identity.cpp
index c7bd624cc..bb947b3bd 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>")
- .tqarg( mUrl ).tqarg( strerror(rc) );
+ .arg( mUrl ).arg( strerror(rc) );
KMessageBox::error(0, wmsg);
return TQString();
}
@@ -143,16 +143,16 @@ TQString Signature::withSeparator( bool * ok ) const
}
if ( ok ) *ok = true;
if ( signature.isEmpty() ) return signature; // don't add a separator in this case
- if ( signature.startsWith( TQString::tqfromLatin1("-- \n") ) )
+ if ( signature.startsWith( TQString::fromLatin1("-- \n") ) )
// already have signature separator at start of sig:
- return TQString::tqfromLatin1("\n") += signature;
- else if ( signature.find( TQString::tqfromLatin1("\n-- \n") ) != -1 )
+ return TQString::fromLatin1("\n") += signature;
+ else if ( signature.find( TQString::fromLatin1("\n-- \n") ) != -1 )
// already have signature separator inside sig; don't prepend '\n'
// to improve abusing signatures as templates:
return signature;
else
// need to prepend one:
- return TQString::tqfromLatin1("\n-- \n") + signature;
+ return TQString::fromLatin1("\n-- \n") + signature;
}
diff --git a/libkpimidentities/identitycombo.cpp b/libkpimidentities/identitycombo.cpp
index 1b250fa34..5ddc01975 100644
--- a/libkpimidentities/identitycombo.cpp
+++ b/libkpimidentities/identitycombo.cpp
@@ -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)").tqarg( identities.first() );
+ identities.first() = i18n("%1 (Default)").arg( identities.first() );
clear();
insertStringList( identities );
}
diff --git a/libkpimidentities/identitymanager.cpp b/libkpimidentities/identitymanager.cpp
index 2c63d0534..2935fe0a2 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").tqarg(i) );
+ KConfigGroup cg( mConfig, TQString::fromLatin1("Identity #%1").arg(i) );
(*it).writeConfig( &cg );
if ( (*it).isDefault() ) {
// remember which one is default: