* 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, 9 insertions, 0 deletions

diff --git a/libkdenetwork/gpgmepp/signingresult.h b/libkdenetwork/gpgmepp/signingresult.h
index e9684abb..202d09b4 100644
--- a/libkdenetwork/gpgmepp/signingresult.h
+++ b/libkdenetwork/gpgmepp/signingresult.h
@@ -28,7 +28,10 @@
 #include <time.h>
 
 #include <vector>
+#include <iosfwd>
+
 #include <kdepimmacros.h>
+
 namespace GpgME {
 
   class Error;
@@ -57,6 +60,8 @@ namespace GpgME {
     Private * d;
   };
 
+  KDE_EXPORT std::ostream & operator<<( std::ostream & os, const SigningResult & result );
+
   class KDE_EXPORT InvalidSigningKey {
     friend class SigningResult;
     InvalidSigningKey( SigningResult::Private * parent, unsigned int index );
@@ -77,6 +82,8 @@ namespace GpgME {
     unsigned int idx;
   };
 
+  KDE_EXPORT std::ostream & operator<<( std::ostream & os, const InvalidSigningKey & key );
+
   class KDE_EXPORT CreatedSignature {
     friend class SigningResult;
     CreatedSignature( SigningResult::Private * parent, unsigned int index );
@@ -110,6 +117,8 @@ namespace GpgME {
     unsigned int idx;
   };
 
+  KDE_EXPORT std::ostream & operator<<( std::ostream & os, const CreatedSignature & sig );
+
 }
 
 #endif // __GPGMEPP_SIGNINGRESULT_H__