-rw-r--r-- | libkcal/incidence.cpp | 13 | ||||
-rw-r--r-- | libkcal/incidence.h | 2 | ||||
-rw-r--r-- | libkcal/incidencebase.cpp | 13 | ||||
-rw-r--r-- | libkcal/incidencebase.h | 2 |
4 files changed, 29 insertions, 1 deletions
diff --git a/libkcal/incidence.cpp b/libkcal/incidence.cpp index 39c14f5..fe9f854 100644 --- a/libkcal/incidence.cpp +++ b/libkcal/incidence.cpp | |||
@@ -329,45 +329,58 @@ void Incidence::cloneRelations( Incidence * newInc ) | |||
329 | cloneInc->setRelatedTo( newInc ); | 329 | cloneInc->setRelatedTo( newInc ); |
330 | inc->cloneRelations( cloneInc ); | 330 | inc->cloneRelations( cloneInc ); |
331 | } | 331 | } |
332 | } | 332 | } |
333 | void Incidence::setReadOnly( bool readOnly ) | 333 | void Incidence::setReadOnly( bool readOnly ) |
334 | { | 334 | { |
335 | IncidenceBase::setReadOnly( readOnly ); | 335 | IncidenceBase::setReadOnly( readOnly ); |
336 | if ( mRecurrence ) | 336 | if ( mRecurrence ) |
337 | mRecurrence->setRecurReadOnly( readOnly); | 337 | mRecurrence->setRecurReadOnly( readOnly); |
338 | } | 338 | } |
339 | void Incidence::setLastModifiedSubInvalid() | 339 | void Incidence::setLastModifiedSubInvalid() |
340 | { | 340 | { |
341 | mLastModifiedSub = QDateTime(); | 341 | mLastModifiedSub = QDateTime(); |
342 | if ( mRelatedTo ) | 342 | if ( mRelatedTo ) |
343 | mRelatedTo->setLastModifiedSubInvalid(); | 343 | mRelatedTo->setLastModifiedSubInvalid(); |
344 | } | 344 | } |
345 | QString Incidence::lastModifiedSubSortKey() const | ||
346 | { | ||
347 | if ( mLastModifiedSubSortKey.isEmpty() ) | ||
348 | return lastModifiedSortKey(); | ||
349 | return mLastModifiedSubSortKey; | ||
350 | } | ||
345 | QDateTime Incidence::lastModifiedSub() | 351 | QDateTime Incidence::lastModifiedSub() |
346 | { | 352 | { |
347 | if ( !mRelations.count() ) | 353 | if ( !mRelations.count() ) |
348 | return lastModified(); | 354 | return lastModified(); |
349 | if ( mLastModifiedSub.isValid() ) | 355 | if ( mLastModifiedSub.isValid() ) |
350 | return mLastModifiedSub; | 356 | return mLastModifiedSub; |
351 | mLastModifiedSub = lastModified(); | 357 | mLastModifiedSub = lastModified(); |
352 | Incidence * inc; | 358 | Incidence * inc; |
353 | QPtrList<Incidence> Relations = relations(); | 359 | QPtrList<Incidence> Relations = relations(); |
354 | for (inc=Relations.first();inc;inc=Relations.next()) { | 360 | for (inc=Relations.first();inc;inc=Relations.next()) { |
355 | if ( inc->lastModifiedSub() > mLastModifiedSub ) | 361 | if ( inc->lastModifiedSub() > mLastModifiedSub ) |
356 | mLastModifiedSub = inc->lastModifiedSub(); | 362 | mLastModifiedSub = inc->lastModifiedSub(); |
357 | } | 363 | } |
364 | mLastModifiedSubSortKey.sprintf("%04d%02d%02d%02d%02d%02d", | ||
365 | mLastModifiedSub.date().year(), | ||
366 | mLastModifiedSub.date().month(), | ||
367 | mLastModifiedSub.date().day(), | ||
368 | mLastModifiedSub.time().hour(), | ||
369 | mLastModifiedSub.time().minute(), | ||
370 | mLastModifiedSub.time().second() ); | ||
358 | return mLastModifiedSub; | 371 | return mLastModifiedSub; |
359 | } | 372 | } |
360 | void Incidence::setCreated(QDateTime created) | 373 | void Incidence::setCreated(QDateTime created) |
361 | { | 374 | { |
362 | if (mReadOnly) return; | 375 | if (mReadOnly) return; |
363 | mCreated = getEvenTime(created); | 376 | mCreated = getEvenTime(created); |
364 | } | 377 | } |
365 | 378 | ||
366 | QDateTime Incidence::created() const | 379 | QDateTime Incidence::created() const |
367 | { | 380 | { |
368 | return mCreated; | 381 | return mCreated; |
369 | } | 382 | } |
370 | 383 | ||
371 | void Incidence::setRevision(int rev) | 384 | void Incidence::setRevision(int rev) |
372 | { | 385 | { |
373 | if (mReadOnly) return; | 386 | if (mReadOnly) return; |
diff --git a/libkcal/incidence.h b/libkcal/incidence.h index eef9e64..dc49640 100644 --- a/libkcal/incidence.h +++ b/libkcal/incidence.h | |||
@@ -266,45 +266,47 @@ class Incidence : public IncidenceBase | |||
266 | /** sets the event's hasStartDate value. */ | 266 | /** sets the event's hasStartDate value. */ |
267 | void setHasStartDate(bool f); | 267 | void setHasStartDate(bool f); |
268 | QDateTime getNextOccurence( const QDateTime& dt, bool* yes ) const; | 268 | QDateTime getNextOccurence( const QDateTime& dt, bool* yes ) const; |
269 | bool cancelled() const; | 269 | bool cancelled() const; |
270 | void setCancelled( bool b ); | 270 | void setCancelled( bool b ); |
271 | 271 | ||
272 | bool hasRecurrenceID() const; | 272 | bool hasRecurrenceID() const; |
273 | void setHasRecurrenceID( bool b ); | 273 | void setHasRecurrenceID( bool b ); |
274 | 274 | ||
275 | void setRecurrenceID(QDateTime); | 275 | void setRecurrenceID(QDateTime); |
276 | QDateTime recurrenceID () const; | 276 | QDateTime recurrenceID () const; |
277 | QDateTime dtStart() const; | 277 | QDateTime dtStart() const; |
278 | bool isHoliday() const; | 278 | bool isHoliday() const; |
279 | bool isBirthday() const; | 279 | bool isBirthday() const; |
280 | bool isAnniversary() const; | 280 | bool isAnniversary() const; |
281 | QDateTime lastModifiedSub(); | 281 | QDateTime lastModifiedSub(); |
282 | QString lastModifiedSubSortKey() const; | ||
282 | QString recurrenceText() const; | 283 | QString recurrenceText() const; |
283 | void setLastModifiedSubInvalid(); | 284 | void setLastModifiedSubInvalid(); |
284 | 285 | ||
285 | virtual QString durationText(); | 286 | virtual QString durationText(); |
286 | QString durationText4Time( int secs ); | 287 | QString durationText4Time( int secs ); |
287 | Recurrence *mRecurrence; | 288 | Recurrence *mRecurrence; |
288 | protected: | 289 | protected: |
289 | QPtrList<Alarm> mAlarms; | 290 | QPtrList<Alarm> mAlarms; |
290 | QPtrList<Incidence> mRelations; | 291 | QPtrList<Incidence> mRelations; |
291 | QDateTime mRecurrenceID; | 292 | QDateTime mRecurrenceID; |
292 | bool mHasRecurrenceID; | 293 | bool mHasRecurrenceID; |
293 | private: | 294 | private: |
294 | void checkCategories(); | 295 | void checkCategories(); |
296 | QString mLastModifiedSubSortKey; | ||
295 | bool mHoliday, mBirthday, mAnniversary; | 297 | bool mHoliday, mBirthday, mAnniversary; |
296 | int mRevision; | 298 | int mRevision; |
297 | bool mCancelled; | 299 | bool mCancelled; |
298 | 300 | ||
299 | // base components of jounal, event and todo | 301 | // base components of jounal, event and todo |
300 | QDateTime mCreated; | 302 | QDateTime mCreated; |
301 | QDateTime mLastModifiedSub; | 303 | QDateTime mLastModifiedSub; |
302 | QString mDescription; | 304 | QString mDescription; |
303 | QString mSummary; | 305 | QString mSummary; |
304 | QStringList mCategories; | 306 | QStringList mCategories; |
305 | Incidence *mRelatedTo; | 307 | Incidence *mRelatedTo; |
306 | QString mRelatedToUid; | 308 | QString mRelatedToUid; |
307 | DateList mExDates; | 309 | DateList mExDates; |
308 | QPtrList<Attachment> mAttachments; | 310 | QPtrList<Attachment> mAttachments; |
309 | QStringList mResources; | 311 | QStringList mResources; |
310 | bool mHasStartDate; // if todo has associated start date | 312 | bool mHasStartDate; // if todo has associated start date |
diff --git a/libkcal/incidencebase.cpp b/libkcal/incidencebase.cpp index 022dead..cfef973 100644 --- a/libkcal/incidencebase.cpp +++ b/libkcal/incidencebase.cpp | |||
@@ -180,43 +180,54 @@ bool IncidenceBase::alarmEnabled() const | |||
180 | return mAlarmEnabled; | 180 | return mAlarmEnabled; |
181 | } | 181 | } |
182 | 182 | ||
183 | 183 | ||
184 | void IncidenceBase::setUid(const QString &uid) | 184 | void IncidenceBase::setUid(const QString &uid) |
185 | { | 185 | { |
186 | mUid = uid; | 186 | mUid = uid; |
187 | updated(); | 187 | updated(); |
188 | } | 188 | } |
189 | 189 | ||
190 | QString IncidenceBase::uid() const | 190 | QString IncidenceBase::uid() const |
191 | { | 191 | { |
192 | return mUid; | 192 | return mUid; |
193 | } | 193 | } |
194 | void IncidenceBase::setLastModifiedSubInvalid() | 194 | void IncidenceBase::setLastModifiedSubInvalid() |
195 | { | 195 | { |
196 | 196 | // virtual method | |
197 | } | 197 | } |
198 | void IncidenceBase::setLastModified(const QDateTime &lm) | 198 | void IncidenceBase::setLastModified(const QDateTime &lm) |
199 | { | 199 | { |
200 | if ( blockLastModified ) return; | 200 | if ( blockLastModified ) return; |
201 | // DON'T! updated() because we call this from | 201 | // DON'T! updated() because we call this from |
202 | // Calendar::updateEvent(). | 202 | // Calendar::updateEvent(). |
203 | mLastModified = getEvenTime(lm); | 203 | mLastModified = getEvenTime(lm); |
204 | mLastModifiedKey.sprintf("%04d%02d%02d%02d%02d%02d", | ||
205 | mLastModified.date().year(), | ||
206 | mLastModified.date().month(), | ||
207 | mLastModified.date().day(), | ||
208 | mLastModified.time().hour(), | ||
209 | mLastModified.time().minute(), | ||
210 | mLastModified.time().second() ); | ||
204 | setLastModifiedSubInvalid(); | 211 | setLastModifiedSubInvalid(); |
205 | //qDebug("IncidenceBase::setLastModified %s ",lm.toString().latin1()); | 212 | //qDebug("IncidenceBase::setLastModified %s ",lm.toString().latin1()); |
206 | } | 213 | } |
214 | QString IncidenceBase::lastModifiedSortKey() const | ||
215 | { | ||
216 | return mLastModifiedKey; | ||
217 | } | ||
207 | 218 | ||
208 | QDateTime IncidenceBase::lastModified() const | 219 | QDateTime IncidenceBase::lastModified() const |
209 | { | 220 | { |
210 | return mLastModified; | 221 | return mLastModified; |
211 | } | 222 | } |
212 | 223 | ||
213 | void IncidenceBase::setOrganizer(const QString &o) | 224 | void IncidenceBase::setOrganizer(const QString &o) |
214 | { | 225 | { |
215 | // we don't check for readonly here, because it is | 226 | // we don't check for readonly here, because it is |
216 | // possible that by setting the organizer we are changing | 227 | // possible that by setting the organizer we are changing |
217 | // the event's readonly status... | 228 | // the event's readonly status... |
218 | mOrganizer = o; | 229 | mOrganizer = o; |
219 | if (mOrganizer.left(7).upper() == "MAILTO:") | 230 | if (mOrganizer.left(7).upper() == "MAILTO:") |
220 | mOrganizer = mOrganizer.remove(0,7); | 231 | mOrganizer = mOrganizer.remove(0,7); |
221 | 232 | ||
222 | updated(); | 233 | updated(); |
diff --git a/libkcal/incidencebase.h b/libkcal/incidencebase.h index 665c1f6..444d4c4 100644 --- a/libkcal/incidencebase.h +++ b/libkcal/incidencebase.h | |||
@@ -50,32 +50,33 @@ class IncidenceBase : public CustomProperties | |||
50 | IncidenceBase(); | 50 | IncidenceBase(); |
51 | IncidenceBase(const IncidenceBase &); | 51 | IncidenceBase(const IncidenceBase &); |
52 | virtual ~IncidenceBase(); | 52 | virtual ~IncidenceBase(); |
53 | 53 | ||
54 | virtual QCString type() const = 0; | 54 | virtual QCString type() const = 0; |
55 | virtual IncTypeID typeID() const = 0; | 55 | virtual IncTypeID typeID() const = 0; |
56 | 56 | ||
57 | /** Set the unique id for the event */ | 57 | /** Set the unique id for the event */ |
58 | void setUid(const QString &); | 58 | void setUid(const QString &); |
59 | /** Return the unique id for the event */ | 59 | /** Return the unique id for the event */ |
60 | QString uid() const; | 60 | QString uid() const; |
61 | 61 | ||
62 | /** Sets the time the incidence was last modified. */ | 62 | /** Sets the time the incidence was last modified. */ |
63 | void setLastModified(const QDateTime &lm); | 63 | void setLastModified(const QDateTime &lm); |
64 | /** Return the time the incidence was last modified. */ | 64 | /** Return the time the incidence was last modified. */ |
65 | QDateTime lastModified() const; | 65 | QDateTime lastModified() const; |
66 | QString lastModifiedSortKey() const; | ||
66 | 67 | ||
67 | /** sets the organizer for the event */ | 68 | /** sets the organizer for the event */ |
68 | void setOrganizer(const QString &o); | 69 | void setOrganizer(const QString &o); |
69 | QString organizer() const; | 70 | QString organizer() const; |
70 | 71 | ||
71 | /** Set readonly status. */ | 72 | /** Set readonly status. */ |
72 | virtual void setReadOnly( bool ); | 73 | virtual void setReadOnly( bool ); |
73 | /** Return if the object is read-only. */ | 74 | /** Return if the object is read-only. */ |
74 | bool isReadOnly() const { return mReadOnly; } | 75 | bool isReadOnly() const { return mReadOnly; } |
75 | 76 | ||
76 | /** for setting the event's starting date/time with a QDateTime. */ | 77 | /** for setting the event's starting date/time with a QDateTime. */ |
77 | virtual void setDtStart(const QDateTime &dtStart); | 78 | virtual void setDtStart(const QDateTime &dtStart); |
78 | /** returns an event's starting date/time as a QDateTime. */ | 79 | /** returns an event's starting date/time as a QDateTime. */ |
79 | virtual QDateTime dtStart() const; | 80 | virtual QDateTime dtStart() const; |
80 | /** returns an event's starting time as a string formatted according to the | 81 | /** returns an event's starting time as a string formatted according to the |
81 | users locale settings */ | 82 | users locale settings */ |
@@ -147,32 +148,33 @@ class IncidenceBase : public CustomProperties | |||
147 | bool calEnabled() const; | 148 | bool calEnabled() const; |
148 | void setAlarmEnabled( bool ); | 149 | void setAlarmEnabled( bool ); |
149 | bool alarmEnabled() const; | 150 | bool alarmEnabled() const; |
150 | bool isTagged() const; | 151 | bool isTagged() const; |
151 | void setTagged( bool ); | 152 | void setTagged( bool ); |
152 | virtual void setLastModifiedSubInvalid(); | 153 | virtual void setLastModifiedSubInvalid(); |
153 | protected: | 154 | protected: |
154 | bool blockLastModified; | 155 | bool blockLastModified; |
155 | bool mIsTagged; | 156 | bool mIsTagged; |
156 | QDateTime mDtStart; | 157 | QDateTime mDtStart; |
157 | bool mReadOnly; | 158 | bool mReadOnly; |
158 | QDateTime getEvenTime( QDateTime ); | 159 | QDateTime getEvenTime( QDateTime ); |
159 | 160 | ||
160 | private: | 161 | private: |
161 | // base components | 162 | // base components |
162 | QString mOrganizer; | 163 | QString mOrganizer; |
164 | QString mLastModifiedKey; | ||
163 | QString mUid; | 165 | QString mUid; |
164 | int mCalID; | 166 | int mCalID; |
165 | bool mCalEnabled; | 167 | bool mCalEnabled; |
166 | bool mAlarmEnabled; | 168 | bool mAlarmEnabled; |
167 | QDateTime mLastModified; | 169 | QDateTime mLastModified; |
168 | QPtrList<Attendee> mAttendees; | 170 | QPtrList<Attendee> mAttendees; |
169 | 171 | ||
170 | bool mFloats; | 172 | bool mFloats; |
171 | 173 | ||
172 | int mDuration; | 174 | int mDuration; |
173 | bool mHasDuration; | 175 | bool mHasDuration; |
174 | QString mExternalId; | 176 | QString mExternalId; |
175 | int mTempSyncStat; | 177 | int mTempSyncStat; |
176 | 178 | ||
177 | // PILOT SYNCHRONIZATION STUFF | 179 | // PILOT SYNCHRONIZATION STUFF |
178 | int mPilotId; // unique id for pilot sync | 180 | int mPilotId; // unique id for pilot sync |