-rw-r--r-- | libopie2/opiepim/backend/otodoaccessbackend.h | 1 | ||||
-rw-r--r-- | libopie2/opiepim/backend/otodoaccessvcal.cpp | 6 | ||||
-rw-r--r-- | libopie2/opiepim/backend/otodoaccessvcal.h | 2 | ||||
-rw-r--r-- | libopie2/opiepim/backend/otodoaccessxml.cpp | 27 | ||||
-rw-r--r-- | libopie2/opiepim/backend/otodoaccessxml.h | 1 |
5 files changed, 24 insertions, 13 deletions
diff --git a/libopie2/opiepim/backend/otodoaccessbackend.h b/libopie2/opiepim/backend/otodoaccessbackend.h index 3bad6b7..7944a2c 100644 --- a/libopie2/opiepim/backend/otodoaccessbackend.h +++ b/libopie2/opiepim/backend/otodoaccessbackend.h | |||
@@ -16,2 +16,3 @@ public: | |||
16 | int cat ) = 0; | 16 | int cat ) = 0; |
17 | virtual void removeAllCompleted() = 0; | ||
17 | 18 | ||
diff --git a/libopie2/opiepim/backend/otodoaccessvcal.cpp b/libopie2/opiepim/backend/otodoaccessvcal.cpp index ac70ea0..e96cc3c 100644 --- a/libopie2/opiepim/backend/otodoaccessvcal.cpp +++ b/libopie2/opiepim/backend/otodoaccessvcal.cpp | |||
@@ -156,2 +156,8 @@ bool OTodoAccessVCal::remove( int uid ) { | |||
156 | } | 156 | } |
157 | void OTodoAccessVCal::removeAllCompleted() { | ||
158 | for ( QMap<int, OTodo>::Iterator it = m_map.begin(); it != m_map.end(); ++it ) { | ||
159 | if ( (*it).isCompleted() ) | ||
160 | m_map.remove( it ); | ||
161 | } | ||
162 | } | ||
157 | bool OTodoAccessVCal::replace( const OTodo& to ) { | 163 | bool OTodoAccessVCal::replace( const OTodo& to ) { |
diff --git a/libopie2/opiepim/backend/otodoaccessvcal.h b/libopie2/opiepim/backend/otodoaccessvcal.h index 4499a7e..452f602 100644 --- a/libopie2/opiepim/backend/otodoaccessvcal.h +++ b/libopie2/opiepim/backend/otodoaccessvcal.h | |||
@@ -28,2 +28,4 @@ public: | |||
28 | 28 | ||
29 | void removeAllCompleted(); | ||
30 | |||
29 | private: | 31 | private: |
diff --git a/libopie2/opiepim/backend/otodoaccessxml.cpp b/libopie2/opiepim/backend/otodoaccessxml.cpp index c1682c6..b2dfe80 100644 --- a/libopie2/opiepim/backend/otodoaccessxml.cpp +++ b/libopie2/opiepim/backend/otodoaccessxml.cpp | |||
@@ -30,3 +30,3 @@ bool OTodoAccessXML::load() { | |||
30 | */ | 30 | */ |
31 | QAsciiDict<int> dict(15); | 31 | QAsciiDict<int> dict(21); |
32 | dict.setAutoDelete( TRUE ); | 32 | dict.setAutoDelete( TRUE ); |
@@ -45,7 +45,11 @@ bool OTodoAccessXML::load() { | |||
45 | dict.insert("CrossReference", new int(OTodo::CrossReference) ); | 45 | dict.insert("CrossReference", new int(OTodo::CrossReference) ); |
46 | dict.insert("HasAlarmDateTime",new int(OTodo::HasAlarmDateTime) ); | 46 | dict.insert("State", new int(OTodo::State) ); |
47 | dict.insert("AlarmDateTime", new int(OTodo::AlarmDateTime) ); | 47 | dict.insert("Recurrence", new int(OTodo::Recurrence) ); |
48 | dict.insert("Alarms", new int(OTodo::Alarms) ); | ||
49 | dict.insert("Reminders", new int(OTodo::Reminders) ); | ||
50 | dict.insert("Notifiers", new int(OTodo::Notifiers) ); | ||
51 | dict.insert("Maintainer", new int(OTodo::Maintainer) ); | ||
48 | 52 | ||
49 | // here the custom XML parser from TT it's GPL | 53 | // here the custom XML parser from TT it's GPL |
50 | // but we want to push that to TT..... | 54 | // but we want to push OpiePIM... to TT..... |
51 | QFile f(m_file ); | 55 | QFile f(m_file ); |
@@ -338,10 +342,2 @@ void OTodoAccessXML::todo( QAsciiDict<int>* dict, OTodo& ev, | |||
338 | } | 342 | } |
339 | case OTodo::HasAlarmDateTime: | ||
340 | ev.setHasAlarmDateTime( val.toInt() ); | ||
341 | break; | ||
342 | case OTodo::AlarmDateTime: { | ||
343 | /* this sounds better ;) zecke */ | ||
344 | ev.setAlarmDateTime( TimeConversion::fromISO8601( val.local8Bit() ) ); | ||
345 | break; | ||
346 | } | ||
347 | default: | 343 | default: |
@@ -385,3 +381,2 @@ QString OTodoAccessXML::toString( const OTodo& ev )const { | |||
385 | 381 | ||
386 | str += "AlarmDateTime=\"" + TimeConversion::toISO8601( ev.alarmDateTime() ) + "\" "; | ||
387 | 382 | ||
@@ -618 +613,7 @@ QArray<int> OTodoAccessXML::sorted( bool asc, int sortOrder, | |||
618 | }; | 613 | }; |
614 | void OTodoAccessXML::removeAllCompleted() { | ||
615 | for ( QMap<int, OTodo>::Iterator it = m_events.begin(); it != m_events.end(); ++it ) { | ||
616 | if ( (*it).isCompleted() ) | ||
617 | m_events.remove( it ); | ||
618 | } | ||
619 | } | ||
diff --git a/libopie2/opiepim/backend/otodoaccessxml.h b/libopie2/opiepim/backend/otodoaccessxml.h index dc41c32..93609fe 100644 --- a/libopie2/opiepim/backend/otodoaccessxml.h +++ b/libopie2/opiepim/backend/otodoaccessxml.h | |||
@@ -31,2 +31,3 @@ public: | |||
31 | bool remove( int uid ); | 31 | bool remove( int uid ); |
32 | void removeAllCompleted(); | ||
32 | bool replace( const OTodo& ); | 33 | bool replace( const OTodo& ); |