author | zecke <zecke> | 2002-10-18 14:09:14 (UTC) |
---|---|---|
committer | zecke <zecke> | 2002-10-18 14:09:14 (UTC) |
commit | 461113126af82cd6343eedab36ecabb4253780ee (patch) (unidiff) | |
tree | 3176b63dd7f99c58138f237805c88db334fd4a38 | |
parent | a574a09dd7b24091a4d2093c8b046ccd32e78d63 (diff) | |
download | opie-461113126af82cd6343eedab36ecabb4253780ee.zip opie-461113126af82cd6343eedab36ecabb4253780ee.tar.gz opie-461113126af82cd6343eedab36ecabb4253780ee.tar.bz2 |
Add a small quirk mode... for testing
Fix parsing of due Date
We can not rely that HasDate is past the dates..
do the final QDate generation just before adding
the OTodo
-rw-r--r-- | libopie/pim/otodoaccessxml.cpp | 13 | ||||
-rw-r--r-- | libopie2/opiepim/backend/otodoaccessxml.cpp | 13 |
2 files changed, 16 insertions, 10 deletions
diff --git a/libopie/pim/otodoaccessxml.cpp b/libopie/pim/otodoaccessxml.cpp index 7a55c67..385fd27 100644 --- a/libopie/pim/otodoaccessxml.cpp +++ b/libopie/pim/otodoaccessxml.cpp | |||
@@ -115,9 +115,17 @@ bool OTodoAccessXML::load() { | |||
115 | } | 115 | } |
116 | /* | 116 | /* |
117 | * now add it | 117 | * now add it |
118 | */ | 118 | */ |
119 | if (m_events.contains( ev.uid() ) || ev.uid() == 0) { | ||
120 | ev.setUid( 1 ); | ||
121 | m_changed = true; | ||
122 | } | ||
123 | if ( ev.hasDueDate() ) { | ||
124 | ev.setDueDate( QDate(m_year, m_month, m_day) ); | ||
125 | } | ||
119 | m_events.insert(ev.uid(), ev ); | 126 | m_events.insert(ev.uid(), ev ); |
127 | m_year = m_month = m_day = -1; | ||
120 | } | 128 | } |
121 | 129 | ||
122 | qWarning("counts %d records loaded!", m_events.count() ); | 130 | qWarning("counts %d records loaded!", m_events.count() ); |
123 | return true; | 131 | return true; |
@@ -338,13 +346,8 @@ void OTodoAccessXML::todo( QAsciiDict<int>* dict, OTodo& ev, | |||
338 | } | 346 | } |
339 | default: | 347 | default: |
340 | break; | 348 | break; |
341 | } | 349 | } |
342 | |||
343 | if ( ev.hasDueDate() ) { | ||
344 | QDate date( m_year, m_month, m_day ); | ||
345 | ev.setDueDate( date ); | ||
346 | } | ||
347 | } | 350 | } |
348 | QString OTodoAccessXML::toString( const OTodo& ev )const { | 351 | QString OTodoAccessXML::toString( const OTodo& ev )const { |
349 | QString str; | 352 | QString str; |
350 | 353 | ||
diff --git a/libopie2/opiepim/backend/otodoaccessxml.cpp b/libopie2/opiepim/backend/otodoaccessxml.cpp index 7a55c67..385fd27 100644 --- a/libopie2/opiepim/backend/otodoaccessxml.cpp +++ b/libopie2/opiepim/backend/otodoaccessxml.cpp | |||
@@ -115,9 +115,17 @@ bool OTodoAccessXML::load() { | |||
115 | } | 115 | } |
116 | /* | 116 | /* |
117 | * now add it | 117 | * now add it |
118 | */ | 118 | */ |
119 | if (m_events.contains( ev.uid() ) || ev.uid() == 0) { | ||
120 | ev.setUid( 1 ); | ||
121 | m_changed = true; | ||
122 | } | ||
123 | if ( ev.hasDueDate() ) { | ||
124 | ev.setDueDate( QDate(m_year, m_month, m_day) ); | ||
125 | } | ||
119 | m_events.insert(ev.uid(), ev ); | 126 | m_events.insert(ev.uid(), ev ); |
127 | m_year = m_month = m_day = -1; | ||
120 | } | 128 | } |
121 | 129 | ||
122 | qWarning("counts %d records loaded!", m_events.count() ); | 130 | qWarning("counts %d records loaded!", m_events.count() ); |
123 | return true; | 131 | return true; |
@@ -338,13 +346,8 @@ void OTodoAccessXML::todo( QAsciiDict<int>* dict, OTodo& ev, | |||
338 | } | 346 | } |
339 | default: | 347 | default: |
340 | break; | 348 | break; |
341 | } | 349 | } |
342 | |||
343 | if ( ev.hasDueDate() ) { | ||
344 | QDate date( m_year, m_month, m_day ); | ||
345 | ev.setDueDate( date ); | ||
346 | } | ||
347 | } | 350 | } |
348 | QString OTodoAccessXML::toString( const OTodo& ev )const { | 351 | QString OTodoAccessXML::toString( const OTodo& ev )const { |
349 | QString str; | 352 | QString str; |
350 | 353 | ||