* Massive set of changes to bring in all fixes and enhancements from the Enterprise PIM branch

* Ensured that the Trinity changes were applied on top of those enhancements, and any redundancy removed
* Added journal read support to the CalDAV resource
* Fixed CalDAV resource to use events URL for tasks and journals when separate URL checkbox unchecked


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

1 files changed, 11 insertions, 0 deletions

diff --git a/libkdenetwork/gpgmepp/context.h b/libkdenetwork/gpgmepp/context.h
index aae69f86..b07e722e 100644
--- a/libkdenetwork/gpgmepp/context.h
+++ b/libkdenetwork/gpgmepp/context.h
@@ -25,6 +25,8 @@
 
 #include <vector>
 #include <utility>
+#include <iosfwd>
+
 #include <kdepimmacros.h>
 
 namespace GpgME {
@@ -64,6 +66,8 @@ namespace GpgME {
     int mErr;
   };
 
+  KDE_EXPORT std::ostream & operator<<( std::ostream & os, Error err );
+
   class KDE_EXPORT Context {
     Context( gpgme_ctx_t );
   public:
@@ -281,6 +285,13 @@ namespace GpgME {
     const Context & operator=( const Context & );
   };
 
+  KDE_EXPORT std::ostream & operator<<( std::ostream & os, Context::Protocol proto );
+  KDE_EXPORT std::ostream & operator<<( std::ostream & os, Context::CertificateInclusion incl );
+  KDE_EXPORT std::ostream & operator<<( std::ostream & os, Context::KeyListMode mode );
+  KDE_EXPORT std::ostream & operator<<( std::ostream & os, Context::SignatureMode mode );
+  KDE_EXPORT std::ostream & operator<<( std::ostream & os, Context::EncryptionFlags flags );
+  KDE_EXPORT std::ostream & operator<<( std::ostream & os, Context::AuditLogFlags flags );
+
   //
   //
   // Globals