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

diff --git a/knotes/knoteprinter.cpp b/knotes/knoteprinter.cpp
index 0bd6ef8a..c5803167 100644
--- a/knotes/knoteprinter.cpp
+++ b/knotes/knoteprinter.cpp
@@ -4,7 +4,7 @@
 
 #include <klocale.h>
 #include <kprinter.h>
-
+#include <kdebug.h>
 #include <tqfont.h>
 #include <tqpaintdevicemetrics.h>
 #include <tqpainter.h>
@@ -79,6 +79,9 @@ void KNotePrinter::doPrint( KPrinter& printer, TQPainter& painter,
             metrics.width() - marginX * 2,
             metrics.height() - marginY * 2 );
 
+    kdDebug()<<" content :"<<content<<endl;
+    kdDebug()<<" m_styleSheet :"<<m_styleSheet<<endl;
+    //kdDebug()<<" m_font :"<<m_font;
     TQSimpleRichText text( content, m_font, m_context,
             m_styleSheet, m_mimeSourceFactory,
             body.height() /*, linkColor, linkUnderline? */ );
@@ -136,8 +139,8 @@ void KNotePrinter::printNotes( const TQValueList<KCal::Journal*>& journals ) con
     TQPainter painter;
     painter.begin( &printer );
     TQString content;
-    TQValueListConstIterator<KCal::Journal*> it( journals.begin() );
-    TQValueListConstIterator<KCal::Journal*> end( journals.end() );
+    TQValueListConstIterator<KCal::Journal*> it( journals.constBegin() );
+    TQValueListConstIterator<KCal::Journal*> end( journals.constEnd() );
     while ( it != end ) {
         KCal::Journal *j = *it;
         it++;