Moved kpilot from kdepim to applications, as the core Trinity libraries should not contain hardware-dependent software

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1221127 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

1 files changed, 18 insertions, 18 deletions

diff --git a/certmanager/lib/cryptplugwrapper.cpp b/certmanager/lib/cryptplugwrapper.cpp
index ec6d6d571..7694a138c 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;
 }