[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    branches/kdepim/enterprise/kdepim/kresources/kolab/kcal
From:       Sergio Luis Martins <iamsergio () gmail ! com>
Date:       2010-04-06 13:04:01
Message-ID: 20100406130401.D016AAC7DB () svn ! kde ! org
[Download RAW message or body]

SVN commit 1111687 by smartins:

My first commit only fixed to-do to xml conversion.

This fixes xml to to-do, mFloatingStatus is set now.

Uses same method as event.cpp for handling allday vs time.

Fixes kolab/issue4280.

MERGE: trunk, branch4.4


 M  +25 -5     task.cpp  
 M  +3 -1      task.h  


--- branches/kdepim/enterprise/kdepim/kresources/kolab/kcal/task.cpp #1111686:1111687
@@ -150,8 +150,28 @@
 {
   mDueDate = date;
   mHasDueDate = true;
+  mFloatingStatus = HasTime;
 }
 
+void Task::setDueDate( const QDate &date )
+{
+  mDueDate = date;
+  mHasDueDate = true;
+  mFloatingStatus = AllDay;
+}
+
+
+void Task::setDueDate( const QString &date )
+{
+  if ( date.length() > 10 ) {
+    // This is a date + time
+     setDueDate( stringToDateTime( date ) );
+  } else {
+     // This is only a date
+    setDueDate( stringToDate( date ) );
+  }
+}
+
 QDateTime Task::dueDate() const
 {
   return mDueDate;
@@ -225,13 +245,13 @@
     else
       // Default
       setStatus( KCal::Incidence::StatusNone );
-  } else if ( tagName == "due-date" )
-    setDueDate( stringToDateTime( element.text() ) );
-  else if ( tagName == "parent" )
+  } else if ( tagName == "due-date" ) {
+    setDueDate( element.text() );
+  } else if ( tagName == "parent" ) {
     setParent( element.text() );
-  else if ( tagName == "x-completed-date" )
+  } else if ( tagName == "x-completed-date" ) {
     setCompletedDate( stringToDateTime( element.text() ) );
-  else if ( tagName == "start-date" ) {
+  } else if ( tagName == "start-date" ) {
     setHasStartDate( true );
     setStartDate( element.text() );
   } else
--- branches/kdepim/enterprise/kdepim/kresources/kolab/kcal/task.h #1111686:1111687
@@ -86,7 +86,9 @@
   virtual void setHasStartDate( bool );
   virtual bool hasStartDate() const;
 
-  virtual void setDueDate( const QDateTime& date );
+  virtual void setDueDate( const QDateTime &date );
+  virtual void setDueDate( const QString &date );
+  virtual void setDueDate( const QDate &date );
   virtual QDateTime dueDate() const;
   virtual bool hasDueDate() const;
 
[prev in list] [next in list] [prev in thread] [next in thread]