start datetime fix for float

2 files changed, 6 insertions, 2 deletions

diff --git a/libkcal/incidencebase.cpp b/libkcal/incidencebase.cpp
index 1e99082..b5fe2e6 100644
--- a/libkcal/incidencebase.cpp
+++ b/libkcal/incidencebase.cpp
@@ -195,25 +195,27 @@ QDateTime IncidenceBase::dtStart() const
 QString IncidenceBase::dtStartTimeStr() const
 {
   return KGlobal::locale()->formatTime(dtStart().time());
 }
 
 QString IncidenceBase::dtStartDateStr(bool shortfmt) const
 {
   return KGlobal::locale()->formatDate(dtStart().date(),shortfmt);
 }
 
 QString IncidenceBase::dtStartStr(bool shortfmt) const
 {
-  return KGlobal::locale()->formatDateTime(dtStart(), shortfmt);
+    if ( doesFloat() )
+        return KGlobal::locale()->formatDate(dtStart().date(),shortfmt);
+    return KGlobal::locale()->formatDateTime(dtStart(), shortfmt);
 }
 
 
 bool IncidenceBase::doesFloat() const
 {
   return mFloats;
 }
 
 void IncidenceBase::setFloats(bool f)
 {
   if (mReadOnly) return;
   mFloats = f;
diff --git a/libkcal/todo.cpp b/libkcal/todo.cpp
index 39d16b6..a496404 100644
--- a/libkcal/todo.cpp
+++ b/libkcal/todo.cpp
@@ -182,25 +182,27 @@ QDateTime Todo::dtDue() const
 QString Todo::dtDueTimeStr() const
 {
   return KGlobal::locale()->formatTime(mDtDue.time());
 }
 
 QString Todo::dtDueDateStr(bool shortfmt) const
 {
   return KGlobal::locale()->formatDate(mDtDue.date(),shortfmt);
 }
 
 QString Todo::dtDueStr(bool shortfmt) const
 {
-  return KGlobal::locale()->formatDateTime(mDtDue, shortfmt);
+    if ( doesFloat() )
+        return KGlobal::locale()->formatDate(mDtDue.date(),shortfmt);
+    return KGlobal::locale()->formatDateTime(mDtDue, shortfmt);
 }
 // retval 0 : no found
 //        1 : due for date found
 //        2 : overdue for date found
 int Todo::hasDueSubTodoForDate( const QDate & date, bool checkSubtodos  )
 {
     int retval = 0;
     if ( isCompleted() )
         return 0;
     if ( hasDueDate() ) {
         if ( dtDue().date() < date )
             return 2;