From 9cc13dcbb01a96c9e60a07ca63c61d24b374f50d Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 16 Dec 2011 09:59:50 -0600 Subject: Revert "Rename a number of old tq methods that are no longer tq specific" This reverts commit 3ca10fd9a2dc631429d3b5d5c5e42a7d211d5a12. --- certmanager/lib/cryptplugwrapper.h | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) (limited to 'certmanager/lib/cryptplugwrapper.h') diff --git a/certmanager/lib/cryptplugwrapper.h b/certmanager/lib/cryptplugwrapper.h index bf1976700..2275f3756 100644 --- a/certmanager/lib/cryptplugwrapper.h +++ b/certmanager/lib/cryptplugwrapper.h @@ -462,7 +462,7 @@ public: If initialize was not called before return value will be \c CryptPlugInit_undef. - \sa iniStatus, initialize + \sa initqStatus, initialize */ typedef enum { IniStatus_undef = 0, @@ -471,7 +471,7 @@ public: IniStatus_NoLibName = 2, IniStatus_LoadError = 0x1000, IniStatus_InitError = 0x2000 - } IniStatus; + } InitqStatus; /*! \ingroup groupSignAct \brief Flags used to compose the SigStatusFlags value. @@ -543,7 +543,7 @@ public: or not. \sa ~CryptPlugWrapper, setActive, active, initialize, deinitialize - \sa iniStatus + \sa initqStatus */ CryptPlugWrapper( const TQString& name=TQString(), const TQString& libName=TQString(), @@ -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 , iniStatus; + setActive , active, setLibName , libName , initqStatus; 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, iniStatus + \sa deinitialize, initialize, initqStatus */ 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 iniStatus() is not \c IniStatus_Ok. + the initqStatus() is not \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, iniStatus + \sa deinitialize, initialize, initqStatus */ 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 iniStatus will receive the resulting IniStatus if not NULL + \param initqStatus will receive the resulting InitqStatus if not NULL \param errorMsg will receive the system error message if not NULL - \sa iniStatus, deinitialize, CryptPlugWrapper(), ~CryptPlugWrapper + \sa initqStatus, deinitialize, CryptPlugWrapper(), ~CryptPlugWrapper \sa setActive, active */ - bool initialize( IniStatus* iniStatus, TQString* errorMsg ); + bool initialize( InitqStatus* initqStatus, 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 iniStatus value back + \note Deinitializing sets the internal initqStatus value back to \c IniStatus_undef. - \sa iniStatus, initialize, CryptPlugWrapper, ~CryptPlugWrapper + \sa initqStatus, 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 IniStatus value equals \c IniStatus_Ok. + should be ignored if InitqStatus 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 */ - IniStatus iniStatus( TQString* errorMsg ) const; + InitqStatus initqStatus( 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 iniStatus( TQString* ). + message may be retrieved by calling initqStatus( TQString* ). \return whether the relative feature is implemented or not */ @@ -824,7 +824,7 @@ private: TQString _libName; TQString _updateURL; bool _active; - IniStatus _iniStatus; + InitqStatus _initqStatus; TQString _lastError; CryptPlug* _cp; // local parameters without representation in cryptplug.h -- cgit v1.2.1