author | zautrix <zautrix> | 2004-08-07 14:52:25 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2004-08-07 14:52:25 (UTC) |
commit | 31764784e8753157a936e42e21dcdc41bd8e2eb7 (patch) (unidiff) | |
tree | ddfe5653aadd0277d1181dc459ff73c50256be13 /libkcal | |
parent | 5f86d160a6d4406bdef53c8fe244baed0518142d (diff) | |
download | kdepimpi-31764784e8753157a936e42e21dcdc41bd8e2eb7.zip kdepimpi-31764784e8753157a936e42e21dcdc41bd8e2eb7.tar.gz kdepimpi-31764784e8753157a936e42e21dcdc41bd8e2eb7.tar.bz2 |
Sync fixes
-rw-r--r-- | libkcal/calendar.h | 4 | ||||
-rw-r--r-- | libkcal/calendarlocal.cpp | 4 | ||||
-rw-r--r-- | libkcal/calendarlocal.h | 4 | ||||
-rw-r--r-- | libkcal/sharpformat.cpp | 10 |
4 files changed, 11 insertions, 11 deletions
diff --git a/libkcal/calendar.h b/libkcal/calendar.h index d59bca6..4a3223c 100644 --- a/libkcal/calendar.h +++ b/libkcal/calendar.h | |||
@@ -153,25 +153,25 @@ public: | |||
153 | */ | 153 | */ |
154 | virtual bool addEventNoDup( Event *event ) = 0; | 154 | virtual bool addEventNoDup( Event *event ) = 0; |
155 | virtual bool addAnniversaryNoDup( Event *event ) = 0; | 155 | virtual bool addAnniversaryNoDup( Event *event ) = 0; |
156 | virtual bool addEvent( Event *anEvent ) = 0; | 156 | virtual bool addEvent( Event *anEvent ) = 0; |
157 | /** | 157 | /** |
158 | Delete event from calendar. | 158 | Delete event from calendar. |
159 | */ | 159 | */ |
160 | virtual void deleteEvent( Event * ) = 0; | 160 | virtual void deleteEvent( Event * ) = 0; |
161 | /** | 161 | /** |
162 | Retrieves an event on the basis of the unique string ID. | 162 | Retrieves an event on the basis of the unique string ID. |
163 | */ | 163 | */ |
164 | virtual Event *event( const QString &UniqueStr ) = 0; | 164 | virtual Event *event( const QString &UniqueStr ) = 0; |
165 | virtual Event *event( QString, int ) = 0; | 165 | virtual Event *event( QString, QString ) = 0; |
166 | /** | 166 | /** |
167 | Builds and then returns a list of all events that match for the | 167 | Builds and then returns a list of all events that match for the |
168 | date specified. useful for dayView, etc. etc. | 168 | date specified. useful for dayView, etc. etc. |
169 | The calendar filter is applied. | 169 | The calendar filter is applied. |
170 | */ | 170 | */ |
171 | QPtrList<Event> events( const QDate &date, bool sorted = false); | 171 | QPtrList<Event> events( const QDate &date, bool sorted = false); |
172 | /** | 172 | /** |
173 | Get events, which occur on the given date. | 173 | Get events, which occur on the given date. |
174 | The calendar filter is applied. | 174 | The calendar filter is applied. |
175 | */ | 175 | */ |
176 | QPtrList<Event> events( const QDateTime &qdt ); | 176 | QPtrList<Event> events( const QDateTime &qdt ); |
177 | /** | 177 | /** |
@@ -202,25 +202,25 @@ public: | |||
202 | */ | 202 | */ |
203 | virtual void deleteTodo( Todo * ) = 0; | 203 | virtual void deleteTodo( Todo * ) = 0; |
204 | virtual void deleteJournal( Journal * ) = 0; | 204 | virtual void deleteJournal( Journal * ) = 0; |
205 | /** | 205 | /** |
206 | Return filterd list of todos. | 206 | Return filterd list of todos. |
207 | */ | 207 | */ |
208 | virtual QPtrList<Todo> todos(); | 208 | virtual QPtrList<Todo> todos(); |
209 | /** | 209 | /** |
210 | Searches todolist for an event with this unique string identifier, | 210 | Searches todolist for an event with this unique string identifier, |
211 | returns a pointer or null. | 211 | returns a pointer or null. |
212 | */ | 212 | */ |
213 | virtual Todo *todo( const QString &uid ) = 0; | 213 | virtual Todo *todo( const QString &uid ) = 0; |
214 | virtual Todo *todo( QString, int ) = 0; | 214 | virtual Todo *todo( QString, QString ) = 0; |
215 | /** | 215 | /** |
216 | Returns list of todos due on the specified date. | 216 | Returns list of todos due on the specified date. |
217 | */ | 217 | */ |
218 | virtual QPtrList<Todo> todos( const QDate &date ) = 0; | 218 | virtual QPtrList<Todo> todos( const QDate &date ) = 0; |
219 | /** | 219 | /** |
220 | Return unfiltered list of todos. | 220 | Return unfiltered list of todos. |
221 | */ | 221 | */ |
222 | virtual QPtrList<Todo> rawTodos() = 0; | 222 | virtual QPtrList<Todo> rawTodos() = 0; |
223 | 223 | ||
224 | /** | 224 | /** |
225 | Add a Journal entry to calendar. | 225 | Add a Journal entry to calendar. |
226 | 226 | ||
diff --git a/libkcal/calendarlocal.cpp b/libkcal/calendarlocal.cpp index e464a77..21b4aaf 100644 --- a/libkcal/calendarlocal.cpp +++ b/libkcal/calendarlocal.cpp | |||
@@ -203,48 +203,48 @@ void CalendarLocal::deleteTodo( Todo *todo ) | |||
203 | // Handle orphaned children | 203 | // Handle orphaned children |
204 | removeRelations( todo ); | 204 | removeRelations( todo ); |
205 | 205 | ||
206 | if ( mTodoList.removeRef( todo ) ) { | 206 | if ( mTodoList.removeRef( todo ) ) { |
207 | setModified( true ); | 207 | setModified( true ); |
208 | } | 208 | } |
209 | } | 209 | } |
210 | 210 | ||
211 | QPtrList<Todo> CalendarLocal::rawTodos() | 211 | QPtrList<Todo> CalendarLocal::rawTodos() |
212 | { | 212 | { |
213 | return mTodoList; | 213 | return mTodoList; |
214 | } | 214 | } |
215 | Todo *CalendarLocal::todo( QString syncProf, int id ) | 215 | Todo *CalendarLocal::todo( QString syncProf, QString id ) |
216 | { | 216 | { |
217 | Todo *todo; | 217 | Todo *todo; |
218 | for ( todo = mTodoList.first(); todo; todo = mTodoList.next() ) { | 218 | for ( todo = mTodoList.first(); todo; todo = mTodoList.next() ) { |
219 | if ( todo->getID( syncProf ) == id ) return todo; | 219 | if ( todo->getID( syncProf ) == id ) return todo; |
220 | } | 220 | } |
221 | 221 | ||
222 | return 0; | 222 | return 0; |
223 | } | 223 | } |
224 | 224 | ||
225 | QPtrList<Event> CalendarLocal::getExternLastSyncEvents() | 225 | QPtrList<Event> CalendarLocal::getExternLastSyncEvents() |
226 | { | 226 | { |
227 | QPtrList<Event> el; | 227 | QPtrList<Event> el; |
228 | Event *todo; | 228 | Event *todo; |
229 | for ( todo = mEventList.first(); todo; todo = mEventList.next() ) { | 229 | for ( todo = mEventList.first(); todo; todo = mEventList.next() ) { |
230 | if ( todo->uid().left( 15 ) == QString("last-syncEvent-") ) | 230 | if ( todo->uid().left( 15 ) == QString("last-syncEvent-") ) |
231 | if ( todo->summary().left(3) == "E: " ) | 231 | if ( todo->summary().left(3) == "E: " ) |
232 | el.append( todo ); | 232 | el.append( todo ); |
233 | } | 233 | } |
234 | 234 | ||
235 | return el; | 235 | return el; |
236 | 236 | ||
237 | } | 237 | } |
238 | Event *CalendarLocal::event( QString syncProf, int id ) | 238 | Event *CalendarLocal::event( QString syncProf, QString id ) |
239 | { | 239 | { |
240 | Event *todo; | 240 | Event *todo; |
241 | for ( todo = mEventList.first(); todo; todo = mEventList.next() ) { | 241 | for ( todo = mEventList.first(); todo; todo = mEventList.next() ) { |
242 | if ( todo->getID( syncProf ) == id ) return todo; | 242 | if ( todo->getID( syncProf ) == id ) return todo; |
243 | } | 243 | } |
244 | 244 | ||
245 | return 0; | 245 | return 0; |
246 | } | 246 | } |
247 | Todo *CalendarLocal::todo( const QString &uid ) | 247 | Todo *CalendarLocal::todo( const QString &uid ) |
248 | { | 248 | { |
249 | Todo *todo; | 249 | Todo *todo; |
250 | for ( todo = mTodoList.first(); todo; todo = mTodoList.next() ) { | 250 | for ( todo = mTodoList.first(); todo; todo = mTodoList.next() ) { |
diff --git a/libkcal/calendarlocal.h b/libkcal/calendarlocal.h index 4728063..5b6c64c 100644 --- a/libkcal/calendarlocal.h +++ b/libkcal/calendarlocal.h | |||
@@ -166,26 +166,26 @@ class CalendarLocal : public Calendar | |||
166 | */ | 166 | */ |
167 | QPtrList<Event> rawEventsForDate( const QDate &date, bool sorted = false ); | 167 | QPtrList<Event> rawEventsForDate( const QDate &date, bool sorted = false ); |
168 | /** | 168 | /** |
169 | Get unfiltered events for date \a qdt. | 169 | Get unfiltered events for date \a qdt. |
170 | */ | 170 | */ |
171 | QPtrList<Event> rawEventsForDate( const QDateTime &qdt ); | 171 | QPtrList<Event> rawEventsForDate( const QDateTime &qdt ); |
172 | /** | 172 | /** |
173 | Get unfiltered events in a range of dates. If inclusive is set to true, | 173 | Get unfiltered events in a range of dates. If inclusive is set to true, |
174 | only events are returned, which are completely included in the range. | 174 | only events are returned, which are completely included in the range. |
175 | */ | 175 | */ |
176 | QPtrList<Event> rawEvents( const QDate &start, const QDate &end, | 176 | QPtrList<Event> rawEvents( const QDate &start, const QDate &end, |
177 | bool inclusive = false ); | 177 | bool inclusive = false ); |
178 | Todo *todo( QString, int uid ); | 178 | Todo *todo( QString, QString ); |
179 | Event *event( QString,int uid ); | 179 | Event *event( QString, QString ); |
180 | 180 | ||
181 | 181 | ||
182 | 182 | ||
183 | protected: | 183 | protected: |
184 | 184 | ||
185 | // Event* mNextAlarmEvent; | 185 | // Event* mNextAlarmEvent; |
186 | QString mNextSummary; | 186 | QString mNextSummary; |
187 | QString mNextAlarmEventDateTimeString; | 187 | QString mNextAlarmEventDateTimeString; |
188 | QString mLastAlarmNotificationString; | 188 | QString mLastAlarmNotificationString; |
189 | QDateTime mNextAlarmEventDateTime; | 189 | QDateTime mNextAlarmEventDateTime; |
190 | QDateTime mNextAlarmDateTime; | 190 | QDateTime mNextAlarmDateTime; |
191 | void reInitAlarmSettings(); | 191 | void reInitAlarmSettings(); |
diff --git a/libkcal/sharpformat.cpp b/libkcal/sharpformat.cpp index e8934bf..ebfe164 100644 --- a/libkcal/sharpformat.cpp +++ b/libkcal/sharpformat.cpp | |||
@@ -76,39 +76,39 @@ class SharpParser : public QObject | |||
76 | if ( !attList[i].isEmpty() ) { | 76 | if ( !attList[i].isEmpty() ) { |
77 | skip = false; | 77 | skip = false; |
78 | break; | 78 | break; |
79 | } | 79 | } |
80 | ++i ; | 80 | ++i ; |
81 | } | 81 | } |
82 | if ( skip ) | 82 | if ( skip ) |
83 | return false; | 83 | return false; |
84 | ulong cSum = SharpFormat::getCsum(attList ); | 84 | ulong cSum = SharpFormat::getCsum(attList ); |
85 | 85 | ||
86 | if ( qName == "Event" ) { | 86 | if ( qName == "Event" ) { |
87 | Event *event; | 87 | Event *event; |
88 | event = existingCalendar->event( "Sharp_DTM",attList[0].toInt() ); | 88 | event = existingCalendar->event( "Sharp_DTM",attList[0] ); |
89 | if ( event ) | 89 | if ( event ) |
90 | event = (Event*)event->clone(); | 90 | event = (Event*)event->clone(); |
91 | else | 91 | else |
92 | event = new Event; | 92 | event = new Event; |
93 | event->setID("Sharp_DTM", attList[0] ); | 93 | event->setID("Sharp_DTM", attList[0] ); |
94 | event->setCsum( "Sharp_DTM", QString::number( cSum )); | 94 | event->setCsum( "Sharp_DTM", QString::number( cSum )); |
95 | event->setTempSyncStat(SYNC_TEMPSTATE_NEW_EXTERNAL ); | 95 | event->setTempSyncStat(SYNC_TEMPSTATE_NEW_EXTERNAL ); |
96 | 96 | ||
97 | event->setSummary( attList[2] ); | 97 | event->setSummary( attList[2] ); |
98 | event->setLocation( attList[3] ); | 98 | event->setLocation( attList[3] ); |
99 | event->setDescription( attList[4] ); | 99 | event->setDescription( attList[4] ); |
100 | if ( attList[7] == "1" ) { | 100 | if ( attList[7] == "1" ) { |
101 | event->setDtStart( QDateTime(fromString( attList[17]+"000000", false ).date(),QTime(0,0,0 ) )); | 101 | event->setDtStart( QDateTime(fromString( attList[17]+"T000000", false ).date(),QTime(0,0,0 ) )); |
102 | event->setDtEnd( QDateTime(fromString( attList[18]+"000000", false ).date(),QTime(0,0,0 ))); | 102 | event->setDtEnd( QDateTime(fromString( attList[18]+"T000000", false ).date(),QTime(0,0,0 ))); |
103 | event->setFloats( true ); | 103 | event->setFloats( true ); |
104 | } else { | 104 | } else { |
105 | event->setFloats( false ); | 105 | event->setFloats( false ); |
106 | event->setDtStart( fromString( attList[5] ) ); | 106 | event->setDtStart( fromString( attList[5] ) ); |
107 | event->setDtEnd( fromString( attList[6] )); | 107 | event->setDtEnd( fromString( attList[6] )); |
108 | } | 108 | } |
109 | 109 | ||
110 | QString rtype = attList[11]; | 110 | QString rtype = attList[11]; |
111 | if ( rtype != "255" ) { | 111 | if ( rtype != "255" ) { |
112 | // qDebug("recurs "); | 112 | // qDebug("recurs "); |
113 | QDate startDate = event->dtStart().date(); | 113 | QDate startDate = event->dtStart().date(); |
114 | 114 | ||
@@ -180,25 +180,25 @@ class SharpParser : public QObject | |||
180 | event->addAlarm( alarm ); | 180 | event->addAlarm( alarm ); |
181 | } | 181 | } |
182 | alarm->setType( Alarm::Audio ); | 182 | alarm->setType( Alarm::Audio ); |
183 | alarm->setEnabled( true ); | 183 | alarm->setEnabled( true ); |
184 | int alarmOffset = attList[9].toInt(); | 184 | int alarmOffset = attList[9].toInt(); |
185 | alarm->setStartOffset( alarmOffset * -60 ); | 185 | alarm->setStartOffset( alarmOffset * -60 ); |
186 | } | 186 | } |
187 | 187 | ||
188 | mCalendar->addEvent( event); | 188 | mCalendar->addEvent( event); |
189 | } else if ( qName == "Todo" ) { | 189 | } else if ( qName == "Todo" ) { |
190 | Todo *todo; | 190 | Todo *todo; |
191 | 191 | ||
192 | todo = existingCalendar->todo( "Sharp_DTM", attList[0].toInt() ); | 192 | todo = existingCalendar->todo( "Sharp_DTM", attList[0] ); |
193 | if (todo ) | 193 | if (todo ) |
194 | todo = (Todo*)todo->clone(); | 194 | todo = (Todo*)todo->clone(); |
195 | else | 195 | else |
196 | todo = new Todo; | 196 | todo = new Todo; |
197 | 197 | ||
198 | //CARDID,CATEGORY,ETDY,LTDY,FNDY,MARK,PRTY,TITL,MEM1 | 198 | //CARDID,CATEGORY,ETDY,LTDY,FNDY,MARK,PRTY,TITL,MEM1 |
199 | // 0 1 2 3 4 5 6 7 8 | 199 | // 0 1 2 3 4 5 6 7 8 |
200 | //1,,,,,1,4,Loch zumachen,"" | 200 | //1,,,,,1,4,Loch zumachen,"" |
201 | //3,Privat,20040317T000000,20040318T000000,20040319T000000,0,5,Call bbb,"notes123 bbb gggg ""bb "" " | 201 | //3,Privat,20040317T000000,20040318T000000,20040319T000000,0,5,Call bbb,"notes123 bbb gggg ""bb "" " |
202 | //2,"Familie,Freunde,Holiday",20040318T000000,20040324T000000,20040317T000000,1,2,tod2,notes | 202 | //2,"Familie,Freunde,Holiday",20040318T000000,20040324T000000,20040317T000000,1,2,tod2,notes |
203 | 203 | ||
204 | todo->setID( "Sharp_DTM", attList[0]); | 204 | todo->setID( "Sharp_DTM", attList[0]); |
@@ -349,25 +349,25 @@ ulong SharpFormat::getCsum( const QStringList & attList) | |||
349 | add = s[k].unicode (); | 349 | add = s[k].unicode (); |
350 | if ( k < 16 ) | 350 | if ( k < 16 ) |
351 | mul = mul * mul; | 351 | mul = mul * mul; |
352 | add = add * mul *i*i*i; | 352 | add = add * mul *i*i*i; |
353 | cSum += add; | 353 | cSum += add; |
354 | } | 354 | } |
355 | } | 355 | } |
356 | } | 356 | } |
357 | return cSum; | 357 | return cSum; |
358 | 358 | ||
359 | } | 359 | } |
360 | #include <stdlib.h> | 360 | #include <stdlib.h> |
361 | #define DEBUGMODE false | 361 | #define DEBUGMODE true |
362 | bool SharpFormat::load( Calendar *calendar, Calendar *existngCal ) | 362 | bool SharpFormat::load( Calendar *calendar, Calendar *existngCal ) |
363 | { | 363 | { |
364 | 364 | ||
365 | 365 | ||
366 | bool debug = DEBUGMODE; | 366 | bool debug = DEBUGMODE; |
367 | //debug = true; | 367 | //debug = true; |
368 | QString text; | 368 | QString text; |
369 | QString codec = "utf8"; | 369 | QString codec = "utf8"; |
370 | QLabel status ( i18n("Reading events ..."), 0 ); | 370 | QLabel status ( i18n("Reading events ..."), 0 ); |
371 | 371 | ||
372 | int w = status.sizeHint().width()+20 ; | 372 | int w = status.sizeHint().width()+20 ; |
373 | if ( w < 200 ) w = 200; | 373 | if ( w < 200 ) w = 200; |