summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--libopie/pim/orecordlist.h12
-rw-r--r--libopie/pim/otodo.cpp25
-rw-r--r--libopie/pim/otodoaccessxml.cpp2
-rw-r--r--libopie2/opiepim/backend/otodoaccessxml.cpp2
-rw-r--r--libopie2/opiepim/orecordlist.h12
-rw-r--r--libopie2/opiepim/otodo.cpp25
6 files changed, 42 insertions, 36 deletions
diff --git a/libopie/pim/orecordlist.h b/libopie/pim/orecordlist.h
index 75bb33c..36728b8 100644
--- a/libopie/pim/orecordlist.h
+++ b/libopie/pim/orecordlist.h
@@ -37,13 +37,13 @@ public:
37 ORecordListIterator &operator=(const ORecordListIterator& ); 37 ORecordListIterator &operator=(const ORecordListIterator& );
38 38
39 /** 39 /**
40 * a * operator ;) 40 * a * operator ;)
41 * use it like this T = (*it); 41 * use it like this T = (*it);
42 */ 42 */
43 T &operator*(); 43 T operator*();
44 ORecordListIterator &operator++(); 44 ORecordListIterator &operator++();
45 ORecordListIterator &operator--(); 45 ORecordListIterator &operator--();
46 46
47 bool operator==( const ORecordListIterator& it ); 47 bool operator==( const ORecordListIterator& it );
48 bool operator!=( const ORecordListIterator& it ); 48 bool operator!=( const ORecordListIterator& it );
49 49
@@ -96,21 +96,22 @@ private:
96/* ok now implement it */ 96/* ok now implement it */
97template <class T> 97template <class T>
98ORecordListIterator<T>::ORecordListIterator() { 98ORecordListIterator<T>::ORecordListIterator() {
99 m_current = 0; 99 m_current = 0;
100 m_temp = 0l; 100 m_temp = 0l;
101 m_end = true; 101 m_end = true;
102 m_record = T();
102} 103}
103template <class T> 104template <class T>
104ORecordListIterator<T>::~ORecordListIterator() { 105ORecordListIterator<T>::~ORecordListIterator() {
105/* nothing to delete */ 106/* nothing to delete */
106} 107}
107 108
108template <class T> 109template <class T>
109ORecordListIterator<T>::ORecordListIterator( const ORecordListIterator<T>& it) { 110ORecordListIterator<T>::ORecordListIterator( const ORecordListIterator<T>& it) {
110 qWarning("ORecordListIterator"); 111// qWarning("ORecordListIterator copy c'tor");
111 m_uids = it.m_uids; 112 m_uids = it.m_uids;
112 m_current = it.m_current; 113 m_current = it.m_current;
113 m_temp = it.m_temp; 114 m_temp = it.m_temp;
114 m_end = it.m_end; 115 m_end = it.m_end;
115 m_record = it.m_record; 116 m_record = it.m_record;
116} 117}
@@ -118,20 +119,20 @@ ORecordListIterator<T>::ORecordListIterator( const ORecordListIterator<T>& it) {
118template <class T> 119template <class T>
119ORecordListIterator<T> &ORecordListIterator<T>::operator=( const ORecordListIterator<T>& it) { 120ORecordListIterator<T> &ORecordListIterator<T>::operator=( const ORecordListIterator<T>& it) {
120 m_uids = it.m_uids; 121 m_uids = it.m_uids;
121 m_current = it.m_current; 122 m_current = it.m_current;
122 m_temp = it.m_temp; 123 m_temp = it.m_temp;
123 m_end = it.m_end; 124 m_end = it.m_end;
124 m_record = it.m_record; 125// m_record = it.m_record;
125 126
126 return *this; 127 return *this;
127} 128}
128 129
129template <class T> 130template <class T>
130T &ORecordListIterator<T>::operator*() { 131T ORecordListIterator<T>::operator*() {
131 qWarning("operator* %d %d", m_current, m_uids[m_current] ); 132// qWarning("operator* %d %d", m_current, m_uids[m_current] );
132 if (!m_end ) 133 if (!m_end )
133 m_record = m_temp->find( m_uids[m_current] ); 134 m_record = m_temp->find( m_uids[m_current] );
134 else 135 else
135 m_record = T(); 136 m_record = T();
136 137
137 return m_record; 138 return m_record;
@@ -190,13 +191,12 @@ ORecordList<T>::ORecordList( const QArray<int>& ids,
190template <class T> 191template <class T>
191ORecordList<T>::~ORecordList() { 192ORecordList<T>::~ORecordList() {
192/* nothing to do here */ 193/* nothing to do here */
193} 194}
194template <class T> 195template <class T>
195ORecordList<T>::Iterator ORecordList<T>::begin() { 196ORecordList<T>::Iterator ORecordList<T>::begin() {
196 qWarning("ORecordList::begin");
197 Iterator it( m_ids, m_acc ); 197 Iterator it( m_ids, m_acc );
198 return it; 198 return it;
199} 199}
200template <class T> 200template <class T>
201ORecordList<T>::Iterator ORecordList<T>::end() { 201ORecordList<T>::Iterator ORecordList<T>::end() {
202 Iterator it( m_ids, m_acc ); 202 Iterator it( m_ids, m_acc );
diff --git a/libopie/pim/otodo.cpp b/libopie/pim/otodo.cpp
index b3c14e6..cc46b21 100644
--- a/libopie/pim/otodo.cpp
+++ b/libopie/pim/otodo.cpp
@@ -33,31 +33,32 @@ struct OTodo::OTodoData : public QShared {
33}; 33};
34 34
35OTodo::OTodo(const OTodo &event ) 35OTodo::OTodo(const OTodo &event )
36 : OPimRecord( event ), data( event.data ) 36 : OPimRecord( event ), data( event.data )
37{ 37{
38 data->ref(); 38 data->ref();
39 qWarning("ref up"); 39// qWarning("ref up");
40} 40}
41OTodo::~OTodo() { 41OTodo::~OTodo() {
42 qWarning("~OTodo " + data->sum ); 42
43// qWarning("~OTodo " );
43 if ( data->deref() ) { 44 if ( data->deref() ) {
44 qWarning("OTodo::dereffing"); 45// qWarning("OTodo::dereffing");
45 delete data; 46 delete data;
46 data = 0l; 47 data = 0l;
47 } 48 }
48} 49}
49OTodo::OTodo(bool completed, int priority, 50OTodo::OTodo(bool completed, int priority,
50 const QArray<int> &category, 51 const QArray<int> &category,
51 const QString& summary, 52 const QString& summary,
52 const QString &description, 53 const QString &description,
53 ushort progress, 54 ushort progress,
54 bool hasDate, QDate date, int uid ) 55 bool hasDate, QDate date, int uid )
55 : OPimRecord( uid ) 56 : OPimRecord( uid )
56{ 57{
57 qWarning("OTodoData " + summary); 58// qWarning("OTodoData " + summary);
58 setCategories( category ); 59 setCategories( category );
59 60
60 data = new OTodoData; 61 data = new OTodoData;
61 62
62 data->date = date; 63 data->date = date;
63 data->isCompleted = completed; 64 data->isCompleted = completed;
@@ -74,18 +75,18 @@ OTodo::OTodo(bool completed, int priority,
74 const QString& summary, 75 const QString& summary,
75 const QString &description, 76 const QString &description,
76 ushort progress, 77 ushort progress,
77 bool hasDate, QDate date, int uid ) 78 bool hasDate, QDate date, int uid )
78 : OPimRecord( uid ) 79 : OPimRecord( uid )
79{ 80{
80 qWarning("OTodoData" + summary); 81// qWarning("OTodoData" + summary);
81 setCategories( idsFromString( category.join(";") ) ); 82 setCategories( idsFromString( category.join(";") ) );
82 83
83 data = new OTodoData; 84 data = new OTodoData;
84 data->date = date;
85 85
86 data->date = date;
86 data->isCompleted = completed; 87 data->isCompleted = completed;
87 data->hasDate = hasDate; 88 data->hasDate = hasDate;
88 data->priority = priority; 89 data->priority = priority;
89 data->sum = summary; 90 data->sum = summary;
90 data->prog = progress; 91 data->prog = progress;
91 data->desc = Qtopia::simplifyMultiLineSpace(description ); 92 data->desc = Qtopia::simplifyMultiLineSpace(description );
@@ -157,12 +158,13 @@ void OTodo::setHasAlarmDateTime( bool hasAlarmDateTime )
157{ 158{
158 changeOrModify(); 159 changeOrModify();
159 data->hasAlarmDateTime = hasAlarmDateTime; 160 data->hasAlarmDateTime = hasAlarmDateTime;
160} 161}
161void OTodo::setDescription(const QString &desc ) 162void OTodo::setDescription(const QString &desc )
162{ 163{
164 qWarning( "desc " + desc );
163 changeOrModify(); 165 changeOrModify();
164 data->desc = Qtopia::simplifyMultiLineSpace(desc ); 166 data->desc = Qtopia::simplifyMultiLineSpace(desc );
165} 167}
166void OTodo::setSummary( const QString& sum ) 168void OTodo::setSummary( const QString& sum )
167{ 169{
168 changeOrModify(); 170 changeOrModify();
@@ -304,25 +306,26 @@ bool OTodo::operator==(const OTodo &toDoEvent )const
304 return false; 306 return false;
305 307
306 return OPimRecord::operator==( toDoEvent ); 308 return OPimRecord::operator==( toDoEvent );
307} 309}
308void OTodo::deref() { 310void OTodo::deref() {
309 311
310 //qWarning("deref in ToDoEvent"); 312// qWarning("deref in ToDoEvent");
311 if ( data->deref() ) { 313 if ( data->deref() ) {
312 //qWarning("deleting"); 314// qWarning("deleting");
313 delete data; 315 delete data;
314 d= 0; 316 data= 0;
315 } 317 }
316} 318}
317OTodo &OTodo::operator=(const OTodo &item ) 319OTodo &OTodo::operator=(const OTodo &item )
318{ 320{
319 OPimRecord::operator=( item ); 321// OPimRecord::operator=( item );
320 //qWarning("operator= ref "); 322 //qWarning("operator= ref ");
321 item.data->ref(); 323 item.data->ref();
322 deref(); 324 deref();
325 data = item.data;
323 326
324 return *this; 327 return *this;
325} 328}
326 329
327QMap<int, QString> OTodo::toMap() const { 330QMap<int, QString> OTodo::toMap() const {
328 QMap<int, QString> map; 331 QMap<int, QString> map;
@@ -352,13 +355,13 @@ QMap<QString, QString> OTodo::toExtraMap()const {
352 * change or modify looks at the ref count and either 355 * change or modify looks at the ref count and either
353 * creates a new QShared Object or it can modify it 356 * creates a new QShared Object or it can modify it
354 * right in place 357 * right in place
355 */ 358 */
356void OTodo::changeOrModify() { 359void OTodo::changeOrModify() {
357 if ( data->count != 1 ) { 360 if ( data->count != 1 ) {
358 qWarning("changeOrModify"); 361// qWarning("changeOrModify");
359 data->deref(); 362 data->deref();
360 OTodoData* d2 = new OTodoData(); 363 OTodoData* d2 = new OTodoData();
361 copy(data, d2 ); 364 copy(data, d2 );
362 data = d2; 365 data = d2;
363 } 366 }
364} 367}
diff --git a/libopie/pim/otodoaccessxml.cpp b/libopie/pim/otodoaccessxml.cpp
index 21756c9..3a72881 100644
--- a/libopie/pim/otodoaccessxml.cpp
+++ b/libopie/pim/otodoaccessxml.cpp
@@ -65,20 +65,20 @@ bool OTodoAccessXML::load() {
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 return true;
72 }else { 71 }else {
73 qWarning("could not parse"); 72 qWarning("could not parse");
74 return false;; 73 return false;;
75 } 74 }
76 delete root; 75 delete root;
77 76
78 m_opened = true; 77 m_opened = true;
78 qWarning("Access %d" + m_events.count() );
79 return true; 79 return true;
80} 80}
81bool OTodoAccessXML::reload() { 81bool OTodoAccessXML::reload() {
82 return load(); 82 return load();
83} 83}
84bool OTodoAccessXML::save() { 84bool OTodoAccessXML::save() {
diff --git a/libopie2/opiepim/backend/otodoaccessxml.cpp b/libopie2/opiepim/backend/otodoaccessxml.cpp
index 21756c9..3a72881 100644
--- a/libopie2/opiepim/backend/otodoaccessxml.cpp
+++ b/libopie2/opiepim/backend/otodoaccessxml.cpp
@@ -65,20 +65,20 @@ bool OTodoAccessXML::load() {
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 return true;
72 }else { 71 }else {
73 qWarning("could not parse"); 72 qWarning("could not parse");
74 return false;; 73 return false;;
75 } 74 }
76 delete root; 75 delete root;
77 76
78 m_opened = true; 77 m_opened = true;
78 qWarning("Access %d" + m_events.count() );
79 return true; 79 return true;
80} 80}
81bool OTodoAccessXML::reload() { 81bool OTodoAccessXML::reload() {
82 return load(); 82 return load();
83} 83}
84bool OTodoAccessXML::save() { 84bool OTodoAccessXML::save() {
diff --git a/libopie2/opiepim/orecordlist.h b/libopie2/opiepim/orecordlist.h
index 75bb33c..36728b8 100644
--- a/libopie2/opiepim/orecordlist.h
+++ b/libopie2/opiepim/orecordlist.h
@@ -37,13 +37,13 @@ public:
37 ORecordListIterator &operator=(const ORecordListIterator& ); 37 ORecordListIterator &operator=(const ORecordListIterator& );
38 38
39 /** 39 /**
40 * a * operator ;) 40 * a * operator ;)
41 * use it like this T = (*it); 41 * use it like this T = (*it);
42 */ 42 */
43 T &operator*(); 43 T operator*();
44 ORecordListIterator &operator++(); 44 ORecordListIterator &operator++();
45 ORecordListIterator &operator--(); 45 ORecordListIterator &operator--();
46 46
47 bool operator==( const ORecordListIterator& it ); 47 bool operator==( const ORecordListIterator& it );
48 bool operator!=( const ORecordListIterator& it ); 48 bool operator!=( const ORecordListIterator& it );
49 49
@@ -96,21 +96,22 @@ private:
96/* ok now implement it */ 96/* ok now implement it */
97template <class T> 97template <class T>
98ORecordListIterator<T>::ORecordListIterator() { 98ORecordListIterator<T>::ORecordListIterator() {
99 m_current = 0; 99 m_current = 0;
100 m_temp = 0l; 100 m_temp = 0l;
101 m_end = true; 101 m_end = true;
102 m_record = T();
102} 103}
103template <class T> 104template <class T>
104ORecordListIterator<T>::~ORecordListIterator() { 105ORecordListIterator<T>::~ORecordListIterator() {
105/* nothing to delete */ 106/* nothing to delete */
106} 107}
107 108
108template <class T> 109template <class T>
109ORecordListIterator<T>::ORecordListIterator( const ORecordListIterator<T>& it) { 110ORecordListIterator<T>::ORecordListIterator( const ORecordListIterator<T>& it) {
110 qWarning("ORecordListIterator"); 111// qWarning("ORecordListIterator copy c'tor");
111 m_uids = it.m_uids; 112 m_uids = it.m_uids;
112 m_current = it.m_current; 113 m_current = it.m_current;
113 m_temp = it.m_temp; 114 m_temp = it.m_temp;
114 m_end = it.m_end; 115 m_end = it.m_end;
115 m_record = it.m_record; 116 m_record = it.m_record;
116} 117}
@@ -118,20 +119,20 @@ ORecordListIterator<T>::ORecordListIterator( const ORecordListIterator<T>& it) {
118template <class T> 119template <class T>
119ORecordListIterator<T> &ORecordListIterator<T>::operator=( const ORecordListIterator<T>& it) { 120ORecordListIterator<T> &ORecordListIterator<T>::operator=( const ORecordListIterator<T>& it) {
120 m_uids = it.m_uids; 121 m_uids = it.m_uids;
121 m_current = it.m_current; 122 m_current = it.m_current;
122 m_temp = it.m_temp; 123 m_temp = it.m_temp;
123 m_end = it.m_end; 124 m_end = it.m_end;
124 m_record = it.m_record; 125// m_record = it.m_record;
125 126
126 return *this; 127 return *this;
127} 128}
128 129
129template <class T> 130template <class T>
130T &ORecordListIterator<T>::operator*() { 131T ORecordListIterator<T>::operator*() {
131 qWarning("operator* %d %d", m_current, m_uids[m_current] ); 132// qWarning("operator* %d %d", m_current, m_uids[m_current] );
132 if (!m_end ) 133 if (!m_end )
133 m_record = m_temp->find( m_uids[m_current] ); 134 m_record = m_temp->find( m_uids[m_current] );
134 else 135 else
135 m_record = T(); 136 m_record = T();
136 137
137 return m_record; 138 return m_record;
@@ -190,13 +191,12 @@ ORecordList<T>::ORecordList( const QArray<int>& ids,
190template <class T> 191template <class T>
191ORecordList<T>::~ORecordList() { 192ORecordList<T>::~ORecordList() {
192/* nothing to do here */ 193/* nothing to do here */
193} 194}
194template <class T> 195template <class T>
195ORecordList<T>::Iterator ORecordList<T>::begin() { 196ORecordList<T>::Iterator ORecordList<T>::begin() {
196 qWarning("ORecordList::begin");
197 Iterator it( m_ids, m_acc ); 197 Iterator it( m_ids, m_acc );
198 return it; 198 return it;
199} 199}
200template <class T> 200template <class T>
201ORecordList<T>::Iterator ORecordList<T>::end() { 201ORecordList<T>::Iterator ORecordList<T>::end() {
202 Iterator it( m_ids, m_acc ); 202 Iterator it( m_ids, m_acc );
diff --git a/libopie2/opiepim/otodo.cpp b/libopie2/opiepim/otodo.cpp
index b3c14e6..cc46b21 100644
--- a/libopie2/opiepim/otodo.cpp
+++ b/libopie2/opiepim/otodo.cpp
@@ -33,31 +33,32 @@ struct OTodo::OTodoData : public QShared {
33}; 33};
34 34
35OTodo::OTodo(const OTodo &event ) 35OTodo::OTodo(const OTodo &event )
36 : OPimRecord( event ), data( event.data ) 36 : OPimRecord( event ), data( event.data )
37{ 37{
38 data->ref(); 38 data->ref();
39 qWarning("ref up"); 39// qWarning("ref up");
40} 40}
41OTodo::~OTodo() { 41OTodo::~OTodo() {
42 qWarning("~OTodo " + data->sum ); 42
43// qWarning("~OTodo " );
43 if ( data->deref() ) { 44 if ( data->deref() ) {
44 qWarning("OTodo::dereffing"); 45// qWarning("OTodo::dereffing");
45 delete data; 46 delete data;
46 data = 0l; 47 data = 0l;
47 } 48 }
48} 49}
49OTodo::OTodo(bool completed, int priority, 50OTodo::OTodo(bool completed, int priority,
50 const QArray<int> &category, 51 const QArray<int> &category,
51 const QString& summary, 52 const QString& summary,
52 const QString &description, 53 const QString &description,
53 ushort progress, 54 ushort progress,
54 bool hasDate, QDate date, int uid ) 55 bool hasDate, QDate date, int uid )
55 : OPimRecord( uid ) 56 : OPimRecord( uid )
56{ 57{
57 qWarning("OTodoData " + summary); 58// qWarning("OTodoData " + summary);
58 setCategories( category ); 59 setCategories( category );
59 60
60 data = new OTodoData; 61 data = new OTodoData;
61 62
62 data->date = date; 63 data->date = date;
63 data->isCompleted = completed; 64 data->isCompleted = completed;
@@ -74,18 +75,18 @@ OTodo::OTodo(bool completed, int priority,
74 const QString& summary, 75 const QString& summary,
75 const QString &description, 76 const QString &description,
76 ushort progress, 77 ushort progress,
77 bool hasDate, QDate date, int uid ) 78 bool hasDate, QDate date, int uid )
78 : OPimRecord( uid ) 79 : OPimRecord( uid )
79{ 80{
80 qWarning("OTodoData" + summary); 81// qWarning("OTodoData" + summary);
81 setCategories( idsFromString( category.join(";") ) ); 82 setCategories( idsFromString( category.join(";") ) );
82 83
83 data = new OTodoData; 84 data = new OTodoData;
84 data->date = date;
85 85
86 data->date = date;
86 data->isCompleted = completed; 87 data->isCompleted = completed;
87 data->hasDate = hasDate; 88 data->hasDate = hasDate;
88 data->priority = priority; 89 data->priority = priority;
89 data->sum = summary; 90 data->sum = summary;
90 data->prog = progress; 91 data->prog = progress;
91 data->desc = Qtopia::simplifyMultiLineSpace(description ); 92 data->desc = Qtopia::simplifyMultiLineSpace(description );
@@ -157,12 +158,13 @@ void OTodo::setHasAlarmDateTime( bool hasAlarmDateTime )
157{ 158{
158 changeOrModify(); 159 changeOrModify();
159 data->hasAlarmDateTime = hasAlarmDateTime; 160 data->hasAlarmDateTime = hasAlarmDateTime;
160} 161}
161void OTodo::setDescription(const QString &desc ) 162void OTodo::setDescription(const QString &desc )
162{ 163{
164 qWarning( "desc " + desc );
163 changeOrModify(); 165 changeOrModify();
164 data->desc = Qtopia::simplifyMultiLineSpace(desc ); 166 data->desc = Qtopia::simplifyMultiLineSpace(desc );
165} 167}
166void OTodo::setSummary( const QString& sum ) 168void OTodo::setSummary( const QString& sum )
167{ 169{
168 changeOrModify(); 170 changeOrModify();
@@ -304,25 +306,26 @@ bool OTodo::operator==(const OTodo &toDoEvent )const
304 return false; 306 return false;
305 307
306 return OPimRecord::operator==( toDoEvent ); 308 return OPimRecord::operator==( toDoEvent );
307} 309}
308void OTodo::deref() { 310void OTodo::deref() {
309 311
310 //qWarning("deref in ToDoEvent"); 312// qWarning("deref in ToDoEvent");
311 if ( data->deref() ) { 313 if ( data->deref() ) {
312 //qWarning("deleting"); 314// qWarning("deleting");
313 delete data; 315 delete data;
314 d= 0; 316 data= 0;
315 } 317 }
316} 318}
317OTodo &OTodo::operator=(const OTodo &item ) 319OTodo &OTodo::operator=(const OTodo &item )
318{ 320{
319 OPimRecord::operator=( item ); 321// OPimRecord::operator=( item );
320 //qWarning("operator= ref "); 322 //qWarning("operator= ref ");
321 item.data->ref(); 323 item.data->ref();
322 deref(); 324 deref();
325 data = item.data;
323 326
324 return *this; 327 return *this;
325} 328}
326 329
327QMap<int, QString> OTodo::toMap() const { 330QMap<int, QString> OTodo::toMap() const {
328 QMap<int, QString> map; 331 QMap<int, QString> map;
@@ -352,13 +355,13 @@ QMap<QString, QString> OTodo::toExtraMap()const {
352 * change or modify looks at the ref count and either 355 * change or modify looks at the ref count and either
353 * creates a new QShared Object or it can modify it 356 * creates a new QShared Object or it can modify it
354 * right in place 357 * right in place
355 */ 358 */
356void OTodo::changeOrModify() { 359void OTodo::changeOrModify() {
357 if ( data->count != 1 ) { 360 if ( data->count != 1 ) {
358 qWarning("changeOrModify"); 361// qWarning("changeOrModify");
359 data->deref(); 362 data->deref();
360 OTodoData* d2 = new OTodoData(); 363 OTodoData* d2 = new OTodoData();
361 copy(data, d2 ); 364 copy(data, d2 );
362 data = d2; 365 data = d2;
363 } 366 }
364} 367}