Commit 31eb35b8 authored by David Jarvie's avatar David Jarvie
Browse files

Hide use of internal KAEvent data

parent 745c41f3
......@@ -3111,8 +3111,10 @@ void KAEvent::Private::reinstateFromDisplaying(const Event* kcalEvent, QString&
setCategory(KAlarm::CalEvent::ACTIVE);
#ifdef USE_AKONADI
collectionId = mCollectionId;
mCollectionId = -1;
#else
resourceID = mResourceId;
mResourceId.clear();
#endif
showDefer = mDisplayingDefer;
showEdit = mDisplayingEdit;
......
......@@ -383,11 +383,6 @@ class KALARM_CAL_EXPORT KAEvent
void setEnabled(bool enable) { d->mEnabled = enable; }
void startChanges() { d->startChanges(); }
void endChanges() { d->endChanges(); }
#ifdef USE_AKONADI
void clearCollectionId() { d->mCollectionId = -1; }
#else
void clearResourceId() { d->mResourceId.clear(); }
#endif
void removeExpiredAlarm(KAAlarm::Type t) { d->removeExpiredAlarm(t); }
void incrementRevision() { ++d->mRevision; }
......
......@@ -1229,14 +1229,12 @@ bool MessageWin::reinstateFromDisplaying(const Event* kcalEvent, KAEvent& event,
Akonadi::Collection::Id collectionId;
event.reinstateFromDisplaying(kcalEvent, collectionId, showEdit, showDefer);
collection = AkonadiModel::instance()->collectionById(collectionId);
event.clearCollectionId();
#else
QString resourceID;
event.reinstateFromDisplaying(kcalEvent, resourceID, showEdit, showDefer);
resource = AlarmResources::instance()->resourceWithId(resourceID);
if (resource && !resource->isOpen())
resource = 0;
event.clearResourceId();
#endif
kDebug() << event.id() << ": success";
return true;
......
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