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

diff --git a/korganizer/kowhatsnextview.cpp b/korganizer/kowhatsnextview.cpp
index 351972199..884b70b22 100644
--- a/korganizer/kowhatsnextview.cpp
+++ b/korganizer/kowhatsnextview.cpp
@@ -35,6 +35,7 @@
 #include <kmessagebox.h>
 
 #include <libkcal/calendar.h>
+#include <libkcal/incidenceformatter.h>
 
 #include "koglobals.h"
 #include "koprefs.h"
@@ -244,7 +245,7 @@ void KOWhatsNextView::showDates( const TQDate &start, const TQDate &end )
   updateView();
 }
 
-void KOWhatsNextView::showIncidences( const Incidence::List & )
+void KOWhatsNextView::showIncidences( const Incidence::List &, const TQDate & )
 {
 }
 
@@ -312,8 +313,8 @@ void KOWhatsNextView::appendTodo( Incidence *ev )
   if ( ev->type()=="Todo" ) {
     Todo *todo = static_cast<Todo*>(ev);
     if ( todo->hasDueDate() ) {
-      mText += i18n("  (Due: %1)")
-         .arg( (todo->doesFloat())?(todo->dtDueDateStr()):(todo->dtDueStr()) );
+      mText += i18n( "  (Due: %1)" ).
+               arg( IncidenceFormatter::dateTimeToString( todo->dtDue(), todo->doesFloat() ) );
     }
   }
   mText += "</li>\n";
@@ -329,7 +330,9 @@ void KOWhatsNextView::showIncidence( const TQString &uid )
   } else if ( uid.startsWith( "todo://" ) ) {
     incidence = calendar()->incidence( uid.mid( 7 ) );
   }
-  if ( incidence ) emit showIncidenceSignal( incidence );
+  if ( incidence ) {
+    emit showIncidenceSignal( incidence, TQDate() );
+  }
 }
 
 #include "kowhatsnextview.moc"