Commit 4c15a206 authored by David Jarvie's avatar David Jarvie
Browse files

Use more consistent naming: setSaveDateTime() -> setCreatedDateTime()

parent 8eed9c76
......@@ -302,7 +302,7 @@ void KAEvent::Private::copy(const KAEvent::Private& event)
mPreAction = event.mPreAction;
mPostAction = event.mPostAction;
mStartDateTime = event.mStartDateTime;
mSaveDateTime = event.mSaveDateTime;
mCreatedDateTime = event.mCreatedDateTime;
mAtLoginDateTime = event.mAtLoginDateTime;
mDeferralTime = event.mDeferralTime;
mDisplayingTime = event.mDisplayingTime;
......@@ -571,7 +571,7 @@ void KAEvent::Private::set(const Event* event)
}
}
mNextMainDateTime = readDateTime(event, dateOnly, mStartDateTime);
mSaveDateTime = event->created();
mCreatedDateTime = event->created();
if (dateOnly && !mRepetition.isDaily())
mRepetition.set(Duration(mRepetition.intervalDays(), Duration::Days));
if (mCategory == KAlarm::CalEvent::TEMPLATE)
......@@ -2384,8 +2384,8 @@ bool KAEvent::Private::updateKCalEvent(Event* ev, UidAction uidact) const
mRecurrence->writeRecurrence(*ev->recurrence());
else
ev->clearRecurrence();
if (mSaveDateTime.isValid())
ev->setCreated(mSaveDateTime);
if (mCreatedDateTime.isValid())
ev->setCreated(mCreatedDateTime);
ev->setReadOnly(readOnly);
ev->endUpdates(); // finally issue an update notification
return true;
......@@ -4835,7 +4835,7 @@ void KAEvent::Private::dumpDebug() const
kDebug() << "-- mExcludeHolidays:" << (bool)mExcludeHolidays;
kDebug() << "-- mWorkTimeOnly:" << mWorkTimeOnly;
kDebug() << "-- mStartDateTime:" << mStartDateTime.toString();
kDebug() << "-- mSaveDateTime:" << mSaveDateTime;
kDebug() << "-- mCreatedDateTime:" << mCreatedDateTime;
if (mRepeatAtLogin)
kDebug() << "-- mAtLoginDateTime:" << mAtLoginDateTime;
kDebug() << "-- mArchiveRepeatAtLogin:" << mArchiveRepeatAtLogin;
......
......@@ -348,7 +348,7 @@ class KALARM_CAL_EXPORT KAEvent
void setReadOnly(bool ro) { if (ro != d->mReadOnly) { d->mReadOnly = ro; } }
#endif
void setTime(const KDateTime& dt) { d->mNextMainDateTime = dt; d->mTriggerChanged = true; }
void setSaveDateTime(const KDateTime& dt) { d->mSaveDateTime = dt; }
void setCreatedDateTime(const KDateTime& dt) { d->mCreatedDateTime = dt; }
void setLateCancel(int lc) { d->mLateCancel = lc; }
void setAutoClose(bool ac) { d->mAutoClose = ac; }
void setRepeatAtLogin(bool rl) { d->setRepeatAtLogin(rl); }
......@@ -440,7 +440,7 @@ class KALARM_CAL_EXPORT KAEvent
int revision() const { return d->mRevision; }
bool isValid() const { return d->mAlarmCount && (d->mAlarmCount != 1 || !d->mRepeatAtLogin); }
int alarmCount() const { return d->mAlarmCount; }
KDateTime createdDateTime() const { return d->mSaveDateTime; }
KDateTime createdDateTime() const { return d->mCreatedDateTime; }
const DateTime& startDateTime() const { return d->mStartDateTime; }
DateTime mainDateTime(bool withRepeats = false) const
{ return d->mainDateTime(withRepeats); }
......@@ -706,7 +706,7 @@ class KALARM_CAL_EXPORT KAEvent
QString mPreAction; // command to execute before alarm is displayed
QString mPostAction; // command to execute after alarm window is closed
DateTime mStartDateTime; // DTSTART and DTEND: start and end time for event
KDateTime mSaveDateTime; // CREATED: date event was created, or saved in archive calendar
KDateTime mCreatedDateTime; // CREATED: date event was created, or saved in archive calendar
KDateTime mAtLoginDateTime; // repeat-at-login end time
DateTime mDeferralTime; // extra time to trigger alarm (if alarm or reminder deferred)
DateTime mDisplayingTime; // date/time shown in the alarm currently being displayed
......
......@@ -384,7 +384,7 @@ bool addArchivedEvent(KAEvent& event, AlarmResource* resource)
if (archiving)
{
newev->setCategory(KAlarm::CalEvent::ARCHIVED); // this changes the event ID
newev->setSaveDateTime(KDateTime::currentUtcDateTime()); // time stamp to control purging
newev->setCreatedDateTime(KDateTime::currentUtcDateTime()); // time stamp to control purging
}
// Note that archived resources are automatically saved after changes are made
#ifdef USE_AKONADI
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment