summaryrefslogtreecommitdiffstats
path: root/certmanager/lib/backends/qgpgme/qgpgmecryptoconfig.cpp
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2010-07-31 19:53:50 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2010-07-31 19:53:50 +0000
commit7be55ffa061c026e35e2d6a0effe1161ddb0d41f (patch)
tree8474f9b444b2756228600050f07a7ff25de532b2 /certmanager/lib/backends/qgpgme/qgpgmecryptoconfig.cpp
parentf587f20a6d09f1729dd0a8c1cd8ee0110aec7451 (diff)
downloadtdepim-7be55ffa061c026e35e2d6a0effe1161ddb0d41f.tar.gz
tdepim-7be55ffa061c026e35e2d6a0effe1161ddb0d41f.zip
Trinity Qt initial conversion
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1157655 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'certmanager/lib/backends/qgpgme/qgpgmecryptoconfig.cpp')
-rw-r--r--certmanager/lib/backends/qgpgme/qgpgmecryptoconfig.cpp202
1 files changed, 101 insertions, 101 deletions
diff --git a/certmanager/lib/backends/qgpgme/qgpgmecryptoconfig.cpp b/certmanager/lib/backends/qgpgme/qgpgmecryptoconfig.cpp
index 86eab99b4..c67800502 100644
--- a/certmanager/lib/backends/qgpgme/qgpgmecryptoconfig.cpp
+++ b/certmanager/lib/backends/qgpgme/qgpgmecryptoconfig.cpp
@@ -39,9 +39,9 @@
#include <assert.h>
#include <ktempfile.h>
-#include <qfile.h>
+#include <tqfile.h>
#include <stdlib.h>
-#include <qtextcodec.h>
+#include <tqtextcodec.h>
// Just for the Q_ASSERT in the dtor. Not thread-safe, but who would
// have 2 threads talking to gpgconf anyway? :)
@@ -71,12 +71,12 @@ void QGpgMECryptoConfig::runGpgConf( bool showErrors )
{
// Run gpgconf --list-components to make the list of components
- KProcIO proc( QTextCodec::codecForName( "utf8" ) );
+ KProcIO proc( TQTextCodec::codecForName( "utf8" ) );
proc << "gpgconf"; // must be in the PATH
proc << "--list-components";
- QObject::connect( &proc, SIGNAL( readReady(KProcIO*) ),
- this, SLOT( slotCollectStdOut(KProcIO*) ) );
+ TQObject::connect( &proc, TQT_SIGNAL( readReady(KProcIO*) ),
+ this, TQT_SLOT( slotCollectStdOut(KProcIO*) ) );
// run the process:
int rc = 0;
@@ -87,7 +87,7 @@ void QGpgMECryptoConfig::runGpgConf( bool showErrors )
// handle errors, if any (and if requested)
if ( showErrors && rc != 0 ) {
- QString wmsg = i18n("<qt>Failed to execute gpgconf:<br>%1</qt>");
+ TQString wmsg = i18n("<qt>Failed to execute gpgconf:<br>%1</qt>");
if ( rc == -1 )
wmsg = wmsg.arg( i18n( "program not found" ) );
else if ( rc == -2 )
@@ -102,12 +102,12 @@ void QGpgMECryptoConfig::runGpgConf( bool showErrors )
void QGpgMECryptoConfig::slotCollectStdOut( KProcIO* proc )
{
- QString line;
+ TQString line;
int result;
while( ( result = proc->readln(line) ) != -1 ) {
//kdDebug(5150) << "GOT LINE:" << line << endl;
// Format: NAME:DESCRIPTION
- QStringList lst = QStringList::split( ':', line, true );
+ TQStringList lst = TQStringList::split( ':', line, true );
if ( lst.count() >= 2 ) {
mComponents.insert( lst[0], new QGpgMECryptoConfigComponent( this, lst[0], lst[1] ) );
} else {
@@ -116,18 +116,18 @@ void QGpgMECryptoConfig::slotCollectStdOut( KProcIO* proc )
}
}
-QStringList QGpgMECryptoConfig::componentList() const
+TQStringList QGpgMECryptoConfig::componentList() const
{
if ( !mParsed )
const_cast<QGpgMECryptoConfig*>( this )->runGpgConf( true );
- QDictIterator<QGpgMECryptoConfigComponent> it( mComponents );
- QStringList names;
+ TQDictIterator<QGpgMECryptoConfigComponent> it( mComponents );
+ TQStringList names;
for( ; it.current(); ++it )
names.push_back( it.currentKey() );
return names;
}
-Kleo::CryptoConfigComponent* QGpgMECryptoConfig::component( const QString& name ) const
+Kleo::CryptoConfigComponent* QGpgMECryptoConfig::component( const TQString& name ) const
{
if ( !mParsed )
const_cast<QGpgMECryptoConfig*>( this )->runGpgConf( false );
@@ -136,7 +136,7 @@ Kleo::CryptoConfigComponent* QGpgMECryptoConfig::component( const QString& name
void QGpgMECryptoConfig::sync( bool runtime )
{
- QDictIterator<QGpgMECryptoConfigComponent> it( mComponents );
+ TQDictIterator<QGpgMECryptoConfigComponent> it( mComponents );
for( ; it.current(); ++it )
it.current()->sync( runtime );
}
@@ -151,7 +151,7 @@ void QGpgMECryptoConfig::clear()
////
-QGpgMECryptoConfigComponent::QGpgMECryptoConfigComponent( QGpgMECryptoConfig*, const QString& name, const QString& description )
+QGpgMECryptoConfigComponent::QGpgMECryptoConfigComponent( QGpgMECryptoConfig*, const TQString& name, const TQString& description )
: mGroups( 7 ), mName( name ), mDescription( description )
{
mGroups.setAutoDelete( true );
@@ -166,15 +166,15 @@ void QGpgMECryptoConfigComponent::runGpgConf()
{
// Run gpgconf --list-options <component>, and create all groups and entries for that component
- KProcIO proc( QTextCodec::codecForName( "utf8" ) );
+ KProcIO proc( TQTextCodec::codecForName( "utf8" ) );
proc << "gpgconf"; // must be in the PATH
proc << "--list-options";
proc << mName;
//kdDebug(5150) << "Running gpgconf --list-options " << mName << endl;
- QObject::connect( &proc, SIGNAL( readReady(KProcIO*) ),
- this, SLOT( slotCollectStdOut(KProcIO*) ) );
+ TQObject::connect( &proc, TQT_SIGNAL( readReady(KProcIO*) ),
+ this, TQT_SLOT( slotCollectStdOut(KProcIO*) ) );
mCurrentGroup = 0;
// run the process:
@@ -194,12 +194,12 @@ void QGpgMECryptoConfigComponent::runGpgConf()
void QGpgMECryptoConfigComponent::slotCollectStdOut( KProcIO* proc )
{
- QString line;
+ TQString line;
int result;
while( ( result = proc->readln(line) ) != -1 ) {
//kdDebug(5150) << "GOT LINE:" << line << endl;
// Format: NAME:FLAGS:LEVEL:DESCRIPTION:TYPE:ALT-TYPE:ARGNAME:DEFAULT:ARGDEF:VALUE
- const QStringList lst = QStringList::split( ':', line, true );
+ const TQStringList lst = TQStringList::split( ':', line, true );
if ( lst.count() >= 10 ) {
const int flags = lst[1].toInt();
const int level = lst[2].toInt();
@@ -215,7 +215,7 @@ void QGpgMECryptoConfigComponent::slotCollectStdOut( KProcIO* proc )
} else {
// normal entry
if ( !mCurrentGroup ) { // first toplevel entry -> create toplevel group
- mCurrentGroup = new QGpgMECryptoConfigGroup( "<nogroup>", QString::null, 0 );
+ mCurrentGroup = new QGpgMECryptoConfigGroup( "<nogroup>", TQString::null, 0 );
mCurrentGroupName = "<nogroup>";
}
mCurrentGroup->mEntries.insert( lst[0], new QGpgMECryptoConfigEntry( lst ) );
@@ -229,16 +229,16 @@ void QGpgMECryptoConfigComponent::slotCollectStdOut( KProcIO* proc )
}
}
-QStringList QGpgMECryptoConfigComponent::groupList() const
+TQStringList QGpgMECryptoConfigComponent::groupList() const
{
- QDictIterator<QGpgMECryptoConfigGroup> it( mGroups );
- QStringList names;
+ TQDictIterator<QGpgMECryptoConfigGroup> it( mGroups );
+ TQStringList names;
for( ; it.current(); ++it )
names.push_back( it.currentKey() );
return names;
}
-Kleo::CryptoConfigGroup* QGpgMECryptoConfigComponent::group(const QString& name ) const
+Kleo::CryptoConfigGroup* QGpgMECryptoConfigComponent::group(const TQString& name ) const
{
return mGroups.find( name );
}
@@ -248,16 +248,16 @@ void QGpgMECryptoConfigComponent::sync( bool runtime )
KTempFile tmpFile;
tmpFile.setAutoDelete( true );
- QValueList<QGpgMECryptoConfigEntry *> dirtyEntries;
+ TQValueList<QGpgMECryptoConfigEntry *> dirtyEntries;
// Collect all dirty entries
- QDictIterator<QGpgMECryptoConfigGroup> groupit( mGroups );
+ TQDictIterator<QGpgMECryptoConfigGroup> groupit( mGroups );
for( ; groupit.current(); ++groupit ) {
- QDictIterator<QGpgMECryptoConfigEntry> it( groupit.current()->mEntries );
+ TQDictIterator<QGpgMECryptoConfigEntry> it( groupit.current()->mEntries );
for( ; it.current(); ++it ) {
if ( it.current()->isDirty() ) {
// OK, we can set it.currentKey() to it.current()->outputString()
- QString line = it.currentKey();
+ TQString line = it.currentKey();
if ( it.current()->isSet() ) { // set option
line += ":0:";
line += it.current()->outputString();
@@ -265,7 +265,7 @@ void QGpgMECryptoConfigComponent::sync( bool runtime )
line += ":16:";
}
line += '\n';
- QCString line8bit = line.utf8(); // encode with utf8, and KProcIO uses utf8 when reading.
+ TQCString line8bit = line.utf8(); // encode with utf8, and KProcIO uses utf8 when reading.
tmpFile.file()->writeBlock( line8bit.data(), line8bit.size()-1 /*no 0*/ );
dirtyEntries.append( it.current() );
}
@@ -276,7 +276,7 @@ void QGpgMECryptoConfigComponent::sync( bool runtime )
return;
// Call gpgconf --change-options <component>
- QString commandLine = "gpgconf";
+ TQString commandLine = "gpgconf";
if ( runtime )
commandLine += " --runtime";
commandLine += " --change-options ";
@@ -285,7 +285,7 @@ void QGpgMECryptoConfigComponent::sync( bool runtime )
commandLine += KProcess::quote( tmpFile.name() );
//kdDebug(5150) << commandLine << endl;
- //system( QCString( "cat " ) + tmpFile.name().latin1() ); // DEBUG
+ //system( TQCString( "cat " ) + tmpFile.name().latin1() ); // DEBUG
KProcess proc;
proc.setUseShell( true );
@@ -300,19 +300,19 @@ void QGpgMECryptoConfigComponent::sync( bool runtime )
if ( rc == -1 )
{
- QString wmsg = i18n( "Could not start gpgconf\nCheck that gpgconf is in the PATH and that it can be started" );
+ TQString wmsg = i18n( "Could not start gpgconf\nCheck that gpgconf is in the PATH and that it can be started" );
kdWarning(5150) << wmsg << endl;
KMessageBox::error(0, wmsg);
}
else if( rc != 0 ) // Happens due to bugs in gpgconf (e.g. issues 104/115)
{
- QString wmsg = i18n( "Error from gpgconf while saving configuration: %1" ).arg( QString::fromLocal8Bit( strerror( rc ) ) );
+ TQString wmsg = i18n( "Error from gpgconf while saving configuration: %1" ).arg( TQString::fromLocal8Bit( strerror( rc ) ) );
kdWarning(5150) << k_funcinfo << ":" << strerror( rc ) << endl;
KMessageBox::error(0, wmsg);
}
else
{
- QValueList<QGpgMECryptoConfigEntry *>::Iterator it = dirtyEntries.begin();
+ TQValueList<QGpgMECryptoConfigEntry *>::Iterator it = dirtyEntries.begin();
for( ; it != dirtyEntries.end(); ++it ) {
(*it)->setDirty( false );
}
@@ -321,7 +321,7 @@ void QGpgMECryptoConfigComponent::sync( bool runtime )
////
-QGpgMECryptoConfigGroup::QGpgMECryptoConfigGroup( const QString & name, const QString& description, int level )
+QGpgMECryptoConfigGroup::QGpgMECryptoConfigGroup( const TQString & name, const TQString& description, int level )
: mEntries( 29 ),
mName( name ),
mDescription( description ),
@@ -330,47 +330,47 @@ QGpgMECryptoConfigGroup::QGpgMECryptoConfigGroup( const QString & name, const QS
mEntries.setAutoDelete( true );
}
-QStringList QGpgMECryptoConfigGroup::entryList() const
+TQStringList QGpgMECryptoConfigGroup::entryList() const
{
- QDictIterator<QGpgMECryptoConfigEntry> it( mEntries );
- QStringList names;
+ TQDictIterator<QGpgMECryptoConfigEntry> it( mEntries );
+ TQStringList names;
for( ; it.current(); ++it )
names.push_back( it.currentKey() );
return names;
}
-Kleo::CryptoConfigEntry* QGpgMECryptoConfigGroup::entry( const QString& name ) const
+Kleo::CryptoConfigEntry* QGpgMECryptoConfigGroup::entry( const TQString& name ) const
{
return mEntries.find( name );
}
////
-static QString gpgconf_unescape( const QString& str )
+static TQString gpgconf_unescape( const TQString& str )
{
// Looks like it's the same rules as KURL.
return KURL::decode_string( str, 106 );
}
-static QString gpgconf_escape( const QString& str )
+static TQString gpgconf_escape( const TQString& str )
{
// Escape special chars (including ':' and '%')
- QString enc = KURL::encode_string( str, 106 ); // and convert to utf8 first (to get %12%34 for one special char)
+ TQString enc = KURL::encode_string( str, 106 ); // and convert to utf8 first (to get %12%34 for one special char)
// Also encode commas, for lists.
enc.replace( ',', "%2c" );
return enc;
}
-static QString urlpart_encode( const QString& str )
+static TQString urlpart_encode( const TQString& str )
{
- QString enc( str );
+ TQString enc( str );
enc.replace( '%', "%25" ); // first!
enc.replace( ':', "%3a" );
//kdDebug() << " urlpart_encode: " << str << " -> " << enc << endl;
return enc;
}
-static QString urlpart_decode( const QString& str )
+static TQString urlpart_decode( const TQString& str )
{
return KURL::decode_string( str );
}
@@ -397,11 +397,11 @@ static Kleo::CryptoConfigEntry::ArgType knownArgType( int argType, bool& ok ) {
}
}
-QGpgMECryptoConfigEntry::QGpgMECryptoConfigEntry( const QStringList& parsedLine )
+QGpgMECryptoConfigEntry::QGpgMECryptoConfigEntry( const TQStringList& parsedLine )
{
// Format: NAME:FLAGS:LEVEL:DESCRIPTION:TYPE:ALT-TYPE:ARGNAME:DEFAULT:ARGDEF:VALUE
assert( parsedLine.count() >= 10 ); // called checked for it already
- QStringList::const_iterator it = parsedLine.begin();
+ TQStringList::const_iterator it = parsedLine.begin();
mName = *it++;
mFlags = (*it++).toInt();
mLevel = (*it++).toInt();
@@ -421,7 +421,7 @@ QGpgMECryptoConfigEntry::QGpgMECryptoConfigEntry( const QStringList& parsedLine
++it; // skip argname (not useful in GUIs)
mSet = false;
- QString value;
+ TQString value;
if ( mFlags & GPGCONF_FLAG_DEFAULT ) {
value = *it; // get default value
mDefaultValue = stringToValue( value, true );
@@ -442,18 +442,18 @@ QGpgMECryptoConfigEntry::QGpgMECryptoConfigEntry( const QStringList& parsedLine
mDirty = false;
}
-QVariant QGpgMECryptoConfigEntry::stringToValue( const QString& str, bool unescape ) const
+TQVariant QGpgMECryptoConfigEntry::stringToValue( const TQString& str, bool unescape ) const
{
bool isString = isStringType();
if ( isList() ) {
- QValueList<QVariant> lst;
- QStringList items = QStringList::split( ',', str );
- for( QStringList::const_iterator valit = items.begin(); valit != items.end(); ++valit ) {
- QString val = *valit;
+ TQValueList<TQVariant> lst;
+ TQStringList items = TQStringList::split( ',', str );
+ for( TQStringList::const_iterator valit = items.begin(); valit != items.end(); ++valit ) {
+ TQString val = *valit;
if ( isString ) {
if ( val.isEmpty() ) {
- lst << QString::null;
+ lst << TQString::null;
continue;
}
else if ( unescape ) {
@@ -462,20 +462,20 @@ QVariant QGpgMECryptoConfigEntry::stringToValue( const QString& str, bool unesca
val = val.mid( 1 );
}
}
- lst << QVariant( unescape ? gpgconf_unescape( val ) : val );
+ lst << TQVariant( unescape ? gpgconf_unescape( val ) : val );
}
return lst;
} else { // not a list
- QString val( str );
+ TQString val( str );
if ( isString ) {
if ( val.isEmpty() )
- return QVariant( QString::null ); // not set [ok with lists too?]
+ return TQVariant( TQString::null ); // not set [ok with lists too?]
else if ( unescape ) {
Q_ASSERT( val[0] == '"' ); // see README.gpgconf
val = val.mid( 1 );
}
}
- return QVariant( unescape ? gpgconf_unescape( val ) : val );
+ return TQVariant( unescape ? gpgconf_unescape( val ) : val );
}
}
@@ -520,7 +520,7 @@ bool QGpgMECryptoConfigEntry::boolValue() const
return mValue.toBool();
}
-QString QGpgMECryptoConfigEntry::stringValue() const
+TQString QGpgMECryptoConfigEntry::stringValue() const
{
return toString( false );
}
@@ -539,13 +539,13 @@ unsigned int QGpgMECryptoConfigEntry::uintValue() const
return mValue.toUInt();
}
-static KURL parseURL( int mRealArgType, const QString& str )
+static KURL parseURL( int mRealArgType, const TQString& str )
{
if ( mRealArgType == 33 ) { // LDAP server
// The format is HOSTNAME:PORT:USERNAME:PASSWORD:BASE_DN
- QStringList items = QStringList::split( ':', str, true );
+ TQStringList items = TQStringList::split( ':', str, true );
if ( items.count() == 5 ) {
- QStringList::const_iterator it = items.begin();
+ TQStringList::const_iterator it = items.begin();
KURL url;
url.setProtocol( "ldap" );
url.setHost( urlpart_decode( *it++ ) );
@@ -563,13 +563,13 @@ static KURL parseURL( int mRealArgType, const QString& str )
}
// The opposite of parseURL
-static QString splitURL( int mRealArgType, const KURL& url )
+static TQString splitURL( int mRealArgType, const KURL& url )
{
if ( mRealArgType == 33 ) { // LDAP server
// The format is HOSTNAME:PORT:USERNAME:PASSWORD:BASE_DN
Q_ASSERT( url.protocol() == "ldap" );
return urlpart_encode( url.host() ) + ":" +
- QString::number( url.port() ) + ":" +
+ TQString::number( url.port() ) + ":" +
urlpart_encode( url.user() ) + ":" +
urlpart_encode( url.pass() ) + ":" +
// KURL automatically encoded the query (e.g. for spaces inside it),
@@ -583,7 +583,7 @@ KURL QGpgMECryptoConfigEntry::urlValue() const
{
Q_ASSERT( mArgType == ArgType_Path || mArgType == ArgType_URL || mArgType == ArgType_LDAPURL );
Q_ASSERT( !isList() );
- QString str = mValue.toString();
+ TQString str = mValue.toString();
if ( mArgType == ArgType_Path )
{
KURL url;
@@ -600,32 +600,32 @@ unsigned int QGpgMECryptoConfigEntry::numberOfTimesSet() const
return mValue.toUInt();
}
-QStringList QGpgMECryptoConfigEntry::stringValueList() const
+TQStringList QGpgMECryptoConfigEntry::stringValueList() const
{
Q_ASSERT( isStringType() );
Q_ASSERT( isList() );
return mValue.toStringList();
}
-QValueList<int> QGpgMECryptoConfigEntry::intValueList() const
+TQValueList<int> QGpgMECryptoConfigEntry::intValueList() const
{
Q_ASSERT( mArgType == ArgType_Int );
Q_ASSERT( isList() );
- QValueList<int> ret;
- QValueList<QVariant> lst = mValue.toList();
- for( QValueList<QVariant>::const_iterator it = lst.begin(); it != lst.end(); ++it ) {
+ TQValueList<int> ret;
+ TQValueList<TQVariant> lst = mValue.toList();
+ for( TQValueList<TQVariant>::const_iterator it = lst.begin(); it != lst.end(); ++it ) {
ret.append( (*it).toInt() );
}
return ret;
}
-QValueList<unsigned int> QGpgMECryptoConfigEntry::uintValueList() const
+TQValueList<unsigned int> QGpgMECryptoConfigEntry::uintValueList() const
{
Q_ASSERT( mArgType == ArgType_UInt );
Q_ASSERT( isList() );
- QValueList<unsigned int> ret;
- QValueList<QVariant> lst = mValue.toList();
- for( QValueList<QVariant>::const_iterator it = lst.begin(); it != lst.end(); ++it ) {
+ TQValueList<unsigned int> ret;
+ TQValueList<TQVariant> lst = mValue.toList();
+ for( TQValueList<TQVariant>::const_iterator it = lst.begin(); it != lst.end(); ++it ) {
ret.append( (*it).toUInt() );
}
return ret;
@@ -635,10 +635,10 @@ KURL::List QGpgMECryptoConfigEntry::urlValueList() const
{
Q_ASSERT( mArgType == ArgType_Path || mArgType == ArgType_URL || mArgType == ArgType_LDAPURL );
Q_ASSERT( isList() );
- QStringList lst = mValue.toStringList();
+ TQStringList lst = mValue.toStringList();
KURL::List ret;
- for( QStringList::const_iterator it = lst.begin(); it != lst.end(); ++it ) {
+ for( TQStringList::const_iterator it = lst.begin(); it != lst.end(); ++it ) {
if ( mArgType == ArgType_Path ) {
KURL url;
url.setPath( *it );
@@ -671,7 +671,7 @@ void QGpgMECryptoConfigEntry::setBoolValue( bool b )
mDirty = true;
}
-void QGpgMECryptoConfigEntry::setStringValue( const QString& str )
+void QGpgMECryptoConfigEntry::setStringValue( const TQString& str )
{
mValue = stringToValue( str, false );
// When setting a string to empty (and there's no default), we need to act like resetToDefault
@@ -702,7 +702,7 @@ void QGpgMECryptoConfigEntry::setUIntValue( unsigned int i )
void QGpgMECryptoConfigEntry::setURLValue( const KURL& url )
{
- QString str = splitURL( mRealArgType, url );
+ TQString str = splitURL( mRealArgType, url );
if ( str.isEmpty() && !isOptional() )
mSet = false;
else
@@ -718,7 +718,7 @@ void QGpgMECryptoConfigEntry::setNumberOfTimesSet( unsigned int i )
setUIntValue( i );
}
-void QGpgMECryptoConfigEntry::setStringValueList( const QStringList& lst )
+void QGpgMECryptoConfigEntry::setStringValueList( const TQStringList& lst )
{
mValue = lst;
if ( lst.isEmpty() && !isOptional() )
@@ -728,11 +728,11 @@ void QGpgMECryptoConfigEntry::setStringValueList( const QStringList& lst )
mDirty = true;
}
-void QGpgMECryptoConfigEntry::setIntValueList( const QValueList<int>& lst )
+void QGpgMECryptoConfigEntry::setIntValueList( const TQValueList<int>& lst )
{
- QValueList<QVariant> ret;
- for( QValueList<int>::const_iterator it = lst.begin(); it != lst.end(); ++it ) {
- ret << QVariant( *it );
+ TQValueList<TQVariant> ret;
+ for( TQValueList<int>::const_iterator it = lst.begin(); it != lst.end(); ++it ) {
+ ret << TQVariant( *it );
}
mValue = ret;
if ( ret.isEmpty() && !isOptional() )
@@ -742,11 +742,11 @@ void QGpgMECryptoConfigEntry::setIntValueList( const QValueList<int>& lst )
mDirty = true;
}
-void QGpgMECryptoConfigEntry::setUIntValueList( const QValueList<unsigned int>& lst )
+void QGpgMECryptoConfigEntry::setUIntValueList( const TQValueList<unsigned int>& lst )
{
- QValueList<QVariant> ret;
- for( QValueList<unsigned int>::const_iterator it = lst.begin(); it != lst.end(); ++it ) {
- ret << QVariant( *it );
+ TQValueList<TQVariant> ret;
+ for( TQValueList<unsigned int>::const_iterator it = lst.begin(); it != lst.end(); ++it ) {
+ ret << TQVariant( *it );
}
if ( ret.isEmpty() && !isOptional() )
mSet = false;
@@ -758,7 +758,7 @@ void QGpgMECryptoConfigEntry::setUIntValueList( const QValueList<unsigned int>&
void QGpgMECryptoConfigEntry::setURLValueList( const KURL::List& urls )
{
- QStringList lst;
+ TQStringList lst;
for( KURL::List::const_iterator it = urls.begin(); it != urls.end(); ++it ) {
lst << splitURL( mRealArgType, *it );
}
@@ -770,25 +770,25 @@ void QGpgMECryptoConfigEntry::setURLValueList( const KURL::List& urls )
mDirty = true;
}
-QString QGpgMECryptoConfigEntry::toString( bool escape ) const
+TQString QGpgMECryptoConfigEntry::toString( bool escape ) const
{
// Basically the opposite of stringToValue
if ( isStringType() ) {
if ( mValue.isNull() )
- return QString::null;
+ return TQString::null;
else if ( isList() ) { // string list
- QStringList lst = mValue.toStringList();
+ TQStringList lst = mValue.toStringList();
if ( escape ) {
- for( QStringList::iterator it = lst.begin(); it != lst.end(); ++it ) {
+ for( TQStringList::iterator it = lst.begin(); it != lst.end(); ++it ) {
if ( !(*it).isNull() )
*it = gpgconf_escape( *it ).prepend( "\"" );
}
}
- QString res = lst.join( "," );
+ TQString res = lst.join( "," );
kdDebug(5150) << "toString: " << res << endl;
return res;
} else { // normal string
- QString res = mValue.toString();
+ TQString res = mValue.toString();
if ( escape )
res = gpgconf_escape( res ).prepend( "\"" );
return res;
@@ -797,7 +797,7 @@ QString QGpgMECryptoConfigEntry::toString( bool escape ) const
if ( !isList() ) // non-list non-string
{
if ( mArgType == ArgType_None ) {
- return mValue.toBool() ? QString::fromLatin1( "1" ) : QString::null;
+ return mValue.toBool() ? TQString::fromLatin1( "1" ) : TQString::null;
} else { // some int
Q_ASSERT( mArgType == ArgType_Int || mArgType == ArgType_UInt );
return mValue.toString(); // int to string conversion
@@ -806,16 +806,16 @@ QString QGpgMECryptoConfigEntry::toString( bool escape ) const
// Lists (of other types than strings)
if ( mArgType == ArgType_None )
- return QString::number( numberOfTimesSet() );
- QStringList ret;
- QValueList<QVariant> lst = mValue.toList();
- for( QValueList<QVariant>::const_iterator it = lst.begin(); it != lst.end(); ++it ) {
- ret << (*it).toString(); // QVariant does the conversion
+ return TQString::number( numberOfTimesSet() );
+ TQStringList ret;
+ TQValueList<TQVariant> lst = mValue.toList();
+ for( TQValueList<TQVariant>::const_iterator it = lst.begin(); it != lst.end(); ++it ) {
+ ret << (*it).toString(); // TQVariant does the conversion
}
return ret.join( "," );
}
-QString QGpgMECryptoConfigEntry::outputString() const
+TQString QGpgMECryptoConfigEntry::outputString() const
{
Q_ASSERT( mSet );
return toString( true );