summaryrefslogtreecommitdiffstats
path: root/certmanager/lib/backends/chiasmus
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 /certmanager/lib/backends/chiasmus
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 'certmanager/lib/backends/chiasmus')
-rw-r--r--certmanager/lib/backends/chiasmus/chiasmusbackend.cpp8
-rw-r--r--certmanager/lib/backends/chiasmus/chiasmusjob.cpp4
-rw-r--r--certmanager/lib/backends/chiasmus/chiasmuslibrary.cpp4
-rw-r--r--certmanager/lib/backends/chiasmus/obtainkeysjob.cpp2
4 files changed, 9 insertions, 9 deletions
diff --git a/certmanager/lib/backends/chiasmus/chiasmusbackend.cpp b/certmanager/lib/backends/chiasmus/chiasmusbackend.cpp
index 5ce7f617f..f27dad3b6 100644
--- a/certmanager/lib/backends/chiasmus/chiasmusbackend.cpp
+++ b/certmanager/lib/backends/chiasmus/chiasmusbackend.cpp
@@ -432,13 +432,13 @@ Kleo::CryptoBackend::Protocol * Kleo::ChiasmusBackend::protocol( const char * na
bool Kleo::ChiasmusBackend::checkForOpenPGP( TQString * reason ) const {
if ( reason )
- *reason = i18n( "Unsupported protocol \"%1\"" ).arg( "OpenPGP" );
+ *reason = i18n( "Unsupported protocol \"%1\"" ).tqarg( "OpenPGP" );
return false;
}
bool Kleo::ChiasmusBackend::checkForSMIME( TQString * reason ) const {
if ( reason )
- *reason = i18n( "Unsupported protocol \"%1\"" ).arg( "SMIME" );
+ *reason = i18n( "Unsupported protocol \"%1\"" ).tqarg( "SMIME" );
return false;
}
@@ -454,7 +454,7 @@ bool Kleo::ChiasmusBackend::checkForChiasmus( TQString * reason ) const {
const TQFileInfo fi( KShell::tildeExpand( chiasmus ) );
if ( !fi.isExecutable() ) {
if ( reason )
- *reason = i18n( "File \"%1\" does not exist or is not executable." ).arg( chiasmus );
+ *reason = i18n( "File \"%1\" does not exist or is not executable." ).tqarg( chiasmus );
return false;
}
@@ -467,7 +467,7 @@ bool Kleo::ChiasmusBackend::checkForProtocol( const char * name, TQString * reas
if ( qstricmp( name, "Chiasmus" ) == 0 )
return checkForChiasmus( reason );
if ( reason )
- *reason = i18n( "Unsupported protocol \"%1\"" ).arg( name );
+ *reason = i18n( "Unsupported protocol \"%1\"" ).tqarg( name );
return 0;
}
diff --git a/certmanager/lib/backends/chiasmus/chiasmusjob.cpp b/certmanager/lib/backends/chiasmus/chiasmusjob.cpp
index c6b718ca8..eb5a5ea38 100644
--- a/certmanager/lib/backends/chiasmus/chiasmusjob.cpp
+++ b/certmanager/lib/backends/chiasmus/chiasmusjob.cpp
@@ -208,9 +208,9 @@ void Kleo::ChiasmusJob::showErrorDialog( TQWidget * tqparent, const TQString & c
const TQString msg = ( mMode == Encrypt
? i18n( "Encryption failed: %1" )
: i18n( "Decryption failed: %1" ) )
- .arg( TQString::fromLocal8Bit( mError.asString() ) );
+ .tqarg( TQString::fromLocal8Bit( mError.asString() ) );
if ( !mStderr.isEmpty() ) {
- const TQString details = i18n( "The following was received on stderr:\n%1" ).arg( mStderr );
+ const TQString details = i18n( "The following was received on stderr:\n%1" ).tqarg( mStderr );
KMessageBox::detailedError( tqparent, msg, details, caption );
} else {
KMessageBox::error( tqparent, msg, caption );
diff --git a/certmanager/lib/backends/chiasmus/chiasmuslibrary.cpp b/certmanager/lib/backends/chiasmus/chiasmuslibrary.cpp
index 002bf0182..a57685f28 100644
--- a/certmanager/lib/backends/chiasmus/chiasmuslibrary.cpp
+++ b/certmanager/lib/backends/chiasmus/chiasmuslibrary.cpp
@@ -71,7 +71,7 @@ Kleo::ChiasmusLibrary::main_func Kleo::ChiasmusLibrary::chiasmus( TQString * rea
if ( !mXiaLibrary ) {
if ( reason )
*reason = i18n( "Failed to load %1: %2" )
- .arg( libfile,KLibLoader::self()->lastErrorMessage() );
+ .tqarg( libfile,KLibLoader::self()->lastErrorMessage() );
kdDebug(5150) << "ChiasmusLibrary: loading \"" << libfile
<< "\" failed: " << KLibLoader::self()->lastErrorMessage() << endl;
return 0;
@@ -79,7 +79,7 @@ Kleo::ChiasmusLibrary::main_func Kleo::ChiasmusLibrary::chiasmus( TQString * rea
if ( !mXiaLibrary->hasSymbol( "Chiasmus" ) ) {
if ( reason )
*reason = i18n( "Failed to load %1: %2" )
- .arg( libfile, i18n( "Library does not contain the symbol \"Chiasmus\"." ) );
+ .tqarg( libfile, i18n( "Library does not contain the symbol \"Chiasmus\"." ) );
kdDebug(5150) << "ChiasmusLibrary: loading \"" << libfile
<< "\" failed: " << "Library does not contain the symbol \"Chiasmus\"." << endl;
return 0;
diff --git a/certmanager/lib/backends/chiasmus/obtainkeysjob.cpp b/certmanager/lib/backends/chiasmus/obtainkeysjob.cpp
index fe0b19b1e..497a5a54d 100644
--- a/certmanager/lib/backends/chiasmus/obtainkeysjob.cpp
+++ b/certmanager/lib/backends/chiasmus/obtainkeysjob.cpp
@@ -96,7 +96,7 @@ void Kleo::ObtainKeysJob::slotPerform( bool async ) {
return;
}
- emit progress( i18n( "Scanning directory %1..." ).arg( mKeyPaths[mIndex] ),
+ emit progress( i18n( "Scanning directory %1..." ).tqarg( mKeyPaths[mIndex] ),
mIndex, mKeyPaths.size() );
const TQDir dir( KShell::tildeExpand( mKeyPaths[mIndex] ) );