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

diff --git a/libkdepim/tests/testutf7encoder2.cpp b/libkdepim/tests/testutf7encoder2.cpp
index 57c19566..6d67bae0 100644
--- a/libkdepim/tests/testutf7encoder2.cpp
+++ b/libkdepim/tests/testutf7encoder2.cpp
@@ -3,7 +3,7 @@
 #include <tqtextstream.h>
 #include <string.h>
 #include <assert.h>
-#include <iostream.h>
+#include <iostream>
 
 int main( int argc, char * argv[] ) {
   if ( argc == 1 ) {
@@ -31,10 +31,10 @@ int main( int argc, char * argv[] ) {
       len = 1;
       cout << (enc->fromUnicode(TQString(buffer[i]),len)).data();
     }
-    cout << endl;
+    std::cout << std::endl;
 #else
     int len = buffer.length();
-    cout << (enc->fromUnicode(buffer,len)).data() << endl;;
+    std::cout << (enc->fromUnicode(buffer,len)).data() << std::endl;;
 #endif // CHAR_WISE
     delete enc;
 #endif // else USE_STREAM