From 67e29a054cfcb1b0d2fe6b0a316cf6b3eec087b7 Mon Sep 17 00:00:00 2001
From: tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>
Date: Wed, 13 Apr 2011 00:46:47 +0000
Subject: Initial conversion of kdepim to TQt This will probably require some
 tweaking before it will build under Qt4, however Qt3 builds are OK.  Any
 alterations this commit makes to kdepim behaviour under Qt3 are unintentional
 and should be fixed.

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1227832 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
---
 certmanager/lib/cryptplugwrapper.cpp | 40 ++++++++++++++++++------------------
 1 file changed, 20 insertions(+), 20 deletions(-)

(limited to 'certmanager/lib/cryptplugwrapper.cpp')

diff --git a/certmanager/lib/cryptplugwrapper.cpp b/certmanager/lib/cryptplugwrapper.cpp
index 7694a138c..f15ab747d 100644
--- a/certmanager/lib/cryptplugwrapper.cpp
+++ b/certmanager/lib/cryptplugwrapper.cpp
@@ -209,24 +209,24 @@ public:
     return _unknownAttrsHandlingChar;
   }
 
-  TQValueList< QPair<TQString,TQString> > reorder( const TQValueList< QPair<TQString,TQString> > & dn ) const
+  TQValueList< TQPair<TQString,TQString> > reorder( const TQValueList< TQPair<TQString,TQString> > & dn ) const
   {
     return reorder( dn, _attrOrder, _unknownAttrsHandling );
   }
 
 
-  static TQValueList< QPair<TQString,TQString> > reorder(
-    const TQValueList< QPair<TQString,TQString> > & dn,
+  static TQValueList< TQPair<TQString,TQString> > reorder(
+    const TQValueList< TQPair<TQString,TQString> > & dn,
     TQStringList attrOrder,
     UnknownAttrsHandling unknownAttrsHandling )
   {
     if( !attrOrder.isEmpty() ){
-      TQPtrList<   QPair<TQString,TQString> > unknownEntries;
-      TQValueList< QPair<TQString,TQString> > dnNew;
+      TQPtrList<   TQPair<TQString,TQString> > unknownEntries;
+      TQValueList< TQPair<TQString,TQString> > dnNew;
 
-      QPair<TQString,TQString>* unknownEntry;
+      TQPair<TQString,TQString>* unknownEntry;
       TQStringList::ConstIterator itOrder;
-      TQValueList< QPair<TQString,TQString> >::ConstIterator itDN;
+      TQValueList< TQPair<TQString,TQString> >::ConstIterator itDN;
       bool bFound;
 
       if( unknownAttrsHandling != unknownAttrsHide ){
@@ -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 )
@@ -472,7 +472,7 @@ TQString CryptPlugWrapper::protocol() const
     return "SMIME";
   if ( _libName.tqcontains( "openpgp" ) )
     return "OpenPGP";
-  return TQString::null;
+  return TQString();
 }
 
 void CryptPlugWrapper::setDisplayName( const TQString& name )
@@ -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.tqcontains( "smime" ) ) {
@@ -515,12 +515,12 @@ 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 );
 	  if ( errorMsg )
@@ -528,13 +528,13 @@ bool CryptPlugWrapper::initialize( IniStatus* iniStatus, TQString* errorMsg )
 	  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;
 }
 
 
-- 
cgit v1.2.1