diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-16 09:59:50 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-16 09:59:50 -0600 |
| commit | 9cc13dcbb01a96c9e60a07ca63c61d24b374f50d (patch) | |
| tree | ab537a329b9613e11dce8195761f93ffe82aed24 /certmanager/lib/cryptplugwrapper.cpp | |
| parent | 3ca10fd9a2dc631429d3b5d5c5e42a7d211d5a12 (diff) | |
| download | tdepim-9cc13dcbb01a96c9e60a07ca63c61d24b374f50d.tar.gz tdepim-9cc13dcbb01a96c9e60a07ca63c61d24b374f50d.zip | |
Revert "Rename a number of old tq methods that are no longer tq specific"
This reverts commit 3ca10fd9a2dc631429d3b5d5c5e42a7d211d5a12.
Diffstat (limited to 'certmanager/lib/cryptplugwrapper.cpp')
| -rw-r--r-- | certmanager/lib/cryptplugwrapper.cpp | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/certmanager/lib/cryptplugwrapper.cpp b/certmanager/lib/cryptplugwrapper.cpp index 6f07c954b..4ffc59c91 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 ), - _iniStatus( IniStatus_undef ), + _initqStatus( IniStatus_undef ), _cp( 0 ), _config( 0 ), _cryptoConfig( 0 ) @@ -492,15 +492,15 @@ TQString CryptPlugWrapper::displayName() const return i18n("(Unknown Protocol)"); } -bool CryptPlugWrapper::initialize( IniStatus* iniStatus, TQString* errorMsg ) +bool CryptPlugWrapper::initialize( InitqStatus* initqStatus, TQString* errorMsg ) { if ( _cp ) return true; - _iniStatus = IniStatus_undef; + _initqStatus = IniStatus_undef; /* make sure we have a lib name */ if ( _libName.isEmpty() ) { - _iniStatus = IniStatus_NoLibName; + _initqStatus = IniStatus_NoLibName; kdDebug(5150) << "No library name was given.\n" << endl; } else { if ( _libName.contains( "smime" ) ) { @@ -515,26 +515,26 @@ bool CryptPlugWrapper::initialize( IniStatus* iniStatus, TQString* errorMsg ) } if ( !_cp ) { - _iniStatus = IniStatus_LoadError; + _initqStatus = IniStatus_LoadError; kdDebug(5150) << "Couldn't create '" << _libName.latin1() << "'" << endl; } else { /* now call the init function */ if( !_cp->initialize() ) { - _iniStatus = IniStatus_InitError; + _initqStatus = IniStatus_InitError; kdDebug(5150) << "Error while executing function 'initialize' on plugin " << _libName << endl; - _lastError = i18n("Error while initializing plugin \"%1\"").arg( _libName ); + _lastError = i18n("Error while initializing plugin \"%1\"").tqarg( _libName ); if ( errorMsg ) *errorMsg = _lastError; delete _cp; _cp = 0; delete _config; _config = 0; } else { - _iniStatus = IniStatus_Ok; + _initqStatus = IniStatus_Ok; } } } - if( iniStatus ) - *iniStatus = _iniStatus; - return _iniStatus == IniStatus_Ok; + if( initqStatus ) + *initqStatus = _initqStatus; + return _initqStatus == IniStatus_Ok; } @@ -547,11 +547,11 @@ void CryptPlugWrapper::deinitialize() } -CryptPlugWrapper::IniStatus CryptPlugWrapper::iniStatus( TQString* errorMsg ) const +CryptPlugWrapper::InitqStatus CryptPlugWrapper::initqStatus( TQString* errorMsg ) const { if( errorMsg ) *errorMsg = _lastError; - return _iniStatus; + return _initqStatus; } |