[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdepim/certmanager/lib
From:       Marc Mutz <Marc.Mutz () uni-bielefeld ! de>
Date:       2004-03-15 17:49:12
Message-ID: 20040315174912.38EF399AC () office ! kde ! org
[Download RAW message or body]

CVS commit by mutz: 

Deprecate the whole cryptplugwrapper


  M +3 -5      cryptplugfactory.h   1.9
  M +4 -7      cryptplugwrapper.h   1.10


--- kdepim/certmanager/lib/cryptplugfactory.h  #1.8:1.9
@@ -39,9 +39,4 @@
 #include <kleo/cryptobackend.h>
 
-class CryptPlugWrapper;
-class CryptPlugWrapperList;
-
-class KConfig;
-
 namespace Kleo {
   class BackendConfigWidget;
@@ -85,4 +80,7 @@ namespace Kleo {
 
 #ifndef LIBKLEOPATRA_NO_COMPAT
+class CryptPlugWrapper;
+class CryptPlugWrapperList;
+
 namespace KMail {
 

--- kdepim/certmanager/lib/cryptplugwrapper.h  #1.9:1.10
@@ -30,5 +30,7 @@
 #define cryptplugwrapper_h
 
+#include "cryptplug.h"
 
+#ifndef LIBKLEOPATRA_NO_COMPAT
 
 /*
@@ -48,5 +50,4 @@
 
 #include <kleo/cryptobackend.h>
-#include "cryptplug.h"
 
 #include <qdatetime.h>
@@ -431,5 +432,4 @@ class CryptPlugWrapper;
   \see signMessage, encryptMessage, encryptAndSignMessage
 */
-#ifndef LIBKLEOPATRA_NO_COMPAT
 class StructuringInfoWrapper {
 public:
@@ -444,5 +444,4 @@ private:
   CryptPlugWrapper* _wrapper;
 };
-#endif
 
 
@@ -760,5 +759,4 @@ public:
 
 
-#ifndef LIBKLEOPATRA_NO_COMPAT
     /*! \ingroup groupConfigSign
     \brief Sets the algorithm used for signing.
@@ -1541,5 +1539,4 @@ public:
                                  bool remote = false,
                                  bool *truncated = 0 );
-#endif // LIBKLEOPATRA_NO_COMPAT
 
     Kleo::KeyListJob * keyListJob( bool remote=false, bool includeSigs=false, bool \
validate=true ) const; @@ -1562,7 +1559,5 @@ public:
     GpgME::ImportResult importCertificate( const char* data, size_t length );
 
-#ifndef LIBKLEOPATRA_NO_COMPAT
     CryptPlug * cryptPlug() const { return _cp; }
-#endif
 
 private:
@@ -1581,3 +1576,5 @@ private:
 };
 
+#endif // !LIBKLEOPATRA_NO_COMPAT
+
 #endif // cryptplugwrapper_h


[prev in list] [next in list] [prev in thread] [next in thread]