author | zautrix <zautrix> | 2005-03-07 18:08:51 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2005-03-07 18:08:51 (UTC) |
commit | 668f49ee87c1b3b51e103ed8bb570a035c96b546 (patch) (unidiff) | |
tree | 9310b2a5f19589641c7bab924e87599c021141a1 /libkcal | |
parent | 55c82dcc9b3c04c06b4eb73654d2b7f09a2e502c (diff) | |
download | kdepimpi-668f49ee87c1b3b51e103ed8bb570a035c96b546.zip kdepimpi-668f49ee87c1b3b51e103ed8bb570a035c96b546.tar.gz kdepimpi-668f49ee87c1b3b51e103ed8bb570a035c96b546.tar.bz2 |
start datetime fix for float
-rw-r--r-- | libkcal/incidencebase.cpp | 4 | ||||
-rw-r--r-- | libkcal/todo.cpp | 4 |
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 | |||
@@ -201,13 +201,15 @@ QString IncidenceBase::dtStartDateStr(bool shortfmt) const | |||
201 | { | 201 | { |
202 | return KGlobal::locale()->formatDate(dtStart().date(),shortfmt); | 202 | return KGlobal::locale()->formatDate(dtStart().date(),shortfmt); |
203 | } | 203 | } |
204 | 204 | ||
205 | QString IncidenceBase::dtStartStr(bool shortfmt) const | 205 | QString IncidenceBase::dtStartStr(bool shortfmt) const |
206 | { | 206 | { |
207 | return KGlobal::locale()->formatDateTime(dtStart(), shortfmt); | 207 | if ( doesFloat() ) |
208 | return KGlobal::locale()->formatDate(dtStart().date(),shortfmt); | ||
209 | return KGlobal::locale()->formatDateTime(dtStart(), shortfmt); | ||
208 | } | 210 | } |
209 | 211 | ||
210 | 212 | ||
211 | bool IncidenceBase::doesFloat() const | 213 | bool IncidenceBase::doesFloat() const |
212 | { | 214 | { |
213 | return mFloats; | 215 | return mFloats; |
diff --git a/libkcal/todo.cpp b/libkcal/todo.cpp index 39d16b6..a496404 100644 --- a/libkcal/todo.cpp +++ b/libkcal/todo.cpp | |||
@@ -188,13 +188,15 @@ 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 | return KGlobal::locale()->formatDateTime(mDtDue, shortfmt); | 194 | if ( doesFloat() ) |
195 | return KGlobal::locale()->formatDate(mDtDue.date(),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 | { |