author | zautrix <zautrix> | 2004-08-02 00:52:35 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2004-08-02 00:52:35 (UTC) |
commit | 54157cb44316de72d776cfae70bdadf6c52f4773 (patch) (unidiff) | |
tree | 953c8ae225a54fc43a7298d49b08e821bf741cb9 /libkcal | |
parent | 3ebd85e83e6f9d4ac59ce1828548f7236e2b1af0 (diff) | |
download | kdepimpi-54157cb44316de72d776cfae70bdadf6c52f4773.zip kdepimpi-54157cb44316de72d776cfae70bdadf6c52f4773.tar.gz kdepimpi-54157cb44316de72d776cfae70bdadf6c52f4773.tar.bz2 |
Hack, hack, hack
-rw-r--r-- | libkcal/calendar.h | 4 | ||||
-rw-r--r-- | libkcal/calendarlocal.cpp | 8 | ||||
-rw-r--r-- | libkcal/calendarlocal.h | 4 | ||||
-rw-r--r-- | libkcal/incidencebase.cpp | 12 | ||||
-rw-r--r-- | libkcal/incidencebase.h | 3 | ||||
-rw-r--r-- | libkcal/sharpformat.cpp | 18 |
6 files changed, 17 insertions, 32 deletions
diff --git a/libkcal/calendar.h b/libkcal/calendar.h index df5bbcf..d59bca6 100644 --- a/libkcal/calendar.h +++ b/libkcal/calendar.h | |||
@@ -162,7 +162,7 @@ public: | |||
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( int ) = 0; | 165 | virtual Event *event( QString, int ) = 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. |
@@ -211,7 +211,7 @@ public: | |||
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( int ) = 0; | 214 | virtual Todo *todo( QString, int ) = 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 | */ |
diff --git a/libkcal/calendarlocal.cpp b/libkcal/calendarlocal.cpp index 09ce9f0..e464a77 100644 --- a/libkcal/calendarlocal.cpp +++ b/libkcal/calendarlocal.cpp | |||
@@ -212,11 +212,11 @@ QPtrList<Todo> CalendarLocal::rawTodos() | |||
212 | { | 212 | { |
213 | return mTodoList; | 213 | return mTodoList; |
214 | } | 214 | } |
215 | Todo *CalendarLocal::todo( int id ) | 215 | Todo *CalendarLocal::todo( QString syncProf, int 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->zaurusId() == id ) return todo; | 219 | if ( todo->getID( syncProf ) == id ) return todo; |
220 | } | 220 | } |
221 | 221 | ||
222 | return 0; | 222 | return 0; |
@@ -235,11 +235,11 @@ QPtrList<Event> CalendarLocal::getExternLastSyncEvents() | |||
235 | return el; | 235 | return el; |
236 | 236 | ||
237 | } | 237 | } |
238 | Event *CalendarLocal::event( int id ) | 238 | Event *CalendarLocal::event( QString syncProf, int 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->zaurusId() == id ) return todo; | 242 | if ( todo->getID( syncProf ) == id ) return todo; |
243 | } | 243 | } |
244 | 244 | ||
245 | return 0; | 245 | return 0; |
diff --git a/libkcal/calendarlocal.h b/libkcal/calendarlocal.h index 3257198..4728063 100644 --- a/libkcal/calendarlocal.h +++ b/libkcal/calendarlocal.h | |||
@@ -175,8 +175,8 @@ class CalendarLocal : public Calendar | |||
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 *CalendarLocal::todo( int uid ); | 178 | Todo *todo( QString, int uid ); |
179 | Event *CalendarLocal::event( int uid ); | 179 | Event *event( QString,int uid ); |
180 | 180 | ||
181 | 181 | ||
182 | 182 | ||
diff --git a/libkcal/incidencebase.cpp b/libkcal/incidencebase.cpp index f1db8b7..5d8785b 100644 --- a/libkcal/incidencebase.cpp +++ b/libkcal/incidencebase.cpp | |||
@@ -38,7 +38,6 @@ IncidenceBase::IncidenceBase() : | |||
38 | mDuration = 0; | 38 | mDuration = 0; |
39 | mHasDuration = false; | 39 | mHasDuration = false; |
40 | mPilotId = 0; | 40 | mPilotId = 0; |
41 | mZaurusId = -1; | ||
42 | mZaurusUid = 0; | 41 | mZaurusUid = 0; |
43 | mExternalId = ":"; | 42 | mExternalId = ":"; |
44 | mTempSyncStat = 0; | 43 | mTempSyncStat = 0; |
@@ -62,7 +61,6 @@ IncidenceBase::IncidenceBase(const IncidenceBase &i) : | |||
62 | mFloats = i.mFloats; | 61 | mFloats = i.mFloats; |
63 | mLastModified = i.mLastModified; | 62 | mLastModified = i.mLastModified; |
64 | mPilotId = i.mPilotId; | 63 | mPilotId = i.mPilotId; |
65 | mZaurusId = i.mZaurusId; | ||
66 | mZaurusUid = i.mZaurusUid; | 64 | mZaurusUid = i.mZaurusUid; |
67 | mTempSyncStat = i.mTempSyncStat; | 65 | mTempSyncStat = i.mTempSyncStat; |
68 | mSyncStatus = i.mSyncStatus; | 66 | mSyncStatus = i.mSyncStatus; |
@@ -342,16 +340,6 @@ int IncidenceBase::pilotId() const | |||
342 | { | 340 | { |
343 | return mPilotId; | 341 | return mPilotId; |
344 | } | 342 | } |
345 | void IncidenceBase::setZaurusId( int id ) | ||
346 | { | ||
347 | if (mReadOnly) return; | ||
348 | mZaurusId = id; | ||
349 | } | ||
350 | |||
351 | int IncidenceBase::zaurusId() const | ||
352 | { | ||
353 | return mZaurusId; | ||
354 | } | ||
355 | 343 | ||
356 | int IncidenceBase::zaurusUid() const | 344 | int IncidenceBase::zaurusUid() const |
357 | { | 345 | { |
diff --git a/libkcal/incidencebase.h b/libkcal/incidencebase.h index 2f85df6..e2950d3 100644 --- a/libkcal/incidencebase.h +++ b/libkcal/incidencebase.h | |||
@@ -126,8 +126,6 @@ class IncidenceBase : public CustomProperties | |||
126 | /** Return Pilot Id. */ | 126 | /** Return Pilot Id. */ |
127 | int pilotId() const; | 127 | int pilotId() const; |
128 | 128 | ||
129 | void setZaurusId(int id); | ||
130 | int zaurusId() const; | ||
131 | void setZaurusUid(int id); | 129 | void setZaurusUid(int id); |
132 | int zaurusUid() const; | 130 | int zaurusUid() const; |
133 | void setTempSyncStat(int id); | 131 | void setTempSyncStat(int id); |
@@ -161,7 +159,6 @@ class IncidenceBase : public CustomProperties | |||
161 | int mDuration; | 159 | int mDuration; |
162 | bool mHasDuration; | 160 | bool mHasDuration; |
163 | QString mExternalId; | 161 | QString mExternalId; |
164 | int mZaurusId; | ||
165 | int mZaurusUid; | 162 | int mZaurusUid; |
166 | int mTempSyncStat; | 163 | int mTempSyncStat; |
167 | 164 | ||
diff --git a/libkcal/sharpformat.cpp b/libkcal/sharpformat.cpp index d39d2dd..605a54d 100644 --- a/libkcal/sharpformat.cpp +++ b/libkcal/sharpformat.cpp | |||
@@ -85,12 +85,12 @@ class SharpParser : public QObject | |||
85 | 85 | ||
86 | if ( qName == "Event" ) { | 86 | if ( qName == "Event" ) { |
87 | Event *event; | 87 | Event *event; |
88 | event = existingCalendar->event( attList[0].toInt() ); | 88 | event = existingCalendar->event( "Sharp_DTM",attList[0].toInt() ); |
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->setZaurusId( attList[0].toInt() ); | 93 | event->setID("Sharp_DTM", attList[0].toInt() ); |
94 | event->setZaurusUid( cSum ); | 94 | event->setZaurusUid( cSum ); |
95 | event->setTempSyncStat(SYNC_TEMPSTATE_NEW_EXTERNAL ); | 95 | event->setTempSyncStat(SYNC_TEMPSTATE_NEW_EXTERNAL ); |
96 | 96 | ||
@@ -189,7 +189,7 @@ class SharpParser : public QObject | |||
189 | } else if ( qName == "Todo" ) { | 189 | } else if ( qName == "Todo" ) { |
190 | Todo *todo; | 190 | Todo *todo; |
191 | 191 | ||
192 | todo = existingCalendar->todo( attList[0].toInt() ); | 192 | todo = existingCalendar->todo( "Sharp_DTM", attList[0].toInt() ); |
193 | if (todo ) | 193 | if (todo ) |
194 | todo = (Todo*)todo->clone(); | 194 | todo = (Todo*)todo->clone(); |
195 | else | 195 | else |
@@ -201,7 +201,7 @@ class SharpParser : public QObject | |||
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->setZaurusId( attList[0].toInt() ); | 204 | todo->setID( "Sharp_DTM", attList[0].toInt() ); |
205 | todo->setZaurusUid( cSum ); | 205 | todo->setZaurusUid( cSum ); |
206 | todo->setTempSyncStat( SYNC_TEMPSTATE_NEW_EXTERNAL ); | 206 | todo->setTempSyncStat( SYNC_TEMPSTATE_NEW_EXTERNAL ); |
207 | 207 | ||
@@ -466,7 +466,7 @@ int SharpFormat::getNumFromRecord( QString answer, Incidence* inc ) | |||
466 | int newnum = templist[0].toInt( &ok ); | 466 | int newnum = templist[0].toInt( &ok ); |
467 | if ( ok && newnum > 0) { | 467 | if ( ok && newnum > 0) { |
468 | retval = newnum; | 468 | retval = newnum; |
469 | inc->setZaurusId( newnum ); | 469 | inc->setID( "Sharp_DTM",newnum ); |
470 | inc->setZaurusUid( getCsum( templist ) ); | 470 | inc->setZaurusUid( getCsum( templist ) ); |
471 | inc->setTempSyncStat( SYNC_TEMPSTATE_NEW_ID ); | 471 | inc->setTempSyncStat( SYNC_TEMPSTATE_NEW_ID ); |
472 | } | 472 | } |
@@ -520,7 +520,7 @@ bool SharpFormat::save( Calendar *calendar) | |||
520 | deleteEnt = true; | 520 | deleteEnt = true; |
521 | changeEnt = true; | 521 | changeEnt = true; |
522 | } | 522 | } |
523 | else if ( ev->zaurusId() == -1 ) { // add new | 523 | else if ( ev->getID("Sharp_DTM") == -1 ) { // add new |
524 | command = "(echo \"" + ePrefix + eString + "\" ) | db2file datebook -w -g -c " + codec+ " > "+ fileName; | 524 | command = "(echo \"" + ePrefix + eString + "\" ) | db2file datebook -w -g -c " + codec+ " > "+ fileName; |
525 | system ( command.utf8() ); | 525 | system ( command.utf8() ); |
526 | QFile file( fileName ); | 526 | QFile file( fileName ); |
@@ -606,7 +606,7 @@ bool SharpFormat::save( Calendar *calendar) | |||
606 | deleteEnt = true; | 606 | deleteEnt = true; |
607 | changeEnt = true; | 607 | changeEnt = true; |
608 | } | 608 | } |
609 | else if ( to->zaurusId() == -1 ) { // add new | 609 | else if ( to->getID("Sharp_DTM") == -1 ) { // add new |
610 | command = "(echo \"" + tPrefix + eString + "\" ) | db2file todo -w -g -c " + codec+ " > "+ fileName; | 610 | command = "(echo \"" + tPrefix + eString + "\" ) | db2file todo -w -g -c " + codec+ " > "+ fileName; |
611 | system ( command.utf8() ); | 611 | system ( command.utf8() ); |
612 | QFile file( fileName ); | 612 | QFile file( fileName ); |
@@ -696,7 +696,7 @@ QString SharpFormat::dtToString( const QDateTime& dti, bool useTZ ) | |||
696 | QString SharpFormat::getEventString( Event* event ) | 696 | QString SharpFormat::getEventString( Event* event ) |
697 | { | 697 | { |
698 | QStringList list; | 698 | QStringList list; |
699 | list.append( QString::number(event->zaurusId() ) ); | 699 | list.append( QString::number(event->getID("Sharp_DTM") ) ); |
700 | list.append( event->categories().join(",") ); | 700 | list.append( event->categories().join(",") ); |
701 | if ( !event->summary().isEmpty() ) | 701 | if ( !event->summary().isEmpty() ) |
702 | list.append( event->summary() ); | 702 | list.append( event->summary() ); |
@@ -860,7 +860,7 @@ QString SharpFormat::getEventString( Event* event ) | |||
860 | QString SharpFormat::getTodoString( Todo* todo ) | 860 | QString SharpFormat::getTodoString( Todo* todo ) |
861 | { | 861 | { |
862 | QStringList list; | 862 | QStringList list; |
863 | list.append( QString::number( todo->zaurusId() ) ); | 863 | list.append( QString::number( todo->getID("Sharp_DTM") ) ); |
864 | list.append( todo->categories().join(",") ); | 864 | list.append( todo->categories().join(",") ); |
865 | 865 | ||
866 | if ( todo->hasStartDate() ) { | 866 | if ( todo->hasStartDate() ) { |