author | zecke <zecke> | 2002-09-23 21:38:23 (UTC) |
---|---|---|
committer | zecke <zecke> | 2002-09-23 21:38:23 (UTC) |
commit | e0b04701b3c9182ba22f56e329f98c57af4e1fe2 (patch) (unidiff) | |
tree | d5fa6fbae48d61aca7fefc09375fdcaf99ef4cb5 /libopie/pim | |
parent | 47e87e10fada298a1027cf20d4d7f31a66dc1359 (diff) | |
download | opie-e0b04701b3c9182ba22f56e329f98c57af4e1fe2.zip opie-e0b04701b3c9182ba22f56e329f98c57af4e1fe2.tar.gz opie-e0b04701b3c9182ba22f56e329f98c57af4e1fe2.tar.bz2 |
Updates
-rw-r--r-- | libopie/pim/opimrecord.cpp | 3 | ||||
-rw-r--r-- | libopie/pim/orecordlist.h | 2 | ||||
-rw-r--r-- | libopie/pim/otodo.cpp | 4 | ||||
-rw-r--r-- | libopie/pim/otodoaccess.cpp | 4 | ||||
-rw-r--r-- | libopie/pim/otodoaccessxml.cpp | 20 |
5 files changed, 20 insertions, 13 deletions
diff --git a/libopie/pim/opimrecord.cpp b/libopie/pim/opimrecord.cpp index 60cdbf3..62dc353 100644 --- a/libopie/pim/opimrecord.cpp +++ b/libopie/pim/opimrecord.cpp | |||
@@ -122,10 +122,11 @@ QString OPimRecord::crossToString()const { | |||
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() { |
diff --git a/libopie/pim/orecordlist.h b/libopie/pim/orecordlist.h index 36728b8..1795938 100644 --- a/libopie/pim/orecordlist.h +++ b/libopie/pim/orecordlist.h | |||
@@ -71,6 +71,8 @@ public: | |||
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(); |
diff --git a/libopie/pim/otodo.cpp b/libopie/pim/otodo.cpp index cc46b21..6dd4c0e 100644 --- a/libopie/pim/otodo.cpp +++ b/libopie/pim/otodo.cpp | |||
@@ -161,7 +161,7 @@ void OTodo::setHasAlarmDateTime( bool 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 | } |
@@ -318,7 +318,7 @@ void OTodo::deref() { | |||
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(); |
diff --git a/libopie/pim/otodoaccess.cpp b/libopie/pim/otodoaccess.cpp index a65cf5c..8ec09bc 100644 --- a/libopie/pim/otodoaccess.cpp +++ b/libopie/pim/otodoaccess.cpp | |||
@@ -15,7 +15,7 @@ OTodoAccess::OTodoAccess( OTodoAccessBackend* end ) | |||
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; |
@@ -63,7 +63,7 @@ void OTodoAccess::delAlarm( int 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 ); |
diff --git a/libopie/pim/otodoaccessxml.cpp b/libopie/pim/otodoaccessxml.cpp index 3a72881..5fe733c 100644 --- a/libopie/pim/otodoaccessxml.cpp +++ b/libopie/pim/otodoaccessxml.cpp | |||
@@ -21,7 +21,7 @@ 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 | /* |
@@ -69,21 +69,23 @@ bool OTodoAccessXML::load() { | |||
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 ) ) |
@@ -122,7 +124,7 @@ bool OTodoAccessXML::save() { | |||
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 | ||
@@ -160,6 +162,7 @@ void OTodoAccessXML::clear() { | |||
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 | ||
@@ -217,7 +220,7 @@ QArray<int> OTodoAccessXML::overDue() { | |||
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; |
@@ -228,7 +231,7 @@ OTodo OTodoAccessXML::todo( QAsciiDict<int>* dict, Opie::XMLElement* element)con | |||
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 | } |
@@ -320,6 +323,7 @@ QString OTodoAccessXML::toString( const OTodo& ev )const { | |||
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 |