-rw-r--r-- | libopie2/opiepim/otodo.cpp | 72 |
1 files changed, 35 insertions, 37 deletions
diff --git a/libopie2/opiepim/otodo.cpp b/libopie2/opiepim/otodo.cpp index 6fcf9f6..ece624a 100644 --- a/libopie2/opiepim/otodo.cpp +++ b/libopie2/opiepim/otodo.cpp | |||
@@ -17,2 +17,3 @@ | |||
17 | #include "opimmaintainer.h" | 17 | #include "opimmaintainer.h" |
18 | #include "opimnotifymanager.h" | ||
18 | 19 | ||
@@ -33,4 +34,2 @@ struct OTodo::OTodoData : public QShared { | |||
33 | ushort prog; | 34 | ushort prog; |
34 | bool hasAlarmDateTime :1; | ||
35 | QDateTime alarmDateTime; | ||
36 | OPimState state; | 35 | OPimState state; |
@@ -38,2 +37,5 @@ struct OTodo::OTodoData : public QShared { | |||
38 | OPimMaintainer maintainer; | 37 | OPimMaintainer maintainer; |
38 | QDate start; | ||
39 | QDate completed; | ||
40 | OPimNotifyManager notifiers; | ||
39 | }; | 41 | }; |
@@ -75,4 +77,2 @@ OTodo::OTodo(bool completed, int priority, | |||
75 | data->desc = Qtopia::simplifyMultiLineSpace(description ); | 77 | data->desc = Qtopia::simplifyMultiLineSpace(description ); |
76 | data->hasAlarmDateTime = false; | ||
77 | |||
78 | } | 78 | } |
@@ -98,4 +98,2 @@ OTodo::OTodo(bool completed, int priority, | |||
98 | data->desc = Qtopia::simplifyMultiLineSpace(description ); | 98 | data->desc = Qtopia::simplifyMultiLineSpace(description ); |
99 | data->hasAlarmDateTime = false; | ||
100 | |||
101 | } | 99 | } |
@@ -122,5 +120,7 @@ bool OTodo::hasDueDate() const | |||
122 | } | 120 | } |
123 | bool OTodo::hasAlarmDateTime() const | 121 | bool OTodo::hasStartDate()const { |
124 | { | 122 | return data->start.isValid(); |
125 | return data->hasAlarmDateTime; | 123 | } |
124 | bool OTodo::hasCompletedDate()const { | ||
125 | return data->completed.isValid(); | ||
126 | } | 126 | } |
@@ -142,8 +142,8 @@ QDate OTodo::dueDate()const | |||
142 | } | 142 | } |
143 | 143 | QDate OTodo::startDate()const { | |
144 | QDateTime OTodo::alarmDateTime() const | 144 | return data->start; |
145 | { | 145 | } |
146 | return data->alarmDateTime; | 146 | QDate OTodo::completedDate()const { |
147 | return data->completed; | ||
147 | } | 148 | } |
148 | |||
149 | QString OTodo::description()const | 149 | QString OTodo::description()const |
@@ -171,7 +171,2 @@ void OTodo::setHasDueDate( bool hasDate ) | |||
171 | } | 171 | } |
172 | void OTodo::setHasAlarmDateTime( bool hasAlarmDateTime ) | ||
173 | { | ||
174 | changeOrModify(); | ||
175 | data->hasAlarmDateTime = hasAlarmDateTime; | ||
176 | } | ||
177 | void OTodo::setDescription(const QString &desc ) | 172 | void OTodo::setDescription(const QString &desc ) |
@@ -192,3 +187,3 @@ void OTodo::setPriority(int prio ) | |||
192 | } | 187 | } |
193 | void OTodo::setDueDate( QDate date ) | 188 | void OTodo::setDueDate( const QDate& date ) |
194 | { | 189 | { |
@@ -197,6 +192,9 @@ void OTodo::setDueDate( QDate date ) | |||
197 | } | 192 | } |
198 | void OTodo::setAlarmDateTime( const QDateTime& alarm ) | 193 | void OTodo::setStartDate( const QDate& date ) { |
199 | { | 194 | changeOrModify(); |
195 | data->start = date; | ||
196 | } | ||
197 | void OTodo::setCompletedDate( const QDate& date ) { | ||
200 | changeOrModify(); | 198 | changeOrModify(); |
201 | data->alarmDateTime = alarm; | 199 | data->completed = date; |
202 | } | 200 | } |
@@ -256,7 +254,2 @@ QString OTodo::toRichText() const | |||
256 | } | 254 | } |
257 | if (hasAlarmDateTime() ){ | ||
258 | text += "<b>" + QObject::tr( "Alarmed Notification:") + " </b>"; | ||
259 | text += alarmDateTime().toString(); | ||
260 | text += "<br>"; | ||
261 | } | ||
262 | 255 | ||
@@ -268,2 +261,5 @@ QString OTodo::toRichText() const | |||
268 | } | 261 | } |
262 | OPimNotifyManager& OTodo::notifiers() { | ||
263 | return data->notifiers; | ||
264 | } | ||
269 | 265 | ||
@@ -329,6 +325,2 @@ bool OTodo::operator==(const OTodo &toDoEvent )const | |||
329 | if ( data->desc != toDoEvent.data->desc ) return false; | 325 | if ( data->desc != toDoEvent.data->desc ) return false; |
330 | if ( data->hasAlarmDateTime != toDoEvent.data->hasAlarmDateTime ) | ||
331 | return false; | ||
332 | if ( data->alarmDateTime != toDoEvent.data->alarmDateTime ) | ||
333 | return false; | ||
334 | if ( data->maintainer != toDoEvent.data->maintainer ) | 326 | if ( data->maintainer != toDoEvent.data->maintainer ) |
@@ -373,5 +365,7 @@ QMap<int, QString> OTodo::toMap() const { | |||
373 | // map.insert( CrossReference, crossToString() ); | 365 | // map.insert( CrossReference, crossToString() ); |
374 | map.insert( HasAlarmDateTime, QString::number( data->hasAlarmDateTime ) ); | 366 | /* FIXME!!! map.insert( State, ); |
375 | map.insert( AlarmDateTime, data->alarmDateTime.toString() ); | 367 | map.insert( Recurrence, ); |
376 | 368 | map.insert( Reminders, ); | |
369 | map. | ||
370 | */ | ||
377 | return map; | 371 | return map; |
@@ -410,4 +404,2 @@ void OTodo::copy( OTodoData* src, OTodoData* dest ) { | |||
410 | dest->prog = src->prog; | 404 | dest->prog = src->prog; |
411 | dest->hasAlarmDateTime = src->hasAlarmDateTime; | ||
412 | dest->alarmDateTime = src->alarmDateTime; | ||
413 | dest->state = src->state; | 405 | dest->state = src->state; |
@@ -415,2 +407,5 @@ void OTodo::copy( OTodoData* src, OTodoData* dest ) { | |||
415 | dest->maintainer = src->maintainer; | 407 | dest->maintainer = src->maintainer; |
408 | dest->start = src->start; | ||
409 | dest->completed = src->completed; | ||
410 | dest->notifiers = src->notifiers; | ||
416 | } | 411 | } |
@@ -423 +418,4 @@ QString OTodo::recordField(int /*id*/ )const { | |||
423 | 418 | ||
419 | int OTodo::rtti(){ | ||
420 | return 1; | ||
421 | } | ||