-rw-r--r-- | libkcal/todo.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libkcal/todo.cpp b/libkcal/todo.cpp index 39d16b6..a496404 100644 --- a/libkcal/todo.cpp +++ b/libkcal/todo.cpp | |||
@@ -170,48 +170,50 @@ void Todo::setDtDue(const QDateTime &dtDue) | |||
170 | /*const QPtrList<Alarm>& alarms = alarms(); | 170 | /*const QPtrList<Alarm>& alarms = alarms(); |
171 | for (Alarm* alarm = alarms.first(); alarm; alarm = alarms.next()) | 171 | for (Alarm* alarm = alarms.first(); alarm; alarm = alarms.next()) |
172 | alarm->setAlarmStart(mDtDue);*/ | 172 | alarm->setAlarmStart(mDtDue);*/ |
173 | 173 | ||
174 | updated(); | 174 | updated(); |
175 | } | 175 | } |
176 | 176 | ||
177 | QDateTime Todo::dtDue() const | 177 | QDateTime Todo::dtDue() const |
178 | { | 178 | { |
179 | return mDtDue; | 179 | return mDtDue; |
180 | } | 180 | } |
181 | 181 | ||
182 | QString Todo::dtDueTimeStr() const | 182 | QString Todo::dtDueTimeStr() const |
183 | { | 183 | { |
184 | return KGlobal::locale()->formatTime(mDtDue.time()); | 184 | return KGlobal::locale()->formatTime(mDtDue.time()); |
185 | } | 185 | } |
186 | 186 | ||
187 | QString Todo::dtDueDateStr(bool shortfmt) const | 187 | QString Todo::dtDueDateStr(bool shortfmt) const |
188 | { | 188 | { |
189 | return KGlobal::locale()->formatDate(mDtDue.date(),shortfmt); | 189 | return KGlobal::locale()->formatDate(mDtDue.date(),shortfmt); |
190 | } | 190 | } |
191 | 191 | ||
192 | QString Todo::dtDueStr(bool shortfmt) const | 192 | QString Todo::dtDueStr(bool shortfmt) const |
193 | { | 193 | { |
194 | if ( doesFloat() ) | ||
195 | return KGlobal::locale()->formatDate(mDtDue.date(),shortfmt); | ||
194 | return KGlobal::locale()->formatDateTime(mDtDue, shortfmt); | 196 | return KGlobal::locale()->formatDateTime(mDtDue, shortfmt); |
195 | } | 197 | } |
196 | // retval 0 : no found | 198 | // retval 0 : no found |
197 | // 1 : due for date found | 199 | // 1 : due for date found |
198 | // 2 : overdue for date found | 200 | // 2 : overdue for date found |
199 | int Todo::hasDueSubTodoForDate( const QDate & date, bool checkSubtodos ) | 201 | int Todo::hasDueSubTodoForDate( const QDate & date, bool checkSubtodos ) |
200 | { | 202 | { |
201 | int retval = 0; | 203 | int retval = 0; |
202 | if ( isCompleted() ) | 204 | if ( isCompleted() ) |
203 | return 0; | 205 | return 0; |
204 | if ( hasDueDate() ) { | 206 | if ( hasDueDate() ) { |
205 | if ( dtDue().date() < date ) | 207 | if ( dtDue().date() < date ) |
206 | return 2; | 208 | return 2; |
207 | // we do not return, because we may find an overdue sub todo | 209 | // we do not return, because we may find an overdue sub todo |
208 | if ( dtDue().date() == date ) | 210 | if ( dtDue().date() == date ) |
209 | retval = 1; | 211 | retval = 1; |
210 | } | 212 | } |
211 | if ( checkSubtodos ) { | 213 | if ( checkSubtodos ) { |
212 | Incidence *aTodo; | 214 | Incidence *aTodo; |
213 | for (aTodo = mRelations.first(); aTodo; aTodo = mRelations.next()) { | 215 | for (aTodo = mRelations.first(); aTodo; aTodo = mRelations.next()) { |
214 | int ret = ((Todo*)aTodo)->hasDueSubTodoForDate( date ,checkSubtodos ); | 216 | int ret = ((Todo*)aTodo)->hasDueSubTodoForDate( date ,checkSubtodos ); |
215 | if ( ret == 2 ) | 217 | if ( ret == 2 ) |
216 | return 2; | 218 | return 2; |
217 | if ( ret == 1) | 219 | if ( ret == 1) |