diff options
author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-04-13 00:46:47 +0000 |
---|---|---|
committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-04-13 00:46:47 +0000 |
commit | 67e29a054cfcb1b0d2fe6b0a316cf6b3eec087b7 (patch) | |
tree | 5f52a9eada2e9f3654fc327d7c14dfef570a6ecb /certmanager/lib/backends/qgpgme/qgpgmecryptoconfig.cpp | |
parent | 2ee4bf4fd5eff93b2fbef0ff8e8063edffc5da5c (diff) | |
download | tdepim-67e29a054cfcb1b0d2fe6b0a316cf6b3eec087b7.tar.gz tdepim-67e29a054cfcb1b0d2fe6b0a316cf6b3eec087b7.zip |
Initial conversion of kdepim to TQt
This will probably require some tweaking before it will build under Qt4,
however Qt3 builds are OK. Any alterations this commit makes to kdepim
behaviour under Qt3 are unintentional and should be fixed.
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1227832 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'certmanager/lib/backends/qgpgme/qgpgmecryptoconfig.cpp')
-rw-r--r-- | certmanager/lib/backends/qgpgme/qgpgmecryptoconfig.cpp | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/certmanager/lib/backends/qgpgme/qgpgmecryptoconfig.cpp b/certmanager/lib/backends/qgpgme/qgpgmecryptoconfig.cpp index 6dc5c5e3a..3aa3b336b 100644 --- a/certmanager/lib/backends/qgpgme/qgpgmecryptoconfig.cpp +++ b/certmanager/lib/backends/qgpgme/qgpgmecryptoconfig.cpp @@ -20,11 +20,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -131,7 +131,7 @@ Kleo::CryptoConfigComponent* QGpgMECryptoConfig::component( const TQString& name { if ( !mParsed ) const_cast<QGpgMECryptoConfig*>( this )->runGpgConf( false ); - return mComponents.find( name ); + return mComponents.tqfind( name ); } void QGpgMECryptoConfig::sync( bool runtime ) @@ -215,7 +215,7 @@ void QGpgMECryptoConfigComponent::slotCollectStdOut( KProcIO* proc ) } else { // normal entry if ( !mCurrentGroup ) { // first toplevel entry -> create toplevel group - mCurrentGroup = new QGpgMECryptoConfigGroup( "<nogroup>", TQString::null, 0 ); + mCurrentGroup = new QGpgMECryptoConfigGroup( "<nogroup>", TQString(), 0 ); mCurrentGroupName = "<nogroup>"; } mCurrentGroup->mEntries.insert( lst[0], new QGpgMECryptoConfigEntry( lst ) ); @@ -240,7 +240,7 @@ TQStringList QGpgMECryptoConfigComponent::groupList() const Kleo::CryptoConfigGroup* QGpgMECryptoConfigComponent::group(const TQString& name ) const { - return mGroups.find( name ); + return mGroups.tqfind( name ); } void QGpgMECryptoConfigComponent::sync( bool runtime ) @@ -341,7 +341,7 @@ TQStringList QGpgMECryptoConfigGroup::entryList() const Kleo::CryptoConfigEntry* QGpgMECryptoConfigGroup::entry( const TQString& name ) const { - return mEntries.find( name ); + return mEntries.tqfind( name ); } //// @@ -460,7 +460,7 @@ TQVariant QGpgMECryptoConfigEntry::stringToValue( const TQString& str, bool unes TQString val = *valit; if ( isString ) { if ( val.isEmpty() ) { - lst << TQString::null; + lst << TQString(); continue; } else if ( unescape ) { @@ -476,7 +476,7 @@ TQVariant QGpgMECryptoConfigEntry::stringToValue( const TQString& str, bool unes TQString val( str ); if ( isString ) { if ( val.isEmpty() ) - return TQVariant( TQString::null ); // not set [ok with lists too?] + return TQVariant( TQString() ); // not set [ok with lists too?] else if ( unescape ) { Q_ASSERT( val[0] == '"' ); // see README.gpgconf val = val.mid( 1 ); @@ -787,7 +787,7 @@ TQString QGpgMECryptoConfigEntry::toString( bool escape ) const // Basically the opposite of stringToValue if ( isStringType() ) { if ( mValue.isNull() ) - return TQString::null; + return TQString(); else if ( isList() ) { // string list TQStringList lst = mValue.toStringList(); if ( escape ) { @@ -809,7 +809,7 @@ TQString QGpgMECryptoConfigEntry::toString( bool escape ) const if ( !isList() ) // non-list non-string { if ( mArgType == ArgType_None ) { - return mValue.toBool() ? TQString::tqfromLatin1( "1" ) : TQString::null; + return mValue.toBool() ? TQString::tqfromLatin1( "1" ) : TQString(); } else { // some int Q_ASSERT( mArgType == ArgType_Int || mArgType == ArgType_UInt ); return mValue.toString(); // int to string conversion |