-rw-r--r-- | libopie2/opiepim/backend/otodoaccessxml.cpp | 20 | ||||
-rw-r--r-- | libopie2/opiepim/core/opimrecord.cpp | 3 | ||||
-rw-r--r-- | libopie2/opiepim/core/otodoaccess.cpp | 4 | ||||
-rw-r--r-- | libopie2/opiepim/orecordlist.h | 2 | ||||
-rw-r--r-- | libopie2/opiepim/otodo.cpp | 4 |
5 files changed, 20 insertions, 13 deletions
diff --git a/libopie2/opiepim/backend/otodoaccessxml.cpp b/libopie2/opiepim/backend/otodoaccessxml.cpp index 3a72881..5fe733c 100644 --- a/libopie2/opiepim/backend/otodoaccessxml.cpp +++ b/libopie2/opiepim/backend/otodoaccessxml.cpp | |||
@@ -8,33 +8,33 @@ | |||
8 | 8 | ||
9 | #include "otodoaccessxml.h" | 9 | #include "otodoaccessxml.h" |
10 | 10 | ||
11 | OTodoAccessXML::OTodoAccessXML( const QString& appName, | 11 | OTodoAccessXML::OTodoAccessXML( const QString& appName, |
12 | const QString& fileName ) | 12 | const QString& fileName ) |
13 | : OTodoAccessBackend(), m_app( appName ), m_opened( false ), m_changed( false ) | 13 | : OTodoAccessBackend(), m_app( appName ), m_opened( false ), m_changed( false ) |
14 | { | 14 | { |
15 | if (!fileName.isEmpty() ) | 15 | if (!fileName.isEmpty() ) |
16 | m_file = fileName; | 16 | m_file = fileName; |
17 | else | 17 | else |
18 | m_file = Global::applicationFileName( "todolist", "todolist.xml" ); | 18 | m_file = Global::applicationFileName( "todolist", "todolist.xml" ); |
19 | } | 19 | } |
20 | OTodoAccessXML::~OTodoAccessXML() { | 20 | OTodoAccessXML::~OTodoAccessXML() { |
21 | 21 | ||
22 | } | 22 | } |
23 | bool OTodoAccessXML::load() { | 23 | bool OTodoAccessXML::load() { |
24 | m_opened = false; | 24 | m_opened = true; |
25 | m_changed = false; | 25 | m_changed = false; |
26 | /* initialize dict */ | 26 | /* initialize dict */ |
27 | /* | 27 | /* |
28 | * UPDATE dict if you change anything!!! | 28 | * UPDATE dict if you change anything!!! |
29 | */ | 29 | */ |
30 | QAsciiDict<int> dict(15); | 30 | QAsciiDict<int> dict(15); |
31 | dict.setAutoDelete( TRUE ); | 31 | dict.setAutoDelete( TRUE ); |
32 | dict.insert("Categories" , new int(OTodo::Category) ); | 32 | dict.insert("Categories" , new int(OTodo::Category) ); |
33 | dict.insert("Uid" , new int(OTodo::Uid) ); | 33 | dict.insert("Uid" , new int(OTodo::Uid) ); |
34 | dict.insert("HasDate" , new int(OTodo::HasDate) ); | 34 | dict.insert("HasDate" , new int(OTodo::HasDate) ); |
35 | dict.insert("Completed" , new int(OTodo::Completed) ); | 35 | dict.insert("Completed" , new int(OTodo::Completed) ); |
36 | dict.insert("Description" , new int(OTodo::Description) ); | 36 | dict.insert("Description" , new int(OTodo::Description) ); |
37 | dict.insert("Summary" , new int(OTodo::Summary) ); | 37 | dict.insert("Summary" , new int(OTodo::Summary) ); |
38 | dict.insert("Priority" , new int(OTodo::Priority) ); | 38 | dict.insert("Priority" , new int(OTodo::Priority) ); |
39 | dict.insert("DateDay" , new int(OTodo::DateDay) ); | 39 | dict.insert("DateDay" , new int(OTodo::DateDay) ); |
40 | dict.insert("DateMonth" , new int(OTodo::DateMonth) ); | 40 | dict.insert("DateMonth" , new int(OTodo::DateMonth) ); |
@@ -56,47 +56,49 @@ bool OTodoAccessXML::load() { | |||
56 | return false; | 56 | return false; |
57 | 57 | ||
58 | element = element->firstChild(); | 58 | element = element->firstChild(); |
59 | 59 | ||
60 | while ( element ) { | 60 | while ( element ) { |
61 | if ( element->tagName() != QString::fromLatin1("Task") ) { | 61 | if ( element->tagName() != QString::fromLatin1("Task") ) { |
62 | element = element->nextChild(); | 62 | element = element->nextChild(); |
63 | continue; | 63 | continue; |
64 | } | 64 | } |
65 | /* here is the right element for a task */ | 65 | /* here is the right element for a task */ |
66 | OTodo ev = todo( &dict, element ); | 66 | OTodo ev = todo( &dict, element ); |
67 | m_events.insert( ev.uid(), ev ); | 67 | m_events.insert( ev.uid(), ev ); |
68 | 68 | ||
69 | element = element->nextChild(); | 69 | element = element->nextChild(); |
70 | } | 70 | } |
71 | }else { | 71 | }else { |
72 | qWarning("could not parse"); | 72 | // qWarning("could not parse"); |
73 | return false;; | 73 | return false;; |
74 | } | 74 | } |
75 | delete root; | 75 | delete root; |
76 | 76 | ||
77 | m_opened = true; | 77 | // qWarning("Access %d" + m_events.count() ); |
78 | qWarning("Access %d" + m_events.count() ); | ||
79 | return true; | 78 | return true; |
80 | } | 79 | } |
81 | bool OTodoAccessXML::reload() { | 80 | bool OTodoAccessXML::reload() { |
82 | return load(); | 81 | return load(); |
83 | } | 82 | } |
84 | bool OTodoAccessXML::save() { | 83 | bool OTodoAccessXML::save() { |
85 | if (!m_opened || !m_changed ) | 84 | // qWarning("saving"); |
85 | if (!m_opened || !m_changed ) { | ||
86 | // qWarning("not saving"); | ||
86 | return true; | 87 | return true; |
88 | } | ||
87 | QString strNewFile = m_file + ".new"; | 89 | QString strNewFile = m_file + ".new"; |
88 | QFile f( strNewFile ); | 90 | QFile f( strNewFile ); |
89 | if (!f.open( IO_WriteOnly|IO_Raw ) ) | 91 | if (!f.open( IO_WriteOnly|IO_Raw ) ) |
90 | return false; | 92 | return false; |
91 | 93 | ||
92 | int written; | 94 | int written; |
93 | QString out; | 95 | QString out; |
94 | out = "<!DOCTYPE Tasks>\n<Tasks>\n"; | 96 | out = "<!DOCTYPE Tasks>\n<Tasks>\n"; |
95 | 97 | ||
96 | // for all todos | 98 | // for all todos |
97 | QMap<int, OTodo>::Iterator it; | 99 | QMap<int, OTodo>::Iterator it; |
98 | for (it = m_events.begin(); it != m_events.end(); ++it ) { | 100 | for (it = m_events.begin(); it != m_events.end(); ++it ) { |
99 | out+= "<Task " + toString( (*it) ) + " />\n"; | 101 | out+= "<Task " + toString( (*it) ) + " />\n"; |
100 | QCString cstr = out.utf8(); | 102 | QCString cstr = out.utf8(); |
101 | written = f.writeBlock( cstr.data(), cstr.length() ); | 103 | written = f.writeBlock( cstr.data(), cstr.length() ); |
102 | 104 | ||
@@ -109,33 +111,33 @@ bool OTodoAccessXML::save() { | |||
109 | out = QString::null; | 111 | out = QString::null; |
110 | } | 112 | } |
111 | 113 | ||
112 | out += "</Tasks>"; | 114 | out += "</Tasks>"; |
113 | QCString cstr = out.utf8(); | 115 | QCString cstr = out.utf8(); |
114 | written = f.writeBlock( cstr.data(), cstr.length() ); | 116 | written = f.writeBlock( cstr.data(), cstr.length() ); |
115 | 117 | ||
116 | if ( written != (int)cstr.length() ) { | 118 | if ( written != (int)cstr.length() ) { |
117 | f.close(); | 119 | f.close(); |
118 | QFile::remove( strNewFile ); | 120 | QFile::remove( strNewFile ); |
119 | return false; | 121 | return false; |
120 | } | 122 | } |
121 | /* flush before renaming */ | 123 | /* flush before renaming */ |
122 | f.close(); | 124 | f.close(); |
123 | 125 | ||
124 | if( ::rename( strNewFile.latin1(), m_file.latin1() ) < 0 ) { | 126 | if( ::rename( strNewFile.latin1(), m_file.latin1() ) < 0 ) { |
125 | qWarning("error renaming"); | 127 | // qWarning("error renaming"); |
126 | QFile::remove( strNewFile ); | 128 | QFile::remove( strNewFile ); |
127 | } | 129 | } |
128 | 130 | ||
129 | m_changed = false; | 131 | m_changed = false; |
130 | return true; | 132 | return true; |
131 | } | 133 | } |
132 | QArray<int> OTodoAccessXML::allRecords()const { | 134 | QArray<int> OTodoAccessXML::allRecords()const { |
133 | QArray<int> ids( m_events.count() ); | 135 | QArray<int> ids( m_events.count() ); |
134 | QMap<int, OTodo>::ConstIterator it; | 136 | QMap<int, OTodo>::ConstIterator it; |
135 | int i = 0; | 137 | int i = 0; |
136 | 138 | ||
137 | for ( it = m_events.begin(); it != m_events.end(); ++it ) { | 139 | for ( it = m_events.begin(); it != m_events.end(); ++it ) { |
138 | ids[i] = it.key(); | 140 | ids[i] = it.key(); |
139 | i++; | 141 | i++; |
140 | } | 142 | } |
141 | return ids; | 143 | return ids; |
@@ -147,32 +149,33 @@ QArray<int> OTodoAccessXML::queryByExample( const OTodo&, int sort ) { | |||
147 | OTodo OTodoAccessXML::find( int uid )const { | 149 | OTodo OTodoAccessXML::find( int uid )const { |
148 | OTodo todo; | 150 | OTodo todo; |
149 | todo.setUid( 0 ); // isEmpty() | 151 | todo.setUid( 0 ); // isEmpty() |
150 | QMap<int, OTodo>::ConstIterator it = m_events.find( uid ); | 152 | QMap<int, OTodo>::ConstIterator it = m_events.find( uid ); |
151 | if ( it != m_events.end() ) | 153 | if ( it != m_events.end() ) |
152 | todo = it.data(); | 154 | todo = it.data(); |
153 | 155 | ||
154 | return todo; | 156 | return todo; |
155 | } | 157 | } |
156 | void OTodoAccessXML::clear() { | 158 | void OTodoAccessXML::clear() { |
157 | if (m_opened ) | 159 | if (m_opened ) |
158 | m_changed = true; | 160 | m_changed = true; |
159 | 161 | ||
160 | m_events.clear(); | 162 | m_events.clear(); |
161 | } | 163 | } |
162 | bool OTodoAccessXML::add( const OTodo& todo ) { | 164 | bool OTodoAccessXML::add( const OTodo& todo ) { |
165 | // qWarning("add"); | ||
163 | m_changed = true; | 166 | m_changed = true; |
164 | m_events.insert( todo.uid(), todo ); | 167 | m_events.insert( todo.uid(), todo ); |
165 | 168 | ||
166 | return true; | 169 | return true; |
167 | } | 170 | } |
168 | bool OTodoAccessXML::remove( int uid ) { | 171 | bool OTodoAccessXML::remove( int uid ) { |
169 | m_changed = true; | 172 | m_changed = true; |
170 | m_events.remove( uid ); | 173 | m_events.remove( uid ); |
171 | 174 | ||
172 | return true; | 175 | return true; |
173 | } | 176 | } |
174 | bool OTodoAccessXML::replace( const OTodo& todo) { | 177 | bool OTodoAccessXML::replace( const OTodo& todo) { |
175 | m_changed = true; | 178 | m_changed = true; |
176 | m_events.replace( todo.uid(), todo ); | 179 | m_events.replace( todo.uid(), todo ); |
177 | 180 | ||
178 | return true; | 181 | return true; |
@@ -204,44 +207,44 @@ QArray<int> OTodoAccessXML::overDue() { | |||
204 | int i = 0; | 207 | int i = 0; |
205 | 208 | ||
206 | QMap<int, OTodo>::Iterator it; | 209 | QMap<int, OTodo>::Iterator it; |
207 | for ( it = m_events.begin(); it != m_events.end(); ++it ) { | 210 | for ( it = m_events.begin(); it != m_events.end(); ++it ) { |
208 | if ( it.data().isOverdue() ) { | 211 | if ( it.data().isOverdue() ) { |
209 | ids[i] = it.key(); | 212 | ids[i] = it.key(); |
210 | i++; | 213 | i++; |
211 | } | 214 | } |
212 | } | 215 | } |
213 | ids.resize( i ); | 216 | ids.resize( i ); |
214 | return ids; | 217 | return ids; |
215 | } | 218 | } |
216 | 219 | ||
217 | 220 | ||
218 | /* private */ | 221 | /* private */ |
219 | OTodo OTodoAccessXML::todo( QAsciiDict<int>* dict, Opie::XMLElement* element)const { | 222 | OTodo OTodoAccessXML::todo( QAsciiDict<int>* dict, Opie::XMLElement* element)const { |
220 | qWarning("parse to do from XMLElement" ); | 223 | // qWarning("parse to do from XMLElement" ); |
221 | OTodo ev; | 224 | OTodo ev; |
222 | QMap<QString, QString> attributes = element->attributes(); | 225 | QMap<QString, QString> attributes = element->attributes(); |
223 | QMap<QString, QString>::Iterator it; | 226 | QMap<QString, QString>::Iterator it; |
224 | 227 | ||
225 | int *find=0; | 228 | int *find=0; |
226 | int day, month, year; | 229 | int day, month, year; |
227 | day = month = year = -1; | 230 | day = month = year = -1; |
228 | for ( it = attributes.begin(); it != attributes.end(); ++it ) { | 231 | for ( it = attributes.begin(); it != attributes.end(); ++it ) { |
229 | find = (*dict)[ it.key() ]; | 232 | find = (*dict)[ it.key() ]; |
230 | if (!find ) { | 233 | if (!find ) { |
231 | qWarning("Unknown option" + it.key() ); | 234 | // qWarning("Unknown option" + it.key() ); |
232 | ev.setCustomField( it.key(), it.data() ); | 235 | ev.setCustomField( it.key(), it.data() ); |
233 | continue; | 236 | continue; |
234 | } | 237 | } |
235 | 238 | ||
236 | switch( *find ) { | 239 | switch( *find ) { |
237 | case OTodo::Uid: | 240 | case OTodo::Uid: |
238 | ev.setUid( it.data().toInt() ); | 241 | ev.setUid( it.data().toInt() ); |
239 | break; | 242 | break; |
240 | case OTodo::Category: | 243 | case OTodo::Category: |
241 | ev.setCategories( ev.idsFromString( it.data() ) ); | 244 | ev.setCategories( ev.idsFromString( it.data() ) ); |
242 | break; | 245 | break; |
243 | case OTodo::HasDate: | 246 | case OTodo::HasDate: |
244 | ev.setHasDueDate( it.data().toInt() ); | 247 | ev.setHasDueDate( it.data().toInt() ); |
245 | break; | 248 | break; |
246 | case OTodo::Completed: | 249 | case OTodo::Completed: |
247 | ev.setCompleted( it.data().toInt() ); | 250 | ev.setCompleted( it.data().toInt() ); |
@@ -307,32 +310,33 @@ QString OTodoAccessXML::toString( const OTodo& ev )const { | |||
307 | QString str; | 310 | QString str; |
308 | 311 | ||
309 | str += "Completed=\"" + QString::number( ev.isCompleted() ) + "\" "; | 312 | str += "Completed=\"" + QString::number( ev.isCompleted() ) + "\" "; |
310 | str += "HasDate=\"" + QString::number( ev.hasDueDate() ) + "\" "; | 313 | str += "HasDate=\"" + QString::number( ev.hasDueDate() ) + "\" "; |
311 | str += "Priority=\"" + QString::number( ev.priority() ) + "\" "; | 314 | str += "Priority=\"" + QString::number( ev.priority() ) + "\" "; |
312 | str += "Progress=\"" + QString::number(ev.progress() ) + "\" "; | 315 | str += "Progress=\"" + QString::number(ev.progress() ) + "\" "; |
313 | 316 | ||
314 | str += "Categories=\"" + toString( ev.categories() ) + "\" "; | 317 | str += "Categories=\"" + toString( ev.categories() ) + "\" "; |
315 | str += "Description=\"" + Qtopia::escapeString( ev.description() ) + "\" "; | 318 | str += "Description=\"" + Qtopia::escapeString( ev.description() ) + "\" "; |
316 | str += "Summary=\"" + Qtopia::escapeString( ev.summary() ) + "\" "; | 319 | str += "Summary=\"" + Qtopia::escapeString( ev.summary() ) + "\" "; |
317 | 320 | ||
318 | if ( ev.hasDueDate() ) { | 321 | if ( ev.hasDueDate() ) { |
319 | str += "DateYear=\"" + QString::number( ev.dueDate().year() ) + "\" "; | 322 | str += "DateYear=\"" + QString::number( ev.dueDate().year() ) + "\" "; |
320 | str += "DateMonth=\"" + QString::number( ev.dueDate().month() ) + "\" "; | 323 | str += "DateMonth=\"" + QString::number( ev.dueDate().month() ) + "\" "; |
321 | str += "DateDay=\"" + QString::number( ev.dueDate().day() ) + "\" "; | 324 | str += "DateDay=\"" + QString::number( ev.dueDate().day() ) + "\" "; |
322 | } | 325 | } |
326 | // qWarning( "Uid %d", ev.uid() ); | ||
323 | str += "Uid=\"" + QString::number( ev.uid() ) + "\" "; | 327 | str += "Uid=\"" + QString::number( ev.uid() ) + "\" "; |
324 | 328 | ||
325 | // append the extra options | 329 | // append the extra options |
326 | /* FIXME Qtopia::Record this is currently not | 330 | /* FIXME Qtopia::Record this is currently not |
327 | * possible you can set custom fields | 331 | * possible you can set custom fields |
328 | * but don' iterate over the list | 332 | * but don' iterate over the list |
329 | * I may do #define private protected | 333 | * I may do #define private protected |
330 | * for this case - cough --zecke | 334 | * for this case - cough --zecke |
331 | */ | 335 | */ |
332 | /* | 336 | /* |
333 | QMap<QString, QString> extras = ev.extras(); | 337 | QMap<QString, QString> extras = ev.extras(); |
334 | QMap<QString, QString>::Iterator extIt; | 338 | QMap<QString, QString>::Iterator extIt; |
335 | for (extIt = extras.begin(); extIt != extras.end(); ++extIt ) | 339 | for (extIt = extras.begin(); extIt != extras.end(); ++extIt ) |
336 | str += extIt.key() + "=\"" + extIt.data() + "\" "; | 340 | str += extIt.key() + "=\"" + extIt.data() + "\" "; |
337 | */ | 341 | */ |
338 | // cross refernce | 342 | // cross refernce |
diff --git a/libopie2/opiepim/core/opimrecord.cpp b/libopie2/opiepim/core/opimrecord.cpp index 60cdbf3..62dc353 100644 --- a/libopie2/opiepim/core/opimrecord.cpp +++ b/libopie2/opiepim/core/opimrecord.cpp | |||
@@ -109,25 +109,26 @@ void OPimRecord::setRelations( const QString& app, QArray<int> ids ) { | |||
109 | QString OPimRecord::crossToString()const { | 109 | QString OPimRecord::crossToString()const { |
110 | QString str; | 110 | QString str; |
111 | QMap<QString, QArray<int> >::ConstIterator it; | 111 | QMap<QString, QArray<int> >::ConstIterator it; |
112 | for (it = m_relations.begin(); it != m_relations.end(); ++it ) { | 112 | for (it = m_relations.begin(); it != m_relations.end(); ++it ) { |
113 | QArray<int> id = it.data(); | 113 | QArray<int> id = it.data(); |
114 | for ( uint i = 0; i < id.size(); ++i ) { | 114 | for ( uint i = 0; i < id.size(); ++i ) { |
115 | str += it.key() + "," + QString::number( i ) + ";"; | 115 | str += it.key() + "," + QString::number( i ) + ";"; |
116 | } | 116 | } |
117 | } | 117 | } |
118 | str = str.remove( str.length()-1, 1); // strip the ; | 118 | str = str.remove( str.length()-1, 1); // strip the ; |
119 | //qWarning("IDS " + str ); | 119 | //qWarning("IDS " + str ); |
120 | 120 | ||
121 | return str; | 121 | return str; |
122 | } | 122 | } |
123 | /* if uid = 1 assign a new one */ | 123 | /* if uid = 1 assign a new one */ |
124 | void OPimRecord::setUid( int uid ) { | 124 | void OPimRecord::setUid( int uid ) { |
125 | 125 | // qWarning("setting uid" ); | |
126 | if ( uid == 1) | 126 | if ( uid == 1) |
127 | uid = uidGen().generate(); | 127 | uid = uidGen().generate(); |
128 | 128 | ||
129 | // qWarning(" uid %d", uid); | ||
129 | Qtopia::Record::setUid( uid ); | 130 | Qtopia::Record::setUid( uid ); |
130 | }; | 131 | }; |
131 | Qtopia::UidGen &OPimRecord::uidGen() { | 132 | Qtopia::UidGen &OPimRecord::uidGen() { |
132 | return m_uidGen; | 133 | return m_uidGen; |
133 | } | 134 | } |
diff --git a/libopie2/opiepim/core/otodoaccess.cpp b/libopie2/opiepim/core/otodoaccess.cpp index a65cf5c..8ec09bc 100644 --- a/libopie2/opiepim/core/otodoaccess.cpp +++ b/libopie2/opiepim/core/otodoaccess.cpp | |||
@@ -2,33 +2,33 @@ | |||
2 | 2 | ||
3 | #include <qpe/alarmserver.h> | 3 | #include <qpe/alarmserver.h> |
4 | 4 | ||
5 | #include "otodoaccessxml.h" | 5 | #include "otodoaccessxml.h" |
6 | #include "otodoaccess.h" | 6 | #include "otodoaccess.h" |
7 | 7 | ||
8 | 8 | ||
9 | OTodoAccess::OTodoAccess( OTodoAccessBackend* end ) | 9 | OTodoAccess::OTodoAccess( OTodoAccessBackend* end ) |
10 | : QObject(), OPimAccessTemplate<OTodo>( end ), m_todoBackEnd( end ) | 10 | : QObject(), OPimAccessTemplate<OTodo>( end ), m_todoBackEnd( end ) |
11 | { | 11 | { |
12 | if (end == 0l ) | 12 | if (end == 0l ) |
13 | m_todoBackEnd = new OTodoAccessXML( "Todolist" ); | 13 | m_todoBackEnd = new OTodoAccessXML( "Todolist" ); |
14 | 14 | ||
15 | setBackEnd( m_todoBackEnd ); | 15 | setBackEnd( m_todoBackEnd ); |
16 | } | 16 | } |
17 | OTodoAccess::~OTodoAccess() { | 17 | OTodoAccess::~OTodoAccess() { |
18 | qWarning("~OTodoAccess"); | 18 | // qWarning("~OTodoAccess"); |
19 | } | 19 | } |
20 | void OTodoAccess::mergeWith( const QValueList<OTodo>& list ) { | 20 | void OTodoAccess::mergeWith( const QValueList<OTodo>& list ) { |
21 | QValueList<OTodo>::ConstIterator it; | 21 | QValueList<OTodo>::ConstIterator it; |
22 | for ( it = list.begin(); it != list.end(); ++it ) { | 22 | for ( it = list.begin(); it != list.end(); ++it ) { |
23 | replace( (*it) ); | 23 | replace( (*it) ); |
24 | } | 24 | } |
25 | } | 25 | } |
26 | OTodoAccess::List OTodoAccess::effectiveToDos( const QDate& start, | 26 | OTodoAccess::List OTodoAccess::effectiveToDos( const QDate& start, |
27 | const QDate& end, | 27 | const QDate& end, |
28 | bool includeNoDates ) { | 28 | bool includeNoDates ) { |
29 | QArray<int> ints = m_todoBackEnd->effectiveToDos( start, end, includeNoDates ); | 29 | QArray<int> ints = m_todoBackEnd->effectiveToDos( start, end, includeNoDates ); |
30 | 30 | ||
31 | List lis( ints, this ); | 31 | List lis( ints, this ); |
32 | return lis; | 32 | return lis; |
33 | } | 33 | } |
34 | OTodoAccess::List OTodoAccess::effectiveToDos( const QDate& start, | 34 | OTodoAccess::List OTodoAccess::effectiveToDos( const QDate& start, |
@@ -50,22 +50,22 @@ void OTodoAccess::addAlarm( const OTodo& event) { | |||
50 | if ( schedule > now ){ | 50 | if ( schedule > now ){ |
51 | AlarmServer::addAlarm( schedule, | 51 | AlarmServer::addAlarm( schedule, |
52 | "QPE/Application/todolist", | 52 | "QPE/Application/todolist", |
53 | "alarm(QDateTime,int)", event.uid() ); | 53 | "alarm(QDateTime,int)", event.uid() ); |
54 | 54 | ||
55 | } | 55 | } |
56 | } | 56 | } |
57 | void OTodoAccess::delAlarm( int uid) { | 57 | void OTodoAccess::delAlarm( int uid) { |
58 | 58 | ||
59 | QDateTime schedule; // Create null DateTime | 59 | QDateTime schedule; // Create null DateTime |
60 | 60 | ||
61 | // I hope this will remove all scheduled alarms | 61 | // I hope this will remove all scheduled alarms |
62 | // with the given uid !? | 62 | // with the given uid !? |
63 | // If not: I have to rethink how to remove already | 63 | // If not: I have to rethink how to remove already |
64 | // scheduled events... (se) | 64 | // scheduled events... (se) |
65 | // it should be fine -zecke | 65 | // it should be fine -zecke |
66 | qWarning("Removing alarm for event with uid %d", uid ); | 66 | // qWarning("Removing alarm for event with uid %d", uid ); |
67 | AlarmServer::deleteAlarm( schedule , | 67 | AlarmServer::deleteAlarm( schedule , |
68 | "QPE/Application/todolist", | 68 | "QPE/Application/todolist", |
69 | "alarm(QDateTime,int)", uid ); | 69 | "alarm(QDateTime,int)", uid ); |
70 | } | 70 | } |
71 | 71 | ||
diff --git a/libopie2/opiepim/orecordlist.h b/libopie2/opiepim/orecordlist.h index 36728b8..1795938 100644 --- a/libopie2/opiepim/orecordlist.h +++ b/libopie2/opiepim/orecordlist.h | |||
@@ -58,32 +58,34 @@ private: | |||
58 | class IteratorPrivate; | 58 | class IteratorPrivate; |
59 | IteratorPrivate *d; | 59 | IteratorPrivate *d; |
60 | }; | 60 | }; |
61 | /** | 61 | /** |
62 | * The recordlist used as a return type | 62 | * The recordlist used as a return type |
63 | * from OPimAccessTemplate | 63 | * from OPimAccessTemplate |
64 | */ | 64 | */ |
65 | template <class T = OPimRecord > | 65 | template <class T = OPimRecord > |
66 | class ORecordList { | 66 | class ORecordList { |
67 | public: | 67 | public: |
68 | typedef OTemplateBase<T> Base; | 68 | typedef OTemplateBase<T> Base; |
69 | typedef ORecordListIterator<T> Iterator; | 69 | typedef ORecordListIterator<T> Iterator; |
70 | 70 | ||
71 | /** | 71 | /** |
72 | * c'tor | 72 | * c'tor |
73 | */ | 73 | */ |
74 | ORecordList () { | ||
75 | } | ||
74 | ORecordList( const QArray<int>& ids, | 76 | ORecordList( const QArray<int>& ids, |
75 | const Base* ); | 77 | const Base* ); |
76 | ~ORecordList(); | 78 | ~ORecordList(); |
77 | 79 | ||
78 | /** | 80 | /** |
79 | * the first iterator | 81 | * the first iterator |
80 | */ | 82 | */ |
81 | Iterator begin(); | 83 | Iterator begin(); |
82 | 84 | ||
83 | /** | 85 | /** |
84 | * the end | 86 | * the end |
85 | */ | 87 | */ |
86 | Iterator end(); | 88 | Iterator end(); |
87 | /* | 89 | /* |
88 | ConstIterator begin()const; | 90 | ConstIterator begin()const; |
89 | ConstIterator end()const; | 91 | ConstIterator end()const; |
diff --git a/libopie2/opiepim/otodo.cpp b/libopie2/opiepim/otodo.cpp index cc46b21..6dd4c0e 100644 --- a/libopie2/opiepim/otodo.cpp +++ b/libopie2/opiepim/otodo.cpp | |||
@@ -148,33 +148,33 @@ void OTodo::setCompleted( bool completed ) | |||
148 | { | 148 | { |
149 | changeOrModify(); | 149 | changeOrModify(); |
150 | data->isCompleted = completed; | 150 | data->isCompleted = completed; |
151 | } | 151 | } |
152 | void OTodo::setHasDueDate( bool hasDate ) | 152 | void OTodo::setHasDueDate( bool hasDate ) |
153 | { | 153 | { |
154 | changeOrModify(); | 154 | changeOrModify(); |
155 | data->hasDate = hasDate; | 155 | data->hasDate = hasDate; |
156 | } | 156 | } |
157 | void OTodo::setHasAlarmDateTime( bool hasAlarmDateTime ) | 157 | void OTodo::setHasAlarmDateTime( bool hasAlarmDateTime ) |
158 | { | 158 | { |
159 | changeOrModify(); | 159 | changeOrModify(); |
160 | data->hasAlarmDateTime = hasAlarmDateTime; | 160 | data->hasAlarmDateTime = hasAlarmDateTime; |
161 | } | 161 | } |
162 | void OTodo::setDescription(const QString &desc ) | 162 | void OTodo::setDescription(const QString &desc ) |
163 | { | 163 | { |
164 | qWarning( "desc " + desc ); | 164 | // qWarning( "desc " + desc ); |
165 | changeOrModify(); | 165 | changeOrModify(); |
166 | data->desc = Qtopia::simplifyMultiLineSpace(desc ); | 166 | data->desc = Qtopia::simplifyMultiLineSpace(desc ); |
167 | } | 167 | } |
168 | void OTodo::setSummary( const QString& sum ) | 168 | void OTodo::setSummary( const QString& sum ) |
169 | { | 169 | { |
170 | changeOrModify(); | 170 | changeOrModify(); |
171 | data->sum = sum; | 171 | data->sum = sum; |
172 | } | 172 | } |
173 | void OTodo::setPriority(int prio ) | 173 | void OTodo::setPriority(int prio ) |
174 | { | 174 | { |
175 | changeOrModify(); | 175 | changeOrModify(); |
176 | data->priority = prio; | 176 | data->priority = prio; |
177 | } | 177 | } |
178 | void OTodo::setDueDate( QDate date ) | 178 | void OTodo::setDueDate( QDate date ) |
179 | { | 179 | { |
180 | changeOrModify(); | 180 | changeOrModify(); |
@@ -305,33 +305,33 @@ bool OTodo::operator==(const OTodo &toDoEvent )const | |||
305 | if ( data->alarmDateTime != toDoEvent.data->alarmDateTime ) | 305 | if ( data->alarmDateTime != toDoEvent.data->alarmDateTime ) |
306 | return false; | 306 | return false; |
307 | 307 | ||
308 | return OPimRecord::operator==( toDoEvent ); | 308 | return OPimRecord::operator==( toDoEvent ); |
309 | } | 309 | } |
310 | void OTodo::deref() { | 310 | void OTodo::deref() { |
311 | 311 | ||
312 | // qWarning("deref in ToDoEvent"); | 312 | // qWarning("deref in ToDoEvent"); |
313 | if ( data->deref() ) { | 313 | if ( data->deref() ) { |
314 | // qWarning("deleting"); | 314 | // qWarning("deleting"); |
315 | delete data; | 315 | delete data; |
316 | data= 0; | 316 | data= 0; |
317 | } | 317 | } |
318 | } | 318 | } |
319 | OTodo &OTodo::operator=(const OTodo &item ) | 319 | OTodo &OTodo::operator=(const OTodo &item ) |
320 | { | 320 | { |
321 | // OPimRecord::operator=( item ); | 321 | OPimRecord::operator=( item ); |
322 | //qWarning("operator= ref "); | 322 | //qWarning("operator= ref "); |
323 | item.data->ref(); | 323 | item.data->ref(); |
324 | deref(); | 324 | deref(); |
325 | data = item.data; | 325 | data = item.data; |
326 | 326 | ||
327 | return *this; | 327 | return *this; |
328 | } | 328 | } |
329 | 329 | ||
330 | QMap<int, QString> OTodo::toMap() const { | 330 | QMap<int, QString> OTodo::toMap() const { |
331 | QMap<int, QString> map; | 331 | QMap<int, QString> map; |
332 | 332 | ||
333 | map.insert( Uid, QString::number( uid() ) ); | 333 | map.insert( Uid, QString::number( uid() ) ); |
334 | map.insert( Category, idsToString( categories() ) ); | 334 | map.insert( Category, idsToString( categories() ) ); |
335 | map.insert( HasDate, QString::number( data->hasDate ) ); | 335 | map.insert( HasDate, QString::number( data->hasDate ) ); |
336 | map.insert( Completed, QString::number( data->isCompleted ) ); | 336 | map.insert( Completed, QString::number( data->isCompleted ) ); |
337 | map.insert( Description, data->desc ); | 337 | map.insert( Description, data->desc ); |