From cc29364f06178f8f6b457384f2ec37a042bd9d43 Mon Sep 17 00:00:00 2001 From: tpearson Date: Wed, 1 Sep 2010 00:37:02 +0000 Subject: * 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 --- libkdepim/tests/testutf7encoder2.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'libkdepim/tests/testutf7encoder2.cpp') 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 #include #include -#include +#include 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 -- cgit v1.2.3