diff options
Diffstat (limited to 'certmanager/lib')
43 files changed, 186 insertions, 186 deletions
diff --git a/certmanager/lib/backends/chiasmus/chiasmusbackend.cpp b/certmanager/lib/backends/chiasmus/chiasmusbackend.cpp index aad0701a..2804cca1 100644 --- a/certmanager/lib/backends/chiasmus/chiasmusbackend.cpp +++ b/certmanager/lib/backends/chiasmus/chiasmusbackend.cpp @@ -224,9 +224,9 @@ namespace { return TQVariant( data.defaults.boolean.value, int() ); case ArgType_String: if ( isList() ) - return TQStringList( TQString::fromLatin1( data.defaults.string ) ); + return TQStringList( TQString::tqfromLatin1( data.defaults.string ) ); else - return TQString::fromLatin1( data.defaults.string ); + return TQString::tqfromLatin1( data.defaults.string ); case ArgType_Int: if ( isList() ) return TQValueList<TQVariant>() << data.defaults.integer; @@ -240,15 +240,15 @@ namespace { case ArgType_Path: case ArgType_DirPath: if ( isList() ) - return TQValueList<TQVariant>() << TQString::fromLatin1( data.defaults.path ); + return TQValueList<TQVariant>() << TQString::tqfromLatin1( data.defaults.path ); else - return TQString::fromLatin1( data.defaults.path ); + return TQString::tqfromLatin1( data.defaults.path ); case ArgType_URL: case ArgType_LDAPURL: if ( isList() ) - return TQValueList<TQVariant>() << TQString::fromLatin1( data.defaults.url ); + return TQValueList<TQVariant>() << TQString::tqfromLatin1( data.defaults.url ); else - return TQString::fromLatin1( data.defaults.url ); + return TQString::tqfromLatin1( data.defaults.url ); } } diff --git a/certmanager/lib/backends/qgpgme/qgpgmecryptoconfig.cpp b/certmanager/lib/backends/qgpgme/qgpgmecryptoconfig.cpp index ae45d683..6dc5c5e3 100644 --- a/certmanager/lib/backends/qgpgme/qgpgmecryptoconfig.cpp +++ b/certmanager/lib/backends/qgpgme/qgpgmecryptoconfig.cpp @@ -357,15 +357,15 @@ static TQString gpgconf_escape( const TQString& str ) // Escape special chars (including ':' and '%') 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" ); + enc.tqreplace( ',', "%2c" ); return enc; } static TQString urlpart_encode( const TQString& str ) { TQString enc( str ); - enc.replace( '%', "%25" ); // first! - enc.replace( ':', "%3a" ); + enc.tqreplace( '%', "%25" ); // first! + enc.tqreplace( ':', "%3a" ); //kdDebug() << " urlpart_encode: " << str << " -> " << enc << endl; return enc; } @@ -809,7 +809,7 @@ TQString QGpgMECryptoConfigEntry::toString( bool escape ) const if ( !isList() ) // non-list non-string { if ( mArgType == ArgType_None ) { - return mValue.toBool() ? TQString::fromLatin1( "1" ) : TQString::null; + return mValue.toBool() ? TQString::tqfromLatin1( "1" ) : TQString::null; } else { // some int Q_ASSERT( mArgType == ArgType_Int || mArgType == ArgType_UInt ); return mValue.toString(); // int to string conversion diff --git a/certmanager/lib/backends/qgpgme/qgpgmejob.h b/certmanager/lib/backends/qgpgme/qgpgmejob.h index 0681c165..4a03d7d9 100644 --- a/certmanager/lib/backends/qgpgme/qgpgmejob.h +++ b/certmanager/lib/backends/qgpgme/qgpgmejob.h @@ -63,10 +63,10 @@ class TQStringList; namespace Kleo { /** This is a hackish helper class to avoid code duplication in this - backend's Kleo::Job subclasses. It contains several workarounds - for moc/signal/slot shortcomings, most of which the author of + backend's Kleo::Job subclasses. It tqcontains several workarounds + for tqmoc/signal/slot shortcomings, most of which the author of this thinks are Qt bugs (lazy implementations), first and - foremost the inability of moc to handle inheritance from + foremost the inability of tqmoc to handle inheritance from multiple QObject-derived subclasses. To use it, inherit from the Job-subclass, then from this class, @@ -140,7 +140,7 @@ namespace Kleo { QGpgME::QByteArrayDataProvider * mOutDataDataProvider; private: const char* * mPatterns; - // holds the entry - if any - in mPattern that was replaced with + // holds the entry - if any - in mPattern that was tqreplaced with // NULL to create a temporary end-of-array marker for gpgme: const char * mReplacedPattern; unsigned int mNumPatterns; diff --git a/certmanager/lib/backends/qgpgme/qgpgmeprogresstokenmapper.cpp b/certmanager/lib/backends/qgpgme/qgpgmeprogresstokenmapper.cpp index 6cb71dba..89d9dda3 100644 --- a/certmanager/lib/backends/qgpgme/qgpgmeprogresstokenmapper.cpp +++ b/certmanager/lib/backends/qgpgme/qgpgmeprogresstokenmapper.cpp @@ -114,7 +114,7 @@ static const Map & makeMap() { // return a reference to a static to avoid copyin static Map map; for ( unsigned int i = 0 ; i < sizeof tokens / sizeof *tokens ; ++i ) { assert( tokens[i].token ); - const TQString token = TQString::fromLatin1( tokens[i].token ).lower(); + const TQString token = TQString::tqfromLatin1( tokens[i].token ).lower(); for ( unsigned int j = 0 ; j < tokens[i].numDesc ; ++j ) { const Desc & desc = tokens[i].desc[j]; assert( desc.display ); diff --git a/certmanager/lib/backends/qgpgme/qgpgmerefreshkeysjob.cpp b/certmanager/lib/backends/qgpgme/qgpgmerefreshkeysjob.cpp index 911afcd6..7517b2a8 100644 --- a/certmanager/lib/backends/qgpgme/qgpgmerefreshkeysjob.cpp +++ b/certmanager/lib/backends/qgpgme/qgpgmerefreshkeysjob.cpp @@ -112,7 +112,7 @@ GpgME::Error Kleo::QGpgMERefreshKeysJob::startAProcess() { connect( mProcess, TQT_SIGNAL(receivedStderr(KProcess*,char*,int)), TQT_SLOT(slotStderr(KProcess*,char*,int)) ); connect( mProcess, TQT_SIGNAL(status(Kleo::GnuPGProcessBase*,const TQString&,const TQStringList&)), - TQT_SLOT(slotStatus(Kleo::GnuPGProcessBase*,const TQString&,const TQStringList&)) ); + TQT_SLOT(sloStatus(Kleo::GnuPGProcessBase*,const TQString&,const TQStringList&)) ); if ( !mProcess->start( KProcess::NotifyOnExit, KProcess::Stderr ) ) { mError = gpg_err_make( GPG_ERR_SOURCE_GPGSM, GPG_ERR_ENOENT ); // what else? @@ -129,7 +129,7 @@ void Kleo::QGpgMERefreshKeysJob::slotCancel() { mError = gpg_err_make( GPG_ERR_SOURCE_GPGSM, GPG_ERR_CANCELED ); } -void Kleo::QGpgMERefreshKeysJob::slotStatus( GnuPGProcessBase * proc, const TQString & type, const TQStringList & args ) { +void Kleo::QGpgMERefreshKeysJob::sloStatus( GnuPGProcessBase * proc, const TQString & type, const TQStringList & args ) { if ( proc != mProcess ) return; TQStringList::const_iterator it = args.begin(); @@ -139,18 +139,18 @@ void Kleo::QGpgMERefreshKeysJob::slotStatus( GnuPGProcessBase * proc, const TQSt if ( args.size() < 2 ) { - kdDebug( 5150 ) << "Kleo::QGpgMERefreshKeysJob::slotStatus() not recognising ERROR with < 2 args!" << endl; + kdDebug( 5150 ) << "Kleo::QGpgMERefreshKeysJob::sloStatus() not recognising ERROR with < 2 args!" << endl; return; } const int source = (*++it).toInt( &ok ); if ( !ok ) { - kdDebug( 5150 ) << "Kleo::QGpgMERefreshKeysJob::slotStatus() expected number for first ERROR arg, got something else" << endl; + kdDebug( 5150 ) << "Kleo::QGpgMERefreshKeysJob::sloStatus() expected number for first ERROR arg, got something else" << endl; return; } ok = false; const int code = (*++it).toInt( &ok ); if ( !ok ) { - kdDebug( 5150 ) << "Kleo::QGpgMERefreshKeysJob::slotStatus() expected number for second ERROR arg, got something else" << endl; + kdDebug( 5150 ) << "Kleo::QGpgMERefreshKeysJob::sloStatus() expected number for second ERROR arg, got something else" << endl; return; } mError = gpg_err_make( (gpg_err_source_t)source, (gpg_err_code_t)code ); @@ -160,20 +160,20 @@ void Kleo::QGpgMERefreshKeysJob::slotStatus( GnuPGProcessBase * proc, const TQSt if ( args.size() < 4 ) { - kdDebug( 5150 ) << "Kleo::QGpgMERefreshKeysJob::slotStatus() not recognising PROGRESS with < 4 args!" << endl; + kdDebug( 5150 ) << "Kleo::QGpgMERefreshKeysJob::sloStatus() not recognising PROGRESS with < 4 args!" << endl; return; } const TQString what = *++it; ++it; // don't use "type"... const int cur = (*++it).toInt( &ok ); if ( !ok ) { - kdDebug( 5150 ) << "Kleo::QGpgMERefreshKeysJob::slotStatus() expected number for \"cur\", got something else" << endl; + kdDebug( 5150 ) << "Kleo::QGpgMERefreshKeysJob::sloStatus() expected number for \"cur\", got something else" << endl; return; } ok = false; const int total = (*++it).toInt( &ok ); if ( !ok ) { - kdDebug( 5150 ) << "Kleo::QGpgMERefreshKeysJob::slotStatus() expected number for \"total\", got something else" << endl; + kdDebug( 5150 ) << "Kleo::QGpgMERefreshKeysJob::sloStatus() expected number for \"total\", got something else" << endl; return; } emit progress( QGpgMEProgressTokenMapper::instance()->map( what, 0, cur, total ), cur, total ); diff --git a/certmanager/lib/backends/qgpgme/qgpgmerefreshkeysjob.h b/certmanager/lib/backends/qgpgme/qgpgmerefreshkeysjob.h index 7ed47686..7246f0a3 100644 --- a/certmanager/lib/backends/qgpgme/qgpgmerefreshkeysjob.h +++ b/certmanager/lib/backends/qgpgme/qgpgmerefreshkeysjob.h @@ -62,7 +62,7 @@ namespace Kleo { /*! \reimp from Job */ void slotCancel(); - void slotStatus( Kleo::GnuPGProcessBase *, const TQString &, const TQStringList & ); + void sloStatus( Kleo::GnuPGProcessBase *, const TQString &, const TQStringList & ); void slotStderr( KProcess *, char *, int ); void slotProcessExited( KProcess * ); diff --git a/certmanager/lib/backends/qgpgme/qgpgmesecretkeyexportjob.cpp b/certmanager/lib/backends/qgpgme/qgpgmesecretkeyexportjob.cpp index aeb7b010..d73b4cb1 100644 --- a/certmanager/lib/backends/qgpgme/qgpgmesecretkeyexportjob.cpp +++ b/certmanager/lib/backends/qgpgme/qgpgmesecretkeyexportjob.cpp @@ -95,7 +95,7 @@ GpgME::Error Kleo::QGpgMESecretKeyExportJob::start( const TQStringList & pattern connect( mProcess, TQT_SIGNAL(receivedStderr(KProcess*,char*,int)), TQT_SLOT(slotStderr(KProcess*,char*,int)) ); connect( mProcess, TQT_SIGNAL(status(Kleo::GnuPGProcessBase*,const TQString&,const TQStringList&)), - TQT_SLOT(slotStatus(Kleo::GnuPGProcessBase*,const TQString&,const TQStringList&)) ); + TQT_SLOT(sloStatus(Kleo::GnuPGProcessBase*,const TQString&,const TQStringList&)) ); if ( !mProcess->start( KProcess::NotifyOnExit, KProcess::AllOutput ) ) { mError = gpg_err_make( GPG_ERR_SOURCE_GPGSM, GPG_ERR_ENOENT ); // what else? @@ -112,7 +112,7 @@ void Kleo::QGpgMESecretKeyExportJob::slotCancel() { mError = gpg_err_make( GPG_ERR_SOURCE_GPGSM, GPG_ERR_CANCELED ); } -void Kleo::QGpgMESecretKeyExportJob::slotStatus( GnuPGProcessBase * proc, const TQString & type, const TQStringList & args ) { +void Kleo::QGpgMESecretKeyExportJob::sloStatus( GnuPGProcessBase * proc, const TQString & type, const TQStringList & args ) { if ( proc != mProcess ) return; TQStringList::const_iterator it = args.begin(); @@ -122,18 +122,18 @@ void Kleo::QGpgMESecretKeyExportJob::slotStatus( GnuPGProcessBase * proc, const if ( args.size() < 2 ) { - kdDebug( 5150 ) << "Kleo::QGpgMESecretKeyExportJob::slotStatus() not recognising ERROR with < 2 args!" << endl; + kdDebug( 5150 ) << "Kleo::QGpgMESecretKeyExportJob::sloStatus() not recognising ERROR with < 2 args!" << endl; return; } const int source = (*++it).toInt( &ok ); if ( !ok ) { - kdDebug( 5150 ) << "Kleo::QGpgMESecretKeyExportJob::slotStatus() expected number for first ERROR arg, got something else" << endl; + kdDebug( 5150 ) << "Kleo::QGpgMESecretKeyExportJob::sloStatus() expected number for first ERROR arg, got something else" << endl; return; } ok = false; const int code = (*++it).toInt( &ok ); if ( !ok ) { - kdDebug( 5150 ) << "Kleo::QGpgMESecretKeyExportJob::slotStatus() expected number for second ERROR arg, got something else" << endl; + kdDebug( 5150 ) << "Kleo::QGpgMESecretKeyExportJob::sloStatus() expected number for second ERROR arg, got something else" << endl; return; } mError = gpg_err_make( (gpg_err_source_t)source, (gpg_err_code_t)code ); @@ -143,20 +143,20 @@ void Kleo::QGpgMESecretKeyExportJob::slotStatus( GnuPGProcessBase * proc, const if ( args.size() < 4 ) { - kdDebug( 5150 ) << "Kleo::QGpgMESecretKeyExportJob::slotStatus() not recognising PROGRESS with < 4 args!" << endl; + kdDebug( 5150 ) << "Kleo::QGpgMESecretKeyExportJob::sloStatus() not recognising PROGRESS with < 4 args!" << endl; return; } const TQString what = *++it; ++it; // don't use "type"... const int cur = (*++it).toInt( &ok ); if ( !ok ) { - kdDebug( 5150 ) << "Kleo::QGpgMESecretKeyExportJob::slotStatus() expected number for \"cur\", got something else" << endl; + kdDebug( 5150 ) << "Kleo::QGpgMESecretKeyExportJob::sloStatus() expected number for \"cur\", got something else" << endl; return; } ok = false; const int total = (*++it).toInt( &ok ); if ( !ok ) { - kdDebug( 5150 ) << "Kleo::QGpgMESecretKeyExportJob::slotStatus() expected number for \"total\", got something else" << endl; + kdDebug( 5150 ) << "Kleo::QGpgMESecretKeyExportJob::sloStatus() expected number for \"total\", got something else" << endl; return; } emit progress( QGpgMEProgressTokenMapper::instance()->map( what, 0, cur, total ), cur, total ); diff --git a/certmanager/lib/backends/qgpgme/qgpgmesecretkeyexportjob.h b/certmanager/lib/backends/qgpgme/qgpgmesecretkeyexportjob.h index 50d42c3c..cb65d549 100644 --- a/certmanager/lib/backends/qgpgme/qgpgmesecretkeyexportjob.h +++ b/certmanager/lib/backends/qgpgme/qgpgmesecretkeyexportjob.h @@ -67,7 +67,7 @@ namespace Kleo { /*! \reimp from Job */ void slotCancel(); - void slotStatus( Kleo::GnuPGProcessBase *, const TQString &, const TQStringList & ); + void sloStatus( Kleo::GnuPGProcessBase *, const TQString &, const TQStringList & ); void slotStdout( KProcess *, char *, int ); void slotStderr( KProcess *, char *, int ); void slotProcessExited( KProcess * ); diff --git a/certmanager/lib/cryptplug.cpp b/certmanager/lib/cryptplug.cpp index 77a91451..c3c8b462 100644 --- a/certmanager/lib/cryptplug.cpp +++ b/certmanager/lib/cryptplug.cpp @@ -226,7 +226,7 @@ OpenPGPCryptPlug::OpenPGPCryptPlug() : CryptPlug() { /* Max number of parts in a DN */ #define MAX_GPGME_IDX 20 -/* some macros to replace ctype ones and avoid locale problems */ +/* some macros to tqreplace ctype ones and avoid locale problems */ #define spacep(p) (*(p) == ' ' || *(p) == '\t') #define digitp(p) (*(p) >= '0' && *(p) <= '9') #define hexdigitp(a) (digitp (a) \ diff --git a/certmanager/lib/cryptplug.h b/certmanager/lib/cryptplug.h index 081702a7..6af3a644 100644 --- a/certmanager/lib/cryptplug.h +++ b/certmanager/lib/cryptplug.h @@ -104,7 +104,7 @@ namespace GpgME { /*! \defgroup groupConfigDir Directory Service Configuration \ingroup groupConfig - This section contains messages for configuring the + This section tqcontains messages for configuring the directory service. */ @@ -501,7 +501,7 @@ bool hasFeature( ::Feature ); <b>How to use StructuringInfo data in your program:</b> \li To compose a signed message please act as described below. - \li For constructing an encrypted message just replace the + \li For constructing an encrypted message just tqreplace the \c signMessage() call by the respective \c encryptMessage() call and then proceed exactly the same way. \li In any case make <b>sure</b> to free your \c ciphertext <b>and</b> diff --git a/certmanager/lib/cryptplugwrapper.cpp b/certmanager/lib/cryptplugwrapper.cpp index ec6d6d57..7694a138 100644 --- a/certmanager/lib/cryptplugwrapper.cpp +++ b/certmanager/lib/cryptplugwrapper.cpp @@ -424,7 +424,7 @@ CryptPlugWrapper::CryptPlugWrapper( const TQString& name, _libName( libName ), _updateURL( update ), _active( active ), - _initStatus( InitStatus_undef ), + _iniStatus( IniStatus_undef ), _cp( 0 ), _config( 0 ), _cryptoConfig( 0 ) @@ -468,9 +468,9 @@ TQString CryptPlugWrapper::libName() const TQString CryptPlugWrapper::protocol() const { - if ( _libName.contains( "smime" ) ) + if ( _libName.tqcontains( "smime" ) ) return "SMIME"; - if ( _libName.contains( "openpgp" ) ) + if ( _libName.tqcontains( "openpgp" ) ) return "OpenPGP"; return TQString::null; } @@ -485,28 +485,28 @@ TQString CryptPlugWrapper::displayName() const { if ( !_name.isEmpty() ) return _name; - if ( _libName.contains( "smime" ) ) + if ( _libName.tqcontains( "smime" ) ) return "gpgsm"; - if ( _libName.contains( "openpgp" ) ) + if ( _libName.tqcontains( "openpgp" ) ) return "gpg"; return i18n("(Unknown Protocol)"); } -bool CryptPlugWrapper::initialize( InitStatus* initStatus, TQString* errorMsg ) +bool CryptPlugWrapper::initialize( IniStatus* iniStatus, TQString* errorMsg ) { if ( _cp ) return true; - _initStatus = InitStatus_undef; + _iniStatus = IniStatus_undef; /* make sure we have a lib name */ if ( _libName.isEmpty() ) { - _initStatus = InitStatus_NoLibName; + _iniStatus = IniStatus_NoLibName; kdDebug(5150) << "No library name was given.\n" << endl; } else { - if ( _libName.contains( "smime" ) ) { + if ( _libName.tqcontains( "smime" ) ) { _cp = new SMIMECryptPlug(); _config = new Config( GPGME_PROTOCOL_CMS ); - } else if ( _libName.contains( "openpgp" ) ) { + } else if ( _libName.tqcontains( "openpgp" ) ) { _cp = new OpenPGPCryptPlug(); _config = new Config( GPGME_PROTOCOL_OpenPGP ); } else { @@ -515,12 +515,12 @@ bool CryptPlugWrapper::initialize( InitStatus* initStatus, TQString* errorMsg ) } if ( !_cp ) { - _initStatus = InitStatus_LoadError; + _iniStatus = IniStatus_LoadError; kdDebug(5150) << "Couldn't create '" << _libName.latin1() << "'" << endl; } else { /* now call the init function */ if( !_cp->initialize() ) { - _initStatus = InitStatus_InitError; + _iniStatus = IniStatus_InitError; kdDebug(5150) << "Error while executing function 'initialize' on plugin " << _libName << endl; _lastError = i18n("Error while initializing plugin \"%1\"").arg( _libName ); if ( errorMsg ) @@ -528,13 +528,13 @@ bool CryptPlugWrapper::initialize( InitStatus* initStatus, TQString* errorMsg ) delete _cp; _cp = 0; delete _config; _config = 0; } else { - _initStatus = InitStatus_Ok; + _iniStatus = IniStatus_Ok; } } } - if( initStatus ) - *initStatus = _initStatus; - return _initStatus == InitStatus_Ok; + if( iniStatus ) + *iniStatus = _iniStatus; + return _iniStatus == IniStatus_Ok; } @@ -547,11 +547,11 @@ void CryptPlugWrapper::deinitialize() } -CryptPlugWrapper::InitStatus CryptPlugWrapper::initStatus( TQString* errorMsg ) const +CryptPlugWrapper::IniStatus CryptPlugWrapper::iniStatus( TQString* errorMsg ) const { if( errorMsg ) *errorMsg = _lastError; - return _initStatus; + return _iniStatus; } diff --git a/certmanager/lib/cryptplugwrapper.h b/certmanager/lib/cryptplugwrapper.h index fca08b65..a2ddea95 100644 --- a/certmanager/lib/cryptplugwrapper.h +++ b/certmanager/lib/cryptplugwrapper.h @@ -170,7 +170,7 @@ namespace Kleo { /*! \defgroup groupConfigDir Directory Service Configuration \ingroup groupConfig - This section contains messages for configuring the + This section tqcontains messages for configuring the directory service. */ @@ -322,7 +322,7 @@ class CryptPlugWrapper; <b>How to use StructuringInfoWrapper data in your program:</b> \li To compose a signed message please act as described below. - \li For constructing an encrypted message just replace the + \li For constructing an encrypted message just tqreplace the \c signMessage() call by the respective \c encryptMessage() call and then proceed exactly the same way. \li In any case make <b>sure</b> to free your \c ciphertext when @@ -462,16 +462,16 @@ public: If initialize was not called before return value will be \c CryptPlugInit_undef. - \sa initStatus, initialize + \sa iniStatus, initialize */ typedef enum { - InitStatus_undef = 0, + IniStatus_undef = 0, - InitStatus_Ok = 1, - InitStatus_NoLibName = 2, - InitStatus_LoadError = 0x1000, - InitStatus_InitError = 0x2000 - } InitStatus; + IniStatus_Ok = 1, + IniStatus_NoLibName = 2, + IniStatus_LoadError = 0x1000, + IniStatus_InitError = 0x2000 + } IniStatus; /*! \ingroup groupSignAct \brief Flags used to compose the SigStatusFlags value. @@ -518,7 +518,7 @@ public: enum { - CertStatus_EXPIRES_NEVER = CRYPTPLUG_CERT_DOES_NEVER_EXPIRE + CerStatus_EXPIRES_NEVER = CRYPTPLUG_CERT_DOES_NEVER_EXPIRE }; @@ -543,7 +543,7 @@ public: or not. \sa ~CryptPlugWrapper, setActive, active, initialize, deinitialize - \sa initStatus + \sa iniStatus */ CryptPlugWrapper( const TQString& name=TQString::null, const TQString& libName=TQString::null, @@ -582,7 +582,7 @@ public: structures - if just prevents the normal functions from being called erroneously. When deactivated only the following functions are operational: constructor , destructor , - setActive , active, setLibName , libName , initStatus; + setActive , active, setLibName , libName , iniStatus; calling other functions will be ignored and their return values will be undefined. @@ -590,7 +590,7 @@ public: or not. \sa active, CryptPlugWrapper(), ~CryptPlugWrapper - \sa deinitialize, initialize, initStatus + \sa deinitialize, initialize, iniStatus */ void setActive( bool active ); @@ -613,7 +613,7 @@ public: This name may be set in the constructor or by calling setLibName(). \note Setting/changing the library name may only be done when - the initStatus() is <b>not</b> \c InitStatus_Ok. + the iniStatus() is <b>not</b> \c IniStatus_Ok. If you want to change the name of the library after successfully having called initialize() please make sure to unload it by calling the deinitialize() function. @@ -626,7 +626,7 @@ public: above 'note'. \sa libName, CryptPlugWrapper(), ~CryptPlugWrapper - \sa deinitialize, initialize, initStatus + \sa deinitialize, initialize, iniStatus */ bool setLibName( const TQString& libName ); @@ -666,13 +666,13 @@ private: undefined in this case, this rule does not apply to the functions \c setActive() and \c setLibName(). - \param initStatus will receive the resulting InitStatus if not NULL + \param iniStatus will receive the resulting IniStatus if not NULL \param errorMsg will receive the system error message if not NULL - \sa initStatus, deinitialize, CryptPlugWrapper(), ~CryptPlugWrapper + \sa iniStatus, deinitialize, CryptPlugWrapper(), ~CryptPlugWrapper \sa setActive, active */ - bool initialize( InitStatus* initStatus, TQString* errorMsg ); + bool initialize( IniStatus* iniStatus, TQString* errorMsg ); public: /*! \ingroup groupGeneral @@ -681,10 +681,10 @@ public: After this function has been called, no other plugin functions should be called; the behavior is undefined in this case. - \note Deinitializing sets the internal initStatus value back - to \c InitStatus_undef. + \note Deinitializing sets the internal iniStatus value back + to \c IniStatus_undef. - \sa initStatus, initialize, CryptPlugWrapper, ~CryptPlugWrapper + \sa iniStatus, initialize, CryptPlugWrapper, ~CryptPlugWrapper \sa setActive, active */ void deinitialize(); @@ -693,7 +693,7 @@ public: \brief Returns this CRYPTPLUG wrapper's initialization state. \param errorMsg receives the last system error message, this value - should be ignored if InitStatus value equals \c InitStatus_Ok. + should be ignored if IniStatus value equals \c IniStatus_Ok. \return whether the relative library was loaded and initialized correctly @@ -701,7 +701,7 @@ public: \sa initialize, deinitialize, CryptPlugWrapper(), ~CryptPlugWrapper \sa setActive, active */ - InitStatus initStatus( TQString* errorMsg ) const; + IniStatus iniStatus( TQString* errorMsg ) const; /*! \ingroup groupGeneral @@ -714,7 +714,7 @@ public: however. \note In case this function cannot be executed the system's error - message may be retrieved by calling initStatus( TQString* ). + message may be retrieved by calling iniStatus( TQString* ). \return whether the relative feature is implemented or not */ @@ -824,7 +824,7 @@ private: TQString _libName; TQString _updateURL; bool _active; - InitStatus _initStatus; + IniStatus _iniStatus; TQString _lastError; CryptPlug* _cp; // local parameters without representation in cryptplug.h diff --git a/certmanager/lib/kleo/cryptobackendfactory.cpp b/certmanager/lib/kleo/cryptobackendfactory.cpp index 88ba036d..9b56e89b 100644 --- a/certmanager/lib/kleo/cryptobackendfactory.cpp +++ b/certmanager/lib/kleo/cryptobackendfactory.cpp @@ -66,7 +66,7 @@ static const char * availableProtocols[] = { static const unsigned int numAvailableProtocols = sizeof availableProtocols / sizeof *availableProtocols; Kleo::CryptoBackendFactory::CryptoBackendFactory() - : TQObject( qApp, "CryptoBackendFactory::instance()" ), + : TQObject( tqApp, "CryptoBackendFactory::instance()" ), mConfigObject( 0 ), mAvailableProtocols( availableProtocols, availableProtocols + numAvailableProtocols ) { diff --git a/certmanager/lib/kleo/dn.cpp b/certmanager/lib/kleo/dn.cpp index 61693aff..a9333ebb 100644 --- a/certmanager/lib/kleo/dn.cpp +++ b/certmanager/lib/kleo/dn.cpp @@ -272,7 +272,7 @@ static TQString dn_escape( const TQString & s ) { TQString result; for ( unsigned int i = 0, end = s.length() ; i != end ; ++i ) { const TQChar ch = s[i]; - switch ( ch.unicode() ) { + switch ( ch.tqunicode() ) { case ',': case '+': case '"': diff --git a/certmanager/lib/kleo/downloadjob.h b/certmanager/lib/kleo/downloadjob.h index bac195d9..45a4bf9c 100644 --- a/certmanager/lib/kleo/downloadjob.h +++ b/certmanager/lib/kleo/downloadjob.h @@ -68,7 +68,7 @@ namespace Kleo { /** Starts the download operation. \a fingerprints is a list of fingerprints used to specify the list of keys downloaded. Empty - patterns are ignored. If \a fingerprints is empty, contains + patterns are ignored. If \a fingerprints is empty, tqcontains only empty strings or anything other than fingerprints, the result is undefined. */ diff --git a/certmanager/lib/kleo/exportjob.h b/certmanager/lib/kleo/exportjob.h index 363006e6..193ea863 100644 --- a/certmanager/lib/kleo/exportjob.h +++ b/certmanager/lib/kleo/exportjob.h @@ -68,7 +68,7 @@ namespace Kleo { /** Starts the export operation. \a patterns is a list of patterns used to restrict the list of keys exported. Empty patterns are - ignored. If \a patterns is empty or contains only empty + ignored. If \a patterns is empty or tqcontains only empty strings, all available keys are exported. */ virtual GpgME::Error start( const TQStringList & patterns ) = 0; diff --git a/certmanager/lib/kleo/hierarchicalkeylistjob.cpp b/certmanager/lib/kleo/hierarchicalkeylistjob.cpp index c9a9ffce..4d33761f 100644 --- a/certmanager/lib/kleo/hierarchicalkeylistjob.cpp +++ b/certmanager/lib/kleo/hierarchicalkeylistjob.cpp @@ -75,7 +75,7 @@ Kleo::HierarchicalKeyListJob::~HierarchicalKeyListJob() { GpgME::Error Kleo::HierarchicalKeyListJob::start( const TQStringList & patterns, bool secretOnly ) { if ( secretOnly || patterns.empty() ) return gpg_err_make( GPG_ERR_SOURCE_GPGME, GPG_ERR_UNSUPPORTED_OPERATION ); - qCopy( patterns.begin(), patterns.end(), + tqCopy( patterns.begin(), patterns.end(), std::inserter( mNextSet, mNextSet.begin() ) ); const GpgME::Error err = startAJob(); if ( err ) diff --git a/certmanager/lib/kleo/importjob.h b/certmanager/lib/kleo/importjob.h index 9c446457..275c9b6c 100644 --- a/certmanager/lib/kleo/importjob.h +++ b/certmanager/lib/kleo/importjob.h @@ -67,7 +67,7 @@ namespace Kleo { ~ImportJob(); /** - Starts the importing operation. \a keyData contains the data to + Starts the importing operation. \a keyData tqcontains the data to import from. */ virtual GpgME::Error start( const TQByteArray & keyData ) = 0; diff --git a/certmanager/lib/kleo/job.cpp b/certmanager/lib/kleo/job.cpp index dedbebfc..ac5dbac2 100644 --- a/certmanager/lib/kleo/job.cpp +++ b/certmanager/lib/kleo/job.cpp @@ -62,8 +62,8 @@ Kleo::Job::Job( TQObject * parent, const char * name ) : TQObject( parent, name ) { - if ( qApp ) - connect( qApp, TQT_SIGNAL(aboutToQuit()), TQT_SLOT(slotCancel()) ); + if ( tqApp ) + connect( tqApp, TQT_SIGNAL(aboutToQuit()), TQT_SLOT(slotCancel()) ); } Kleo::Job::~Job() { diff --git a/certmanager/lib/kleo/keyfiltermanager.cpp b/certmanager/lib/kleo/keyfiltermanager.cpp index 53493ab8..51caf5d2 100644 --- a/certmanager/lib/kleo/keyfiltermanager.cpp +++ b/certmanager/lib/kleo/keyfiltermanager.cpp @@ -72,8 +72,8 @@ Kleo::KeyFilterManager::KeyFilterManager( TQObject * parent, const char * name ) mSelf = this; d = new Private(); // ### DF: doesn't a KStaticDeleter work more reliably? - if ( qApp ) - connect( qApp, TQT_SIGNAL(aboutToQuit()), TQT_SLOT(deleteLater()) ); + if ( tqApp ) + connect( tqApp, TQT_SIGNAL(aboutToQuit()), TQT_SLOT(deleteLater()) ); reload(); } diff --git a/certmanager/lib/kleo/keylistjob.h b/certmanager/lib/kleo/keylistjob.h index ed657184..667ddadc 100644 --- a/certmanager/lib/kleo/keylistjob.h +++ b/certmanager/lib/kleo/keylistjob.h @@ -73,7 +73,7 @@ namespace Kleo { /** Starts the keylist operation. \a pattern is a list of patterns used to restrict the list of keys returned. Empty patterns are - ignored. If \a pattern is empty or contains only empty strings, + ignored. If \a pattern is empty or tqcontains only empty strings, all keys are returned (however, the backend is free to truncate the result and should do so; when this happens, it will be reported by the reult object). diff --git a/certmanager/lib/kleo/refreshkeysjob.h b/certmanager/lib/kleo/refreshkeysjob.h index 29467a1c..6249116d 100644 --- a/certmanager/lib/kleo/refreshkeysjob.h +++ b/certmanager/lib/kleo/refreshkeysjob.h @@ -70,7 +70,7 @@ namespace Kleo { /** Starts the keylist operation. \a pattern is a list of patterns used to restrict the list of keys returned. Empty patterns are - ignored. If \a pattern is empty or contains only empty strings, + ignored. If \a pattern is empty or tqcontains only empty strings, all keys are returned (however, the backend is free to truncate the result and should do so; when this happens, it will be reported by the reult object). diff --git a/certmanager/lib/kleo/verifydetachedjob.h b/certmanager/lib/kleo/verifydetachedjob.h index 58ff6473..c88c3461 100644 --- a/certmanager/lib/kleo/verifydetachedjob.h +++ b/certmanager/lib/kleo/verifydetachedjob.h @@ -67,8 +67,8 @@ namespace Kleo { ~VerifyDetachedJob(); /** - Starts the verification operation. \a signature contains the - signature data, while \a signedData contains the data over + Starts the verification operation. \a signature tqcontains the + signature data, while \a signedData tqcontains the data over which the signature was made. */ virtual GpgME::Error start( const TQByteArray & signature, diff --git a/certmanager/lib/kleo/verifyopaquejob.h b/certmanager/lib/kleo/verifyopaquejob.h index 58c452b7..ba7f40d8 100644 --- a/certmanager/lib/kleo/verifyopaquejob.h +++ b/certmanager/lib/kleo/verifyopaquejob.h @@ -67,8 +67,8 @@ namespace Kleo { ~VerifyOpaqueJob(); /** - Starts the verification operation. \a signature contains the - signature data, while \a signedData contains the data over + Starts the verification operation. \a signature tqcontains the + signature data, while \a signedData tqcontains the data over which the signature was made. */ virtual GpgME::Error start( const TQByteArray & signedData ) = 0; diff --git a/certmanager/lib/tests/gnupgviewer.h b/certmanager/lib/tests/gnupgviewer.h index 059d1f76..bd6af17e 100644 --- a/certmanager/lib/tests/gnupgviewer.h +++ b/certmanager/lib/tests/gnupgviewer.h @@ -53,12 +53,12 @@ public: private slots: void slotStdout( KProcess *, char *, int ); void slotStderr( KProcess *, char *, int ); - void slotStatus( Kleo::GnuPGProcessBase *, const TQString &, const TQStringList & ); + void sloStatus( Kleo::GnuPGProcessBase *, const TQString &, const TQStringList & ); void slotProcessExited( KProcess * ); private: Kleo::GnuPGProcessBase * mProcess; - TQString mLastStdout, mLastStderr, mLastStatus; + TQString mLastStdout, mLastStderr, mLasStatus; }; #endif // __KLEO_TESTS_GNUPGVIEWER_H__ diff --git a/certmanager/lib/tests/test_cryptoconfig.cpp b/certmanager/lib/tests/test_cryptoconfig.cpp index 4aadb7ff..96467483 100644 --- a/certmanager/lib/tests/test_cryptoconfig.cpp +++ b/certmanager/lib/tests/test_cryptoconfig.cpp @@ -312,7 +312,7 @@ int main( int argc, char** argv ) { // Test with query containing a litteral ':' (KURL supports this) // and a ' ' (KURL will escape it, see issue119) lst << KURL( "ldap://foo:389/?a:b c" ); - lst << KURL( "ldap://server:389/?a%3db,c=DE" ); // the query contains a litteral ',' + lst << KURL( "ldap://server:389/?a%3db,c=DE" ); // the query tqcontains a litteral ',' //cout << " trying to set: " << lst.toStringList().join(", ").local8Bit() << endl; assert( lst[0].query() == "?b" ); assert( lst[1].query() == "?a:b%20c" ); // see, the space got escaped diff --git a/certmanager/lib/tests/test_gnupgprocessbase.cpp b/certmanager/lib/tests/test_gnupgprocessbase.cpp index 29ca483f..daccda6d 100644 --- a/certmanager/lib/tests/test_gnupgprocessbase.cpp +++ b/certmanager/lib/tests/test_gnupgprocessbase.cpp @@ -69,7 +69,7 @@ void GnuPGViewer::setProcess( Kleo::GnuPGProcessBase * process ) { connect( mProcess, TQT_SIGNAL(receivedStderr(KProcess*,char*,int)), TQT_SLOT(slotStderr(KProcess*,char*,int)) ); connect( mProcess, TQT_SIGNAL(status(Kleo::GnuPGProcessBase*,const TQString&,const TQStringList&)), - TQT_SLOT(slotStatus(Kleo::GnuPGProcessBase*,const TQString&,const TQStringList&)) ); + TQT_SLOT(sloStatus(Kleo::GnuPGProcessBase*,const TQString&,const TQStringList&)) ); } static TQStringList split( char * buffer, int buflen, TQString & old ) { @@ -88,7 +88,7 @@ static TQStringList split( char * buffer, int buflen, TQString & old ) { } static TQString escape( TQString str ) { - return str.replace( '&', "&" ).replace( '<', "<" ).replace( '>', ">" ); + return str.tqreplace( '&', "&" ).tqreplace( '<', "<" ).tqreplace( '>', ">" ); } void GnuPGViewer::slotStdout( KProcess *, char * buffer, int buflen ) { @@ -102,14 +102,14 @@ void GnuPGViewer::slotStderr( KProcess *, char * buffer, int buflen ) { for ( TQStringList::const_iterator it = l.begin() ; it != l.end() ; ++it ) append( "<b>stderr: " + escape( *it ) + "</b>" ); } -void GnuPGViewer::slotStatus( Kleo::GnuPGProcessBase *, const TQString & type, const TQStringList & args ) { +void GnuPGViewer::sloStatus( Kleo::GnuPGProcessBase *, const TQString & type, const TQStringList & args ) { append( "<b><font color=\"red\">status: " + escape( type + ' ' + args.join( " " ) ) + "</font></b>" ); } void GnuPGViewer::slotProcessExited( KProcess * proc ) { if ( !proc ) return; if ( proc->normalExit() ) - append( TQString( "<b>Process exit: return code %1</b>" ).arg ( proc->exitStatus() ) ); + append( TQString( "<b>Process exit: return code %1</b>" ).arg ( proc->exiStatus() ) ); else append( "<b>Process exit: killed</b>" ); } diff --git a/certmanager/lib/ui/adddirectoryservicedialog.ui b/certmanager/lib/ui/adddirectoryservicedialog.ui index 98e17188..f15d2d20 100644 --- a/certmanager/lib/ui/adddirectoryservicedialog.ui +++ b/certmanager/lib/ui/adddirectoryservicedialog.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>AddDirectoryServiceDialog</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -75,7 +75,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>60</height> @@ -136,7 +136,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>260</width> <height>21</height> @@ -203,5 +203,5 @@ <tabstop>PushButton3</tabstop> <tabstop>PushButton4</tabstop> </tabstops> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/certmanager/lib/ui/backendconfigwidget.cpp b/certmanager/lib/ui/backendconfigwidget.cpp index 2871b920..720525a1 100644 --- a/certmanager/lib/ui/backendconfigwidget.cpp +++ b/certmanager/lib/ui/backendconfigwidget.cpp @@ -88,7 +88,7 @@ public: /// deselect all except one for a given protocol type (radiobutton-like exclusivity) void deselectAll( const char * protocol, TQCheckListItem* except ); - void emitChanged() { static_cast<BackendConfigWidget *>( parentWidget() )->emitChanged( true ); } + void emitChanged() { static_cast<BackendConfigWidget *>( tqparentWidget() )->emitChanged( true ); } }; // Toplevel listviewitem for a given backend (e.g. "GpgME", "Kgpg/gpg v2") @@ -144,7 +144,7 @@ private: // First one is the generic name (find a nice one for OpenPGP, SMIME) const TQString protoName = qstricmp( protocolName, "openpgp" ) != 0 ? qstricmp( protocolName, "smime" ) != 0 - ? TQString::fromLatin1( protocolName ) + ? TQString::tqfromLatin1( protocolName ) : i18n( "S/MIME" ) : i18n( "OpenPGP" ); // second one is implementation name (gpg, gpgsm...) diff --git a/certmanager/lib/ui/cryptoconfigmodule.cpp b/certmanager/lib/ui/cryptoconfigmodule.cpp index 5b14d7c4..3bed433e 100644 --- a/certmanager/lib/ui/cryptoconfigmodule.cpp +++ b/certmanager/lib/ui/cryptoconfigmodule.cpp @@ -59,7 +59,7 @@ using namespace Kleo; static inline TQPixmap loadIcon( TQString s ) { return KGlobal::instance()->iconLoader() - ->loadIcon( s.replace( TQRegExp( "[^a-zA-Z0-9_]" ), "_" ), KIcon::NoGroup, KIcon::SizeMedium ); + ->loadIcon( s.tqreplace( TQRegExp( "[^a-zA-Z0-9_]" ), "_" ), KIcon::NoGroup, KIcon::SizeMedium ); } static unsigned int num_components_with_options( const Kleo::CryptoConfig * config ) { @@ -122,10 +122,10 @@ Kleo::CryptoConfigModule::CryptoConfigModule( Kleo::CryptoConfig* config, TQWidg dialogHeight = 500; else // small (800x600, 640x480) desktop dialogHeight = 400; - TQSize sz = scrollView->sizeHint(); + TQSize sz = scrollView->tqsizeHint(); scrollView->setMinimumSize( sz.width() - + scrollView->style().pixelMetric(TQStyle::PM_ScrollBarExtent), - QMIN( compGUI->sizeHint().height(), dialogHeight ) ); + + scrollView->style().tqpixelMetric(TQStyle::PM_ScrollBarExtent), + QMIN( compGUI->tqsizeHint().height(), dialogHeight ) ); } if ( mComponentGUIs.empty() ) { Q_ASSERT( face() == Plain ); @@ -136,7 +136,7 @@ Kleo::CryptoConfigModule::CryptoConfigModule( Kleo::CryptoConfig* config, TQWidg "information.") .arg( components.empty() ? "gpgconf --list-components" : "gpgconf --list-options gpg" ); TQLabel * label = new TQLabel( msg, vbox ); - label->setAlignment( TQt::WordBreak ); + label->tqsetAlignment( TQt::WordBreak ); label->setMinimumHeight( fontMetrics().lineSpacing() * 5 ); } } @@ -633,7 +633,7 @@ void Kleo::CryptoConfigEntryLDAPURL::slotOpenDialog() { // I'm a bad boy and I do it all on the stack. Enough classes already :) // This is just a simple dialog around the directory-services-widget - KDialogBase dialog( mPushButton->parentWidget(), 0, true /*modal*/, + KDialogBase dialog( mPushButton->tqparentWidget(), 0, true /*modal*/, i18n( "Configure LDAP Servers" ), KDialogBase::Default|KDialogBase::Cancel|KDialogBase::Ok, KDialogBase::Ok, true /*separator*/ ); diff --git a/certmanager/lib/ui/cryptoconfigmodule_p.h b/certmanager/lib/ui/cryptoconfigmodule_p.h index 8bc52f21..cce1afea 100644 --- a/certmanager/lib/ui/cryptoconfigmodule_p.h +++ b/certmanager/lib/ui/cryptoconfigmodule_p.h @@ -80,7 +80,7 @@ namespace Kleo { public: CryptoConfigGroupGUI( CryptoConfigModule* module, Kleo::CryptoConfigGroup* group, - TQGridLayout * layout, TQWidget* parent, const char* name = 0 ); + TQGridLayout * tqlayout, TQWidget* parent, const char* name = 0 ); bool save(); void load(); @@ -100,7 +100,7 @@ namespace Kleo { static CryptoConfigEntryGUI* createEntryGUI( CryptoConfigModule* module, Kleo::CryptoConfigEntry* entry, const TQString& entryName, - TQGridLayout * layout, TQWidget* widget, const char* name = 0 ); + TQGridLayout * tqlayout, TQWidget* widget, const char* name = 0 ); }; /** @@ -150,7 +150,7 @@ namespace Kleo { CryptoConfigEntryLineEdit( CryptoConfigModule* module, Kleo::CryptoConfigEntry* entry, const TQString& entryName, - TQGridLayout * layout, + TQGridLayout * tqlayout, TQWidget* parent, const char* name = 0 ); virtual void doSave(); @@ -169,7 +169,7 @@ namespace Kleo { CryptoConfigEntryPath( CryptoConfigModule* module, Kleo::CryptoConfigEntry* entry, const TQString& entryName, - TQGridLayout * layout, + TQGridLayout * tqlayout, TQWidget* parent, const char* name = 0 ); virtual void doSave(); @@ -188,7 +188,7 @@ namespace Kleo { CryptoConfigEntryDirPath( CryptoConfigModule* module, Kleo::CryptoConfigEntry* entry, const TQString& entryName, - TQGridLayout * layout, + TQGridLayout * tqlayout, TQWidget* parent, const char* name = 0 ); virtual void doSave(); @@ -207,7 +207,7 @@ namespace Kleo { CryptoConfigEntryURL( CryptoConfigModule* module, Kleo::CryptoConfigEntry* entry, const TQString& entryName, - TQGridLayout * layout, + TQGridLayout * tqlayout, TQWidget* parent, const char* name = 0 ); virtual void doSave(); @@ -226,7 +226,7 @@ namespace Kleo { CryptoConfigEntrySpinBox( CryptoConfigModule* module, Kleo::CryptoConfigEntry* entry, const TQString& entryName, - TQGridLayout * layout, + TQGridLayout * tqlayout, TQWidget* parent, const char* name = 0 ); virtual void doSave(); virtual void doLoad(); @@ -245,7 +245,7 @@ namespace Kleo { CryptoConfigEntryCheckBox( CryptoConfigModule* module, Kleo::CryptoConfigEntry* entry, const TQString& entryName, - TQGridLayout * layout, + TQGridLayout * tqlayout, TQWidget* parent, const char* name = 0 ); virtual void doSave(); virtual void doLoad(); @@ -263,7 +263,7 @@ namespace Kleo { CryptoConfigEntryLDAPURL( CryptoConfigModule* module, Kleo::CryptoConfigEntry* entry, const TQString& entryName, - TQGridLayout * layout, + TQGridLayout * tqlayout, TQWidget* parent, const char* name = 0 ); virtual void doSave(); virtual void doLoad(); diff --git a/certmanager/lib/ui/directoryserviceswidget.cpp b/certmanager/lib/ui/directoryserviceswidget.cpp index 0b9dd91f..3f99ddb9 100644 --- a/certmanager/lib/ui/directoryserviceswidget.cpp +++ b/certmanager/lib/ui/directoryserviceswidget.cpp @@ -63,7 +63,7 @@ public: void setPassword( const TQString& pass ) { mPassword = pass; - setText( 4, pass.isEmpty() ? TQString::null : TQString::fromLatin1( "******" ) ); + setText( 4, pass.isEmpty() ? TQString::null : TQString::tqfromLatin1( "******" ) ); } const TQString& password() const { return mPassword; } diff --git a/certmanager/lib/ui/directoryserviceswidgetbase.ui b/certmanager/lib/ui/directoryserviceswidgetbase.ui index 1dabbca5..c2c22501 100644 --- a/certmanager/lib/ui/directoryserviceswidgetbase.ui +++ b/certmanager/lib/ui/directoryserviceswidgetbase.ui @@ -4,7 +4,7 @@ <property name="name"> <cstring>DirectoryServicesWidgetBase</cstring> </property> - <property name="geometry"> + <property name="tqgeometry"> <rect> <x>0</x> <y>0</y> @@ -44,7 +44,7 @@ </widget> <widget class="QLayoutWidget"> <property name="name"> - <cstring>layout2</cstring> + <cstring>tqlayout2</cstring> </property> <hbox> <property name="name"> @@ -126,7 +126,7 @@ If you do not use a directory service, you can still use local certificates. </widget> <widget class="QLayoutWidget"> <property name="name"> - <cstring>layout1</cstring> + <cstring>tqlayout1</cstring> </property> <vbox> <property name="name"> @@ -158,7 +158,7 @@ If you do not use a directory service, you can still use local certificates. <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>51</height> @@ -171,7 +171,7 @@ If you do not use a directory service, you can still use local certificates. </widget> <widget class="QLayoutWidget"> <property name="name"> - <cstring>layout3</cstring> + <cstring>tqlayout3</cstring> </property> <hbox> <property name="name"> @@ -187,7 +187,7 @@ If you do not use a directory service, you can still use local certificates. <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>47</width> <height>20</height> @@ -221,7 +221,7 @@ By clicking this button, you can select a new directory service to be used for r <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>47</width> <height>20</height> @@ -258,7 +258,7 @@ By clicking this button, you can remove the currently selected directory service <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>47</width> <height>20</height> @@ -277,7 +277,7 @@ By clicking this button, you can remove the currently selected directory service <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>16</height> @@ -338,5 +338,5 @@ By clicking this button, you can remove the currently selected directory service <slot access="protected">slotMoveUp()</slot> <slot access="protected">slotMoveDown()</slot> </slots> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/certmanager/lib/ui/dnattributeorderconfigwidget.cpp b/certmanager/lib/ui/dnattributeorderconfigwidget.cpp index 4c718406..8f2bc6ec 100644 --- a/certmanager/lib/ui/dnattributeorderconfigwidget.cpp +++ b/certmanager/lib/ui/dnattributeorderconfigwidget.cpp @@ -115,7 +115,7 @@ Kleo::DNAttributeOrderConfigWidget::DNAttributeOrderConfigWidget( DNAttributeMap // the up/down/left/right arrow cross: TQGridLayout * xlay = new TQGridLayout( 5, 3, 0, "xlay" ); - xlay->setAlignment( AlignCenter ); + xlay->tqsetAlignment( AlignCenter ); static const struct { const char * icon; diff --git a/certmanager/lib/ui/kdhorizontalline.cpp b/certmanager/lib/ui/kdhorizontalline.cpp index 7ccddb5d..bb9432a9 100644 --- a/certmanager/lib/ui/kdhorizontalline.cpp +++ b/certmanager/lib/ui/kdhorizontalline.cpp @@ -97,7 +97,7 @@ void KDHorizontalLine::calculateFrame() { qDebug( "mLenVisible = %d (of %d)", mLenVisible, mTitle.length() ); if ( mLenVisible ) { // but do we also have a visible label? TQRect r = rect(); - const int va = style().styleHint( TQStyle::SH_GroupBox_TextLabelVerticalAlignment, this ); + const int va = style().tqstyleHint( TQStyle::SH_GroupBox_TextLabelVerticalAlignment, this ); if( va & AlignVCenter ) r.setTop( fm.height() / 2 ); // frame rect should be else if( va & AlignTop ) @@ -115,15 +115,15 @@ TQSizePolicy KDHorizontalLine::sizePolicy() const { return TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Fixed ); } -TQSize KDHorizontalLine::sizeHint() const { - return minimumSizeHint(); +TQSize KDHorizontalLine::tqsizeHint() const { + return tqminimumSizeHint(); } -TQSize KDHorizontalLine::minimumSizeHint() const { +TQSize KDHorizontalLine::tqminimumSizeHint() const { const int w = fontMetrics().width( mTitle, mLenVisible ) + fontMetrics().width( TQChar( ' ' ) ); const int h = fontMetrics().height(); - return TQSize( QMAX( w, indentHint() ), h ).expandedTo( qApp->globalStrut() ); + return TQSize( QMAX( w, indentHint() ), h ).expandedTo( tqApp->globalStrut() ); } void KDHorizontalLine::paintEvent( TQPaintEvent * e ) { @@ -134,11 +134,11 @@ void KDHorizontalLine::paintEvent( TQPaintEvent * e ) { const int h = fm.height(); const int tw = fm.width( mTitle, mLenVisible ) + fm.width(TQChar(' ')); int x; - if ( mAlign & AlignHCenter ) // center alignment + if ( mAlign & AlignHCenter ) // center tqalignment x = frameRect().width()/2 - tw/2; - else if ( mAlign & AlignRight ) // right alignment + else if ( mAlign & AlignRight ) // right tqalignment x = frameRect().width() - tw; - else if ( mAlign & AlignLeft ) // left alignment + else if ( mAlign & AlignLeft ) // left tqalignment x = 0; else { // auto align if( TQApplication::reverseLayout() ) @@ -147,15 +147,15 @@ void KDHorizontalLine::paintEvent( TQPaintEvent * e ) { x = 0; } TQRect r( x, 0, tw, h ); - int va = style().styleHint( TQStyle::SH_GroupBox_TextLabelVerticalAlignment, this ); + int va = style().tqstyleHint( TQStyle::SH_GroupBox_TextLabelVerticalAlignment, this ); if ( va & AlignTop ) r.moveBy( 0, fm.descent() ); - const TQColor pen( (QRgb) style().styleHint( TQStyle::SH_GroupBox_TextLabelColor, this ) ); + const TQColor pen( (QRgb) style().tqstyleHint( TQStyle::SH_GroupBox_TextLabelColor, this ) ); #if QT_VERSION >= 0x030300 - if ( !style().styleHint( TQStyle::SH_UnderlineAccelerator, this ) ) + if ( !style().tqstyleHint( TQStyle::SH_UnderlineAccelerator, this ) ) va |= NoAccel; #endif - style().drawItem( &paint, r, ShowPrefix | AlignHCenter | va, colorGroup(), + style().drawItem( &paint, r, ShowPrefix | AlignHCenter | va, tqcolorGroup(), isEnabled(), 0, mTitle, -1, ownPalette() ? 0 : &pen ); paint.setClipRegion( e->region().subtract( r ) ); // clip everything but title } diff --git a/certmanager/lib/ui/kdhorizontalline.h b/certmanager/lib/ui/kdhorizontalline.h index 5b6d5da9..0b857bac 100644 --- a/certmanager/lib/ui/kdhorizontalline.h +++ b/certmanager/lib/ui/kdhorizontalline.h @@ -54,11 +54,11 @@ public: TQString title() const { return mTitle; } - /*! \reimp to hard-code the frame shape */ + /*! \reimp to hard-code the frame tqshape */ void setFrameStyle( int style ); - TQSize sizeHint() const; - TQSize minimumSizeHint() const; + TQSize tqsizeHint() const; + TQSize tqminimumSizeHint() const; TQSizePolicy sizePolicy() const; static int indentHint(); diff --git a/certmanager/lib/ui/keyapprovaldialog.cpp b/certmanager/lib/ui/keyapprovaldialog.cpp index d45b64a8..8c48f896 100644 --- a/certmanager/lib/ui/keyapprovaldialog.cpp +++ b/certmanager/lib/ui/keyapprovaldialog.cpp @@ -170,8 +170,8 @@ Kleo::KeyApprovalDialog::KeyApprovalDialog( const std::vector<Item> & recipients // calculate the optimal width for the dialog const int dialogWidth = marginHint() + sv->frameWidth() - + view->sizeHint().width() - + sv->verticalScrollBar()->sizeHint().width() + + view->tqsizeHint().width() + + sv->verticalScrollBar()->tqsizeHint().width() + sv->frameWidth() + marginHint() + 2; @@ -180,11 +180,11 @@ Kleo::KeyApprovalDialog::KeyApprovalDialog( const std::vector<Item> & recipients + fontMetrics().height() + spacingHint() + sv->frameWidth() - + view->sizeHint().height() - + sv->horizontalScrollBar()->sizeHint().height() + + view->tqsizeHint().height() + + sv->horizontalScrollBar()->tqsizeHint().height() + sv->frameWidth() + spacingHint() - + actionButton( KDialogBase::Cancel )->sizeHint().height() + + actionButton( KDialogBase::Cancel )->tqsizeHint().height() + marginHint() + 2; diff --git a/certmanager/lib/ui/keylistview.cpp b/certmanager/lib/ui/keylistview.cpp index fa8c9eb8..d8afcc59 100644 --- a/certmanager/lib/ui/keylistview.cpp +++ b/certmanager/lib/ui/keylistview.cpp @@ -81,8 +81,8 @@ namespace { if ( !item ) return; - const TQRect itemRect = mKeyListView->itemRect( item ); - if ( !itemRect.isValid() ) + const TQRect tqitemRect = mKeyListView->tqitemRect( item ); + if ( !tqitemRect.isValid() ) return; const int col = mKeyListView->header()->sectionAt( p.x() ); @@ -93,8 +93,8 @@ namespace { if ( !headerRect.isValid() ) return; - const TQRect cellRect( headerRect.left(), itemRect.top(), - headerRect.width(), itemRect.height() ); + const TQRect cellRect( headerRect.left(), tqitemRect.top(), + headerRect.width(), tqitemRect.height() ); TQString tipStr; if ( const Kleo::KeyListViewItem * klvi = Kleo::lvi_cast<Kleo::KeyListViewItem>( item ) ) @@ -117,7 +117,7 @@ struct Kleo::KeyListView::Private { std::map<TQCString,KeyListViewItem*> itemMap; }; -// a list of signals where we want to replace TQListViewItem with +// a list of signals where we want to tqreplace TQListViewItem with // Kleo:KeyListViewItem: static const struct { const char * source; @@ -428,7 +428,7 @@ void Kleo::KeyListViewItem::setKey( const GpgME::Key & key ) { if ( const TQPixmap * pix = cs->pixmap( key, i ) ) setPixmap( i, *pix ); } - repaint(); + tqrepaint(); } TQString Kleo::KeyListViewItem::toolTip( int col ) const { @@ -444,10 +444,10 @@ int Kleo::KeyListViewItem::compare( TQListViewItem * item, int col, bool ascendi return listView()->columnStrategy()->compare( this->key(), that->key(), col ); } -void Kleo::KeyListViewItem::paintCell( TQPainter * p, const TQColorGroup & cg, int column, int width, int alignment ) { +void Kleo::KeyListViewItem::paintCell( TQPainter * p, const TQColorGroup & cg, int column, int width, int tqalignment ) { const KeyListView::DisplayStrategy * ds = listView() ? listView()->displayStrategy() : 0 ; if ( !ds ) { - TQListViewItem::paintCell( p, cg, column, width, alignment ); + TQListViewItem::paintCell( p, cg, column, width, tqalignment ); return; } const TQColor fg = ds->keyForeground( key(), cg.text() ); @@ -459,7 +459,7 @@ void Kleo::KeyListViewItem::paintCell( TQPainter * p, const TQColorGroup & cg, i _cg.setColor( TQColorGroup::Text, fg ); _cg.setColor( TQColorGroup::Base, bg ); - TQListViewItem::paintCell( p, _cg, column, width, alignment ); + TQListViewItem::paintCell( p, _cg, column, width, tqalignment ); } void Kleo::KeyListViewItem::insertItem( TQListViewItem * qlvi ) { @@ -536,10 +536,10 @@ int Kleo::SubkeyKeyListViewItem::compare( TQListViewItem * item, int col, bool a return listView()->columnStrategy()->subkeyCompare( this->subkey(), that->subkey(), col ); } -void Kleo::SubkeyKeyListViewItem::paintCell( TQPainter * p, const TQColorGroup & cg, int column, int width, int alignment ) { +void Kleo::SubkeyKeyListViewItem::paintCell( TQPainter * p, const TQColorGroup & cg, int column, int width, int tqalignment ) { const KeyListView::DisplayStrategy * ds = listView() ? listView()->displayStrategy() : 0 ; if ( !ds ) { - TQListViewItem::paintCell( p, cg, column, width, alignment ); + TQListViewItem::paintCell( p, cg, column, width, tqalignment ); return; } const TQColor fg = ds->subkeyForeground( subkey(), cg.text() ); @@ -551,7 +551,7 @@ void Kleo::SubkeyKeyListViewItem::paintCell( TQPainter * p, const TQColorGroup & _cg.setColor( TQColorGroup::Text, fg ); _cg.setColor( TQColorGroup::Base, bg ); - TQListViewItem::paintCell( p, _cg, column, width, alignment ); + TQListViewItem::paintCell( p, _cg, column, width, tqalignment ); } @@ -615,10 +615,10 @@ int Kleo::UserIDKeyListViewItem::compare( TQListViewItem * item, int col, bool a } -void Kleo::UserIDKeyListViewItem::paintCell( TQPainter * p, const TQColorGroup & cg, int column, int width, int alignment ) { +void Kleo::UserIDKeyListViewItem::paintCell( TQPainter * p, const TQColorGroup & cg, int column, int width, int tqalignment ) { const KeyListView::DisplayStrategy * ds = listView() ? listView()->displayStrategy() : 0 ; if ( !ds ) { - TQListViewItem::paintCell( p, cg, column, width, alignment ); + TQListViewItem::paintCell( p, cg, column, width, tqalignment ); return; } const TQColor fg = ds->useridForeground( userID(), cg.text() ); @@ -630,7 +630,7 @@ void Kleo::UserIDKeyListViewItem::paintCell( TQPainter * p, const TQColorGroup & _cg.setColor( TQColorGroup::Text, fg ); _cg.setColor( TQColorGroup::Base, bg ); - TQListViewItem::paintCell( p, _cg, column, width, alignment ); + TQListViewItem::paintCell( p, _cg, column, width, tqalignment ); } @@ -693,10 +693,10 @@ int Kleo::SignatureKeyListViewItem::compare( TQListViewItem * item, int col, boo return listView()->columnStrategy()->signatureCompare( this->signature(), that->signature(), col ); } -void Kleo::SignatureKeyListViewItem::paintCell( TQPainter * p, const TQColorGroup & cg, int column, int width, int alignment ) { +void Kleo::SignatureKeyListViewItem::paintCell( TQPainter * p, const TQColorGroup & cg, int column, int width, int tqalignment ) { const KeyListView::DisplayStrategy * ds = listView() ? listView()->displayStrategy() : 0 ; if ( !ds ) { - TQListViewItem::paintCell( p, cg, column, width, alignment ); + TQListViewItem::paintCell( p, cg, column, width, tqalignment ); return; } const TQColor fg = ds->signatureForeground( signature(), cg.text() ); @@ -708,7 +708,7 @@ void Kleo::SignatureKeyListViewItem::paintCell( TQPainter * p, const TQColorGrou _cg.setColor( TQColorGroup::Text, fg ); _cg.setColor( TQColorGroup::Base, bg ); - TQListViewItem::paintCell( p, _cg, column, width, alignment ); + TQListViewItem::paintCell( p, _cg, column, width, tqalignment ); } diff --git a/certmanager/lib/ui/keylistview.h b/certmanager/lib/ui/keylistview.h index 2ade61a3..986ed267 100644 --- a/certmanager/lib/ui/keylistview.h +++ b/certmanager/lib/ui/keylistview.h @@ -45,7 +45,7 @@ class TQColor; namespace Kleo { - // work around moc parser bug... + // work around tqmoc parser bug... #define TEMPLATE_TYPENAME(T) template <typename T> TEMPLATE_TYPENAME(T) inline T * lvi_cast( TQListViewItem * item ) { @@ -91,7 +91,7 @@ namespace Kleo { /*! \reimp */ int rtti() const { return RTTI; } /*! \reimp */ - void paintCell( TQPainter * p, const TQColorGroup & cg, int column, int width, int alignment ); + void paintCell( TQPainter * p, const TQColorGroup & cg, int column, int width, int tqalignment ); /*! \reimp */ void insertItem( TQListViewItem * item ); /*! \reimp */ @@ -127,7 +127,7 @@ namespace Kleo { /*! \reimp */ int rtti() const { return RTTI; } /*! \reimp */ - void paintCell( TQPainter * p, const TQColorGroup & cg, int column, int width, int alignment ); + void paintCell( TQPainter * p, const TQColorGroup & cg, int column, int width, int tqalignment ); private: GpgME::Subkey mSubkey; @@ -159,7 +159,7 @@ namespace Kleo { /*! \reimp */ int rtti() const { return RTTI; } /*! \reimp */ - void paintCell( TQPainter * p, const TQColorGroup & cg, int column, int width, int alignment ); + void paintCell( TQPainter * p, const TQColorGroup & cg, int column, int width, int tqalignment ); private: GpgME::UserID mUserID; @@ -191,7 +191,7 @@ namespace Kleo { /*! \reimp */ int rtti() const { return RTTI; } /*! \reimp */ - void paintCell( TQPainter * p, const TQColorGroup & cg, int column, int width, int alignment ); + void paintCell( TQPainter * p, const TQColorGroup & cg, int column, int width, int tqalignment ); private: GpgME::UserID::Signature mSignature; diff --git a/certmanager/lib/ui/keyrequester.cpp b/certmanager/lib/ui/keyrequester.cpp index 3a883dea..27d9d873 100644 --- a/certmanager/lib/ui/keyrequester.cpp +++ b/certmanager/lib/ui/keyrequester.cpp @@ -117,7 +117,7 @@ void Kleo::KeyRequester::init() // the button to unset any key: mEraseButton = new KPushButton( this ); mEraseButton->setAutoDefault( false ); - mEraseButton->setSizePolicy( TQSizePolicy( TQSizePolicy::Minimum, + mEraseButton->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Minimum ) ); mEraseButton->setIconSet( SmallIconSet( TQApplication::reverseLayout() ? "locationbar_erase" : "clear_left" ) ); TQToolTip::add( mEraseButton, i18n("Clear") ); @@ -133,7 +133,7 @@ void Kleo::KeyRequester::init() connect( mEraseButton, TQT_SIGNAL(clicked()), TQT_SLOT(slotEraseButtonClicked()) ); connect( mDialogButton, TQT_SIGNAL(clicked()), TQT_SLOT(slotDialogButtonClicked()) ); - setSizePolicy( TQSizePolicy( TQSizePolicy::MinimumExpanding, + tqsetSizePolicy( TQSizePolicy( TQSizePolicy::MinimumExpanding, TQSizePolicy::Fixed ) ); setAllowedKeys( mKeyUsage ); diff --git a/certmanager/lib/ui/keyselectiondialog.cpp b/certmanager/lib/ui/keyselectiondialog.cpp index fc590d49..1ff68570 100644 --- a/certmanager/lib/ui/keyselectiondialog.cpp +++ b/certmanager/lib/ui/keyselectiondialog.cpp @@ -250,7 +250,7 @@ namespace { "Fingerprint: %4" ) .arg( uid ? TQString::fromUtf8( uid ) : i18n("unknown"), creation, expiry, - fpr ? TQString::fromLatin1( fpr ) : i18n("unknown") ); + fpr ? TQString::tqfromLatin1( fpr ) : i18n("unknown") ); else return i18n( "S/MIME key for %1\n" "Created: %2\n" @@ -259,7 +259,7 @@ namespace { "Issuer: %5" ) .arg( uid ? Kleo::DN( uid ).prettyDN() : i18n("unknown"), creation, expiry, - fpr ? TQString::fromLatin1( fpr ) : i18n("unknown") ) + fpr ? TQString::tqfromLatin1( fpr ) : i18n("unknown") ) .arg( issuer ? Kleo::DN( issuer ).prettyDN() : i18n("unknown") ); } @@ -374,11 +374,11 @@ void Kleo::KeySelectionDialog::init( bool rememberChoice, bool extendedSelection KActiveLabel *textLabel = new KActiveLabel( text, page ); disconnect( textLabel, TQT_SIGNAL(linkClicked(const TQString&)), textLabel, TQT_SLOT(openLink(const TQString&)) ); connect( textLabel, TQT_SIGNAL(linkClicked(const TQString&)), TQT_SLOT(slotStartCertificateManager(const TQString&)) ); - textLabel->setAlignment( textLabel->alignment() | TQt::WordBreak ); + textLabel->tqsetAlignment( textLabel->tqalignment() | TQt::WordBreak ); mTopLayout->addWidget( textLabel ); } else { KActiveLabel *textLabel = new KActiveLabel( text, page ); - textLabel->setAlignment( textLabel->alignment() | TQt::WordBreak ); + textLabel->tqsetAlignment( textLabel->tqalignment() | TQt::WordBreak ); mTopLayout->addWidget( textLabel ); } } diff --git a/certmanager/lib/ui/messagebox.cpp b/certmanager/lib/ui/messagebox.cpp index e05a21b9..c209ff67 100644 --- a/certmanager/lib/ui/messagebox.cpp +++ b/certmanager/lib/ui/messagebox.cpp @@ -99,7 +99,7 @@ public: kdDebug() << "setAuditLog: rect = " << rect << endl; if ( !rect.isValid() ) return; - TQSize maxSize = qApp->desktop()->screenGeometry( this ).size() * 2 / 3 ; + TQSize maxSize = tqApp->desktop()->screenGeometry( this ).size() * 2 / 3 ; if ( !maxSize.isValid() ) maxSize = TQSize( 640, 480 ); m_textEdit->setMinimumSize( rect.size().boundedTo( maxSize ) ); diff --git a/certmanager/lib/ui/progressdialog.cpp b/certmanager/lib/ui/progressdialog.cpp index 1418bb65..58f196d1 100644 --- a/certmanager/lib/ui/progressdialog.cpp +++ b/certmanager/lib/ui/progressdialog.cpp @@ -48,7 +48,7 @@ Kleo::ProgressDialog::ProgressDialog( Job * job, const TQString & baseText, : TQProgressDialog( creator, name, false, f ), mBaseText( baseText ) { assert( job ); - setBar( new ProgressBar( this, "replacement progressbar in Kleo::ProgressDialog" ) ); + setBar( new ProgressBar( this, "tqreplacement progressbar in Kleo::ProgressDialog" ) ); setMinimumDuration( 2000 /*ms*/ ); setAutoReset( false ); |