--- a/agendainterface/agendautil/agendautil.pro	Tue Jul 06 14:14:56 2010 +0300
+++ b/agendainterface/agendautil/agendautil.pro	Wed Aug 18 09:47:38 2010 +0300
@@ -39,9 +39,9 @@
 	INCLUDEPATH += $$APP_LAYER_SYSTEMINCLUDE
 }
 
-HEADERS += ../inc/agendautil.h \
+HEADERS += ../../organizer_plat/agenda_interface_api/inc/agendautil.h \
 		   agendautil_p.h \
-		   ../inc/agendaentry.h \
+		   ../../organizer_plat/agenda_interface_api/inc/agendaentry.h \
 		   agendaentry_p.h
 
 SOURCES += agendautil.cpp \

--- a/agendainterface/agendautil/bwins/agendainterfaceu.def	Tue Jul 06 14:14:56 2010 +0300
+++ b/agendainterface/agendautil/bwins/agendainterfaceu.def	Wed Aug 18 09:47:38 2010 +0300
@@ -1,184 +1,180 @@
 EXPORTS
 	?minTime@AgendaUtil@@SA?AVQDateTime@@XZ @ 1 NONAME ; class QDateTime AgendaUtil::minTime(void)
 	??4AgendaCategory@@QAEAAV0@ABV0@@Z @ 2 NONAME ; class AgendaCategory & AgendaCategory::operator=(class AgendaCategory const &)
-	?addEntry@AgendaUtil@@QAEKABVAgendaEntry@@@Z @ 3 NONAME ; unsigned long AgendaUtil::addEntry(class AgendaEntry const &)
-	??_EAgendaEntry@@UAE@I@Z @ 4 NONAME ; AgendaEntry::~AgendaEntry(unsigned int)
-	??8AgendaEntry@@QBE_NABV0@@Z @ 5 NONAME ; bool AgendaEntry::operator==(class AgendaEntry const &) const
-	??1AgendaAlarm@@QAE@XZ @ 6 NONAME ; AgendaAlarm::~AgendaAlarm(void)
-	?setAlarm@AgendaEntry@@QAEXABVAgendaAlarm@@@Z @ 7 NONAME ; void AgendaEntry::setAlarm(class AgendaAlarm const &)
-	?isNull@AgendaEntry@@QBE_NXZ @ 8 NONAME ; bool AgendaEntry::isNull(void) const
-	?isNull@AgendaCategory@@QBE_NXZ @ 9 NONAME ; bool AgendaCategory::isNull(void) const
-	??8AgendaRepeatRule@@QBE_NABV0@@Z @ 10 NONAME ; bool AgendaRepeatRule::operator==(class AgendaRepeatRule const &) const
-	?entryUpdated@AgendaUtil@@IAEXK@Z @ 11 NONAME ; void AgendaUtil::entryUpdated(unsigned long)
-	?alarmSoundName@AgendaAlarm@@QBE?AVQString@@XZ @ 12 NONAME ; class QString AgendaAlarm::alarmSoundName(void) const
-	?alarm@AgendaEntry@@QBE?AVAgendaAlarm@@XZ @ 13 NONAME ; class AgendaAlarm AgendaEntry::alarm(void) const
-	?responseRequested@AgendaAttendee@@QBE_NXZ @ 14 NONAME ; bool AgendaAttendee::responseRequested(void) const
-	?startTime@AgendaEntry@@QBE?AVQDateTime@@XZ @ 15 NONAME ; class QDateTime AgendaEntry::startTime(void) const
-	?geoValue@AgendaEntry@@QBE?AVAgendaGeoValue@@XZ @ 16 NONAME ; class AgendaGeoValue AgendaEntry::geoValue(void) const
-	?getNextInstanceTimes@AgendaUtil@@QAEXAAVAgendaEntry@@AAVQDateTime@@1@Z @ 17 NONAME ; void AgendaUtil::getNextInstanceTimes(class AgendaEntry &, class QDateTime &, class QDateTime &)
-	?exportAsvCalendar@AgendaUtil@@QAE_NABVQString@@J@Z @ 18 NONAME ; bool AgendaUtil::exportAsvCalendar(class QString const &, long)
-	??_EAgendaAttendee@@UAE@I@Z @ 19 NONAME ; AgendaAttendee::~AgendaAttendee(unsigned int)
-	??9AgendaAlarm@@QBE_NABV0@@Z @ 20 NONAME ; bool AgendaAlarm::operator!=(class AgendaAlarm const &) const
-	?isNull@AgendaAlarm@@QBE_NXZ @ 21 NONAME ; bool AgendaAlarm::isNull(void) const
-	?extendedCategoryName@AgendaCategory@@QBE?AVQString@@XZ @ 22 NONAME ; class QString AgendaCategory::extendedCategoryName(void) const
-	?entryIds@AgendaUtil@@QAE?AV?$QList@K@@W4FilterFlags@1@@Z @ 23 NONAME ; class QList<unsigned long> AgendaUtil::entryIds(enum AgendaUtil::FilterFlags)
-	?isRepeating@AgendaEntry@@QAE_NXZ @ 24 NONAME ; bool AgendaEntry::isRepeating(void)
-	?clearRepeatingProperties@AgendaUtil@@QAEXAAVAgendaEntry@@@Z @ 25 NONAME ; void AgendaUtil::clearRepeatingProperties(class AgendaEntry &)
-	?deleteRepeatedEntry@AgendaUtil@@QAEXAAVAgendaEntry@@W4RecurrenceRange@1@@Z @ 26 NONAME ; void AgendaUtil::deleteRepeatedEntry(class AgendaEntry &, enum AgendaUtil::RecurrenceRange)
-	?tr@AgendaUtil@@SA?AVQString@@PBD0H@Z @ 27 NONAME ; class QString AgendaUtil::tr(char const *, char const *, int)
-	?description@AgendaEntry@@QBE?AVQString@@XZ @ 28 NONAME ; class QString AgendaEntry::description(void) const
-	??0AgendaUtil@@QAE@PAVQObject@@@Z @ 29 NONAME ; AgendaUtil::AgendaUtil(class QObject *)
-	?categories@AgendaEntry@@QAEAAV?$QList@VAgendaCategory@@@@XZ @ 30 NONAME ; class QList<class AgendaCategory> & AgendaEntry::categories(void)
-	?entriesChanged@AgendaUtil@@IAEXV?$QList@K@@@Z @ 31 NONAME ; void AgendaUtil::entriesChanged(class QList<unsigned long>)
-	??0AgendaGeoValue@@QAE@XZ @ 32 NONAME ; AgendaGeoValue::AgendaGeoValue(void)
-	?status@AgendaAttendee@@QBE?AW4StatusType@1@XZ @ 33 NONAME ; enum AgendaAttendee::StatusType AgendaAttendee::status(void) const
-	?markDatesWithEvents@AgendaUtil@@QAEXVQDateTime@@0W4FilterFlags@1@AAV?$QList@VQDate@@@@@Z @ 34 NONAME ; void AgendaUtil::markDatesWithEvents(class QDateTime, class QDateTime, enum AgendaUtil::FilterFlags, class QList<class QDate> &)
-	??9AgendaGeoValue@@QBE_NABV0@@Z @ 35 NONAME ; bool AgendaGeoValue::operator!=(class AgendaGeoValue const &) const
-	??0AgendaAlarm@@QAE@XZ @ 36 NONAME ; AgendaAlarm::AgendaAlarm(void)
-	?byMonth@AgendaRepeatRule@@QBE?AV?$QList@W4Month@AgendaRepeatRule@@@@XZ @ 37 NONAME ; class QList<enum AgendaRepeatRule::Month> AgendaRepeatRule::byMonth(void) const
-	?isNull@AgendaAttendee@@QBE_NXZ @ 38 NONAME ; bool AgendaAttendee::isNull(void) const
-	?areNoEntriesInCalendar@AgendaUtil@@QAE_NXZ @ 39 NONAME ; bool AgendaUtil::areNoEntriesInCalendar(void)
-	?clearGeoValue@AgendaEntry@@QBEXXZ @ 40 NONAME ; void AgendaEntry::clearGeoValue(void) const
-	?setAddress@AgendaAttendee@@QAEXABVQString@@@Z @ 41 NONAME ; void AgendaAttendee::setAddress(class QString const &)
-	?setRepeatRuleStart@AgendaRepeatRule@@QAEXABVQDateTime@@@Z @ 42 NONAME ; void AgendaRepeatRule::setRepeatRuleStart(class QDateTime const &)
-	?trUtf8@AgendaUtil@@SA?AVQString@@PBD0H@Z @ 43 NONAME ; class QString AgendaUtil::trUtf8(char const *, char const *, int)
-	?setLastModifiedDateTime@AgendaEntry@@QAEXABVQDateTime@@@Z @ 44 NONAME ; void AgendaEntry::setLastModifiedDateTime(class QDateTime const &)
-	??0AgendaAlarm@@QAE@ABV0@@Z @ 45 NONAME ; AgendaAlarm::AgendaAlarm(class AgendaAlarm const &)
-	?setSummary@AgendaEntry@@QAEXABVQString@@@Z @ 46 NONAME ; void AgendaEntry::setSummary(class QString const &)
-	?setByMonthDay@AgendaRepeatRule@@QAEXABV?$QList@H@@@Z @ 47 NONAME ; void AgendaRepeatRule::setByMonthDay(class QList<int> const &)
-	??1AgendaEntry@@UAE@XZ @ 48 NONAME ; AgendaEntry::~AgendaEntry(void)
-	?setResponseRequested@AgendaAttendee@@QAEX_N@Z @ 49 NONAME ; void AgendaAttendee::setResponseRequested(bool)
-	??1AgendaRepeatRule@@QAE@XZ @ 50 NONAME ; AgendaRepeatRule::~AgendaRepeatRule(void)
-	?byMonthDay@AgendaRepeatRule@@QBE?AV?$QList@H@@XZ @ 51 NONAME ; class QList<int> AgendaRepeatRule::byMonthDay(void) const
-	?detach@AgendaGeoValue@@AAEXXZ @ 52 NONAME ; void AgendaGeoValue::detach(void)
-	?detach@AgendaEntry@@AAEXXZ @ 53 NONAME ; void AgendaEntry::detach(void)
-	??9AgendaAttendee@@QBE_NABV0@@Z @ 54 NONAME ; bool AgendaAttendee::operator!=(class AgendaAttendee const &) const
-	??9AgendaRepeatRule@@QBE_NABV0@@Z @ 55 NONAME ; bool AgendaRepeatRule::operator!=(class AgendaRepeatRule const &) const
-	?weekStart@AgendaRepeatRule@@QBE?AW4Day@1@XZ @ 56 NONAME ; enum AgendaRepeatRule::Day AgendaRepeatRule::weekStart(void) const
-	??4AgendaAlarm@@QAEAAV0@ABV0@@Z @ 57 NONAME ; class AgendaAlarm & AgendaAlarm::operator=(class AgendaAlarm const &)
-	?lastModifiedDateTime@AgendaEntry@@QBE?AVQDateTime@@XZ @ 58 NONAME ; class QDateTime AgendaEntry::lastModifiedDateTime(void) const
-	?attendees@AgendaEntry@@QBEABV?$QList@VAgendaAttendee@@@@XZ @ 59 NONAME ; class QList<class AgendaAttendee> const & AgendaEntry::attendees(void) const
-	?setInterval@AgendaRepeatRule@@QAEXH@Z @ 60 NONAME ; void AgendaRepeatRule::setInterval(int)
-	?updateEntry@AgendaUtil@@QAE_NABVAgendaEntry@@_N@Z @ 61 NONAME ; bool AgendaUtil::updateEntry(class AgendaEntry const &, bool)
-	??8AgendaGeoValue@@QBE_NABV0@@Z @ 62 NONAME ; bool AgendaGeoValue::operator==(class AgendaGeoValue const &) const
-	?id@AgendaEntry@@QBEKXZ @ 63 NONAME ; unsigned long AgendaEntry::id(void) const
-	?setByDay@AgendaRepeatRule@@QAEXABV?$QList@W4Day@AgendaRepeatRule@@@@@Z @ 64 NONAME ; void AgendaRepeatRule::setByDay(class QList<enum AgendaRepeatRule::Day> const &)
-	?setUntil@AgendaRepeatRule@@QAEXABVQDateTime@@@Z @ 65 NONAME ; void AgendaRepeatRule::setUntil(class QDateTime const &)
-	?setType@AgendaRepeatRule@@QAEXW4RuleType@1@@Z @ 66 NONAME ; void AgendaRepeatRule::setType(enum AgendaRepeatRule::RuleType)
-	?interval@AgendaRepeatRule@@QBEHXZ @ 67 NONAME ; int AgendaRepeatRule::interval(void) const
-	?rDates@AgendaEntry@@QBE?AV?$QList@VQDate@@@@XZ @ 68 NONAME ; class QList<class QDate> AgendaEntry::rDates(void) const
-	?repeatRuleStart@AgendaRepeatRule@@QBE?AVQDateTime@@XZ @ 69 NONAME ; class QDateTime AgendaRepeatRule::repeatRuleStart(void) const
-	??8AgendaAlarm@@QBE_NABV0@@Z @ 70 NONAME ; bool AgendaAlarm::operator==(class AgendaAlarm const &) const
-	?storeRepeatingEntry@AgendaUtil@@QAE_NABVAgendaEntry@@_N@Z @ 71 NONAME ; bool AgendaUtil::storeRepeatingEntry(class AgendaEntry const &, bool)
-	??0AgendaRepeatRule@@QAE@ABV0@@Z @ 72 NONAME ; AgendaRepeatRule::AgendaRepeatRule(class AgendaRepeatRule const &)
-	?setStatus@AgendaAttendee@@QAEXW4StatusType@1@@Z @ 73 NONAME ; void AgendaAttendee::setStatus(enum AgendaAttendee::StatusType)
-	?setStatus@AgendaEntry@@QAEXW4Status@1@@Z @ 74 NONAME ; void AgendaEntry::setStatus(enum AgendaEntry::Status)
-	?setExtendedCategoryName@AgendaCategory@@QAEXABVQString@@@Z @ 75 NONAME ; void AgendaCategory::setExtendedCategoryName(class QString const &)
-	?setDescription@AgendaEntry@@QAEXABVQString@@@Z @ 76 NONAME ; void AgendaEntry::setDescription(class QString const &)
-	?recurrenceId@AgendaEntry@@QAE?AVQDateTime@@XZ @ 77 NONAME ; class QDateTime AgendaEntry::recurrenceId(void)
-	?until@AgendaRepeatRule@@QBE?AVQDateTime@@XZ @ 78 NONAME ; class QDateTime AgendaRepeatRule::until(void) const
-	?setByMonth@AgendaRepeatRule@@QAEXABV?$QList@W4Month@AgendaRepeatRule@@@@@Z @ 79 NONAME ; void AgendaRepeatRule::setByMonth(class QList<enum AgendaRepeatRule::Month> const &)
-	?qt_metacall@AgendaUtil@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 80 NONAME ; int AgendaUtil::qt_metacall(enum QMetaObject::Call, int, void * *)
-	?qt_metacast@AgendaUtil@@UAEPAXPBD@Z @ 81 NONAME ; void * AgendaUtil::qt_metacast(char const *)
-	?isNull@AgendaRepeatRule@@QBE_NXZ @ 82 NONAME ; bool AgendaRepeatRule::isNull(void) const
-	?getStaticMetaObject@AgendaUtil@@SAABUQMetaObject@@XZ @ 83 NONAME ; struct QMetaObject const & AgendaUtil::getStaticMetaObject(void)
-	??8AgendaAttendee@@QBE_NABV0@@Z @ 84 NONAME ; bool AgendaAttendee::operator==(class AgendaAttendee const &) const
-	?addCategory@AgendaEntry@@QAEXABVAgendaCategory@@@Z @ 85 NONAME ; void AgendaEntry::addCategory(class AgendaCategory const &)
-	?setLocation@AgendaEntry@@QAEXABVQString@@@Z @ 86 NONAME ; void AgendaEntry::setLocation(class QString const &)
-	?isTimedEntry@AgendaEntry@@QAE_NXZ @ 87 NONAME ; bool AgendaEntry::isTimedEntry(void)
-	?favourite@AgendaEntry@@QBEIXZ @ 88 NONAME ; unsigned int AgendaEntry::favourite(void) const
-	?entryViewCreationCompleted@AgendaUtil@@IAEXH@Z @ 89 NONAME ; void AgendaUtil::entryViewCreationCompleted(int)
-	?durationInSecs@AgendaEntry@@QBEHXZ @ 90 NONAME ; int AgendaEntry::durationInSecs(void) const
-	??1AgendaUtil@@UAE@XZ @ 91 NONAME ; AgendaUtil::~AgendaUtil(void)
-	?category@AgendaCategory@@QBE?AW4CategoryType@1@XZ @ 92 NONAME ; enum AgendaCategory::CategoryType AgendaCategory::category(void) const
-	?entryAdded@AgendaUtil@@IAEXK@Z @ 93 NONAME ; void AgendaUtil::entryAdded(unsigned long)
-	?role@AgendaAttendee@@QBE?AW4ParticipantRole@1@XZ @ 94 NONAME ; enum AgendaAttendee::ParticipantRole AgendaAttendee::role(void) const
-	?type@AgendaEntry@@QBE?AW4Type@1@XZ @ 95 NONAME ; enum AgendaEntry::Type AgendaEntry::type(void) const
-	??0AgendaEntry@@QAE@W4Type@0@@Z @ 96 NONAME ; AgendaEntry::AgendaEntry(enum AgendaEntry::Type)
-	?detach@AgendaRepeatRule@@AAEXXZ @ 97 NONAME ; void AgendaRepeatRule::detach(void)
-	?error@AgendaUtil@@QBE?AW4Error@1@XZ @ 98 NONAME ; enum AgendaUtil::Error AgendaUtil::error(void) const
-	?trUtf8@AgendaUtil@@SA?AVQString@@PBD0@Z @ 99 NONAME ; class QString AgendaUtil::trUtf8(char const *, char const *)
-	?status@AgendaEntry@@QBE?AW4Status@1@XZ @ 100 NONAME ; enum AgendaEntry::Status AgendaEntry::status(void) const
-	??0AgendaEntry@@QAE@ABV0@@Z @ 101 NONAME ; AgendaEntry::AgendaEntry(class AgendaEntry const &)
-	??4AgendaAttendee@@QAEAAV0@ABV0@@Z @ 102 NONAME ; class AgendaAttendee & AgendaAttendee::operator=(class AgendaAttendee const &)
-	?address@AgendaAttendee@@QBE?AVQString@@XZ @ 103 NONAME ; class QString AgendaAttendee::address(void) const
-	?entryDeleted@AgendaUtil@@IAEXK@Z @ 104 NONAME ; void AgendaUtil::entryDeleted(unsigned long)
-	?summary@AgendaEntry@@QBE?AVQString@@XZ @ 105 NONAME ; class QString AgendaEntry::summary(void) const
-	?priority@AgendaEntry@@QBEHXZ @ 106 NONAME ; int AgendaEntry::priority(void) const
-	?fetchById@AgendaUtil@@QAE?AVAgendaEntry@@K@Z @ 107 NONAME ; class AgendaEntry AgendaUtil::fetchById(unsigned long)
-	?setCommonName@AgendaAttendee@@QAEXABVQString@@@Z @ 108 NONAME ; void AgendaAttendee::setCommonName(class QString const &)
-	?setMethod@AgendaEntry@@QAEXW4Method@1@@Z @ 109 NONAME ; void AgendaEntry::setMethod(enum AgendaEntry::Method)
-	?setRDates@AgendaEntry@@QAEXABV?$QList@VQDate@@@@@Z @ 110 NONAME ; void AgendaEntry::setRDates(class QList<class QDate> const &)
-	?parentEntry@AgendaUtil@@QAE?AVAgendaEntry@@AAV2@@Z @ 111 NONAME ; class AgendaEntry AgendaUtil::parentEntry(class AgendaEntry &)
-	?addAttendee@AgendaEntry@@QAEXABVAgendaAttendee@@@Z @ 112 NONAME ; void AgendaEntry::addAttendee(class AgendaAttendee const &)
-	?setCompleted@AgendaUtil@@QAEXAAVAgendaEntry@@_NAAVQDateTime@@@Z @ 113 NONAME ; void AgendaUtil::setCompleted(class AgendaEntry &, bool, class QDateTime &)
-	??0AgendaCategory@@QAE@XZ @ 114 NONAME ; AgendaCategory::AgendaCategory(void)
-	?timeOffset@AgendaAlarm@@QBEHXZ @ 115 NONAME ; int AgendaAlarm::timeOffset(void) const
-	??0AgendaAttendee@@QAE@XZ @ 116 NONAME ; AgendaAttendee::AgendaAttendee(void)
-	?setAlarmSoundName@AgendaAlarm@@QAEXABVQString@@@Z @ 117 NONAME ; void AgendaAlarm::setAlarmSoundName(class QString const &)
-	?fetchEntriesInRange@AgendaUtil@@QAE?AV?$QList@VAgendaEntry@@@@VQDateTime@@0W4FilterFlags@1@@Z @ 118 NONAME ; class QList<class AgendaEntry> AgendaUtil::fetchEntriesInRange(class QDateTime, class QDateTime, enum AgendaUtil::FilterFlags)
-	?detach@AgendaAlarm@@AAEXXZ @ 119 NONAME ; void AgendaAlarm::detach(void)
-	?setWeekStart@AgendaRepeatRule@@QAEXW4Day@1@@Z @ 120 NONAME ; void AgendaRepeatRule::setWeekStart(enum AgendaRepeatRule::Day)
-	?setFavourite@AgendaEntry@@QAEXI@Z @ 121 NONAME ; void AgendaEntry::setFavourite(unsigned int)
-	?setDTStamp@AgendaEntry@@QAEXABVQDateTime@@@Z @ 122 NONAME ; void AgendaEntry::setDTStamp(class QDateTime const &)
-	?cloneEntry@AgendaUtil@@QAEKABVAgendaEntry@@W4Type@2@@Z @ 123 NONAME ; unsigned long AgendaUtil::cloneEntry(class AgendaEntry const &, enum AgendaEntry::Type)
-	?setRepeatRule@AgendaEntry@@QAEXABVAgendaRepeatRule@@@Z @ 124 NONAME ; void AgendaEntry::setRepeatRule(class AgendaRepeatRule const &)
-	?categories@AgendaEntry@@QBEABV?$QList@VAgendaCategory@@@@XZ @ 125 NONAME ; class QList<class AgendaCategory> const & AgendaEntry::categories(void) const
-	?tr@AgendaUtil@@SA?AVQString@@PBD0@Z @ 126 NONAME ; class QString AgendaUtil::tr(char const *, char const *)
-	??4AgendaRepeatRule@@QAEAAV0@ABV0@@Z @ 127 NONAME ; class AgendaRepeatRule & AgendaRepeatRule::operator=(class AgendaRepeatRule const &)
-	?setCompletedDateTime@AgendaEntry@@QAEXABVQDateTime@@@Z @ 128 NONAME ; void AgendaEntry::setCompletedDateTime(class QDateTime const &)
-	??0AgendaRepeatRule@@QAE@XZ @ 129 NONAME ; AgendaRepeatRule::AgendaRepeatRule(void)
-	?dtStamp@AgendaEntry@@QBE?AVQDateTime@@XZ @ 130 NONAME ; class QDateTime AgendaEntry::dtStamp(void) const
-	?method@AgendaEntry@@QBE?AW4Method@1@XZ @ 131 NONAME ; enum AgendaEntry::Method AgendaEntry::method(void) const
-	?type@AgendaRepeatRule@@QBE?AW4RuleType@1@XZ @ 132 NONAME ; enum AgendaRepeatRule::RuleType AgendaRepeatRule::type(void) const
-	??4AgendaGeoValue@@QAEAAV0@ABV0@@Z @ 133 NONAME ; class AgendaGeoValue & AgendaGeoValue::operator=(class AgendaGeoValue const &)
-	??0AgendaCategory@@QAE@W4CategoryType@0@@Z @ 134 NONAME ; AgendaCategory::AgendaCategory(enum AgendaCategory::CategoryType)
-	?commonName@AgendaAttendee@@QBE?AVQString@@XZ @ 135 NONAME ; class QString AgendaAttendee::commonName(void) const
-	?detach@AgendaCategory@@AAEXXZ @ 136 NONAME ; void AgendaCategory::detach(void)
-	??0AgendaGeoValue@@QAE@ABV0@@Z @ 137 NONAME ; AgendaGeoValue::AgendaGeoValue(class AgendaGeoValue const &)
-	?isWorkdaysRepeatingEntry@AgendaUtil@@SA_NABVAgendaRepeatRule@@@Z @ 138 NONAME ; bool AgendaUtil::isWorkdaysRepeatingEntry(class AgendaRepeatRule const &)
-	?setRole@AgendaAttendee@@QAEXW4ParticipantRole@1@@Z @ 139 NONAME ; void AgendaAttendee::setRole(enum AgendaAttendee::ParticipantRole)
-	?detach@AgendaAttendee@@AAEXXZ @ 140 NONAME ; void AgendaAttendee::detach(void)
-	?getLatLong@AgendaGeoValue@@QBEXAAN0@Z @ 141 NONAME ; void AgendaGeoValue::getLatLong(double &, double &) const
-	?maxTime@AgendaUtil@@SA?AVQDateTime@@XZ @ 142 NONAME ; class QDateTime AgendaUtil::maxTime(void)
-	?setCategory@AgendaCategory@@QAEXW4CategoryType@1@@Z @ 143 NONAME ; void AgendaCategory::setCategory(enum AgendaCategory::CategoryType)
-	?endTime@AgendaEntry@@QBE?AVQDateTime@@XZ @ 144 NONAME ; class QDateTime AgendaEntry::endTime(void) const
-	??9AgendaEntry@@QBE_NABV0@@Z @ 145 NONAME ; bool AgendaEntry::operator!=(class AgendaEntry const &) const
-	??0AgendaRepeatRule@@QAE@W4RuleType@0@@Z @ 146 NONAME ; AgendaRepeatRule::AgendaRepeatRule(enum AgendaRepeatRule::RuleType)
-	??9AgendaCategory@@QBE_NABV0@@Z @ 147 NONAME ; bool AgendaCategory::operator!=(class AgendaCategory const &) const
-	??0AgendaAttendee@@QAE@ABV0@@Z @ 148 NONAME ; AgendaAttendee::AgendaAttendee(class AgendaAttendee const &)
-	??0AgendaAttendee@@QAE@ABVQString@@@Z @ 149 NONAME ; AgendaAttendee::AgendaAttendee(class QString const &)
-	?importvCalendar@AgendaUtil@@QAEHABVQString@@AAVAgendaEntry@@@Z @ 150 NONAME ; int AgendaUtil::importvCalendar(class QString const &, class AgendaEntry &)
-	?instanceViewCreationCompleted@AgendaUtil@@IAEXH@Z @ 151 NONAME ; void AgendaUtil::instanceViewCreationCompleted(int)
-	??_EAgendaUtil@@UAE@I@Z @ 152 NONAME ; AgendaUtil::~AgendaUtil(unsigned int)
-	?setGeoValue@AgendaEntry@@QAEXABVAgendaGeoValue@@@Z @ 153 NONAME ; void AgendaEntry::setGeoValue(class AgendaGeoValue const &)
-	?getPreviousInstanceTimes@AgendaUtil@@QAEXAAVAgendaEntry@@AAVQDateTime@@1@Z @ 154 NONAME ; void AgendaUtil::getPreviousInstanceTimes(class AgendaEntry &, class QDateTime &, class QDateTime &)
-	?attendees@AgendaEntry@@QAEAAV?$QList@VAgendaAttendee@@@@XZ @ 155 NONAME ; class QList<class AgendaAttendee> & AgendaEntry::attendees(void)
-	?staticMetaObject@AgendaUtil@@2UQMetaObject@@B @ 156 NONAME ; struct QMetaObject const AgendaUtil::staticMetaObject
-	?entriesDeleted@AgendaUtil@@IAEXH@Z @ 157 NONAME ; void AgendaUtil::entriesDeleted(int)
-	?fetchAllEntries@AgendaUtil@@QAE?AV?$QList@VAgendaEntry@@@@W4FilterFlags@1@@Z @ 158 NONAME ; class QList<class AgendaEntry> AgendaUtil::fetchAllEntries(enum AgendaUtil::FilterFlags)
-	?setTimeOffset@AgendaAlarm@@QAEXH@Z @ 159 NONAME ; void AgendaAlarm::setTimeOffset(int)
-	??0AgendaEntry@@QAE@XZ @ 160 NONAME ; AgendaEntry::AgendaEntry(void)
-	?setPriority@AgendaEntry@@QAEXH@Z @ 161 NONAME ; void AgendaEntry::setPriority(int)
-	?setType@AgendaEntry@@QAEXW4Type@1@@Z @ 162 NONAME ; void AgendaEntry::setType(enum AgendaEntry::Type)
-	?setStartAndEndTime@AgendaEntry@@QAE_NABVQDateTime@@0@Z @ 163 NONAME ; bool AgendaEntry::setStartAndEndTime(class QDateTime const &, class QDateTime const &)
-	?deleteEntries@AgendaUtil@@QAEXAAVQDateTime@@0W4FilterFlags@1@@Z @ 164 NONAME ; void AgendaUtil::deleteEntries(class QDateTime &, class QDateTime &, enum AgendaUtil::FilterFlags)
-	?metaObject@AgendaUtil@@UBEPBUQMetaObject@@XZ @ 165 NONAME ; struct QMetaObject const * AgendaUtil::metaObject(void) const
-	?location@AgendaEntry@@QBE?AVQString@@XZ @ 166 NONAME ; class QString AgendaEntry::location(void) const
-	??8AgendaCategory@@QBE_NABV0@@Z @ 167 NONAME ; bool AgendaCategory::operator==(class AgendaCategory const &) const
-	??0AgendaCategory@@QAE@ABV0@@Z @ 168 NONAME ; AgendaCategory::AgendaCategory(class AgendaCategory const &)
-	??1AgendaGeoValue@@QAE@XZ @ 169 NONAME ; AgendaGeoValue::~AgendaGeoValue(void)
-	??4AgendaEntry@@QAEAAV0@ABV0@@Z @ 170 NONAME ; class AgendaEntry & AgendaEntry::operator=(class AgendaEntry const &)
-	??_EAgendaCategory@@UAE@I@Z @ 171 NONAME ; AgendaCategory::~AgendaCategory(unsigned int)
-	?createEntryIdListForDay@AgendaUtil@@QAE?AV?$QList@VAgendaEntry@@@@VQDateTime@@W4FilterFlags@1@@Z @ 172 NONAME ; class QList<class AgendaEntry> AgendaUtil::createEntryIdListForDay(class QDateTime, enum AgendaUtil::FilterFlags)
-	?createException@AgendaUtil@@QAE_NABVAgendaEntry@@VQDateTime@@@Z @ 173 NONAME ; bool AgendaUtil::createException(class AgendaEntry const &, class QDateTime)
-	?repeatRule@AgendaEntry@@QBE?AVAgendaRepeatRule@@XZ @ 174 NONAME ; class AgendaRepeatRule AgendaEntry::repeatRule(void) const
-	??1AgendaCategory@@UAE@XZ @ 175 NONAME ; AgendaCategory::~AgendaCategory(void)
-	?deleteEntry@AgendaUtil@@QAE_NK@Z @ 176 NONAME ; bool AgendaUtil::deleteEntry(unsigned long)
-	??1AgendaAttendee@@UAE@XZ @ 177 NONAME ; AgendaAttendee::~AgendaAttendee(void)
-	?byDay@AgendaRepeatRule@@QBE?AV?$QList@W4Day@AgendaRepeatRule@@@@XZ @ 178 NONAME ; class QList<enum AgendaRepeatRule::Day> AgendaRepeatRule::byDay(void) const
-	?setLatLong@AgendaGeoValue@@QAEXNN@Z @ 179 NONAME ; void AgendaGeoValue::setLatLong(double, double)
-	?completedDateTime@AgendaEntry@@QBE?AVQDateTime@@XZ @ 180 NONAME ; class QDateTime AgendaEntry::completedDateTime(void) const
-	?setRecurrenceId@AgendaEntry@@QAEXAAVQDateTime@@@Z @ 181 NONAME ; void AgendaEntry::setRecurrenceId(class QDateTime &)
-	?isNull@AgendaGeoValue@@QBE_NXZ @ 182 NONAME ; bool AgendaGeoValue::isNull(void) const
+	??_EAgendaEntry@@UAE@I@Z @ 3 NONAME ; AgendaEntry::~AgendaEntry(unsigned int)
+	??8AgendaEntry@@QBE_NABV0@@Z @ 4 NONAME ; bool AgendaEntry::operator==(class AgendaEntry const &) const
+	??1AgendaAlarm@@QAE@XZ @ 5 NONAME ; AgendaAlarm::~AgendaAlarm(void)
+	?setAlarm@AgendaEntry@@QAEXABVAgendaAlarm@@@Z @ 6 NONAME ; void AgendaEntry::setAlarm(class AgendaAlarm const &)
+	?isNull@AgendaEntry@@QBE_NXZ @ 7 NONAME ; bool AgendaEntry::isNull(void) const
+	?isNull@AgendaCategory@@QBE_NXZ @ 8 NONAME ; bool AgendaCategory::isNull(void) const
+	??8AgendaRepeatRule@@QBE_NABV0@@Z @ 9 NONAME ; bool AgendaRepeatRule::operator==(class AgendaRepeatRule const &) const
+	?entryUpdated@AgendaUtil@@IAEXK@Z @ 10 NONAME ; void AgendaUtil::entryUpdated(unsigned long)
+	?alarmSoundName@AgendaAlarm@@QBE?AVQString@@XZ @ 11 NONAME ; class QString AgendaAlarm::alarmSoundName(void) const
+	?alarm@AgendaEntry@@QBE?AVAgendaAlarm@@XZ @ 12 NONAME ; class AgendaAlarm AgendaEntry::alarm(void) const
+	?responseRequested@AgendaAttendee@@QBE_NXZ @ 13 NONAME ; bool AgendaAttendee::responseRequested(void) const
+	?startTime@AgendaEntry@@QBE?AVQDateTime@@XZ @ 14 NONAME ; class QDateTime AgendaEntry::startTime(void) const
+	?geoValue@AgendaEntry@@QBE?AVAgendaGeoValue@@XZ @ 15 NONAME ; class AgendaGeoValue AgendaEntry::geoValue(void) const
+	?getNextInstanceTimes@AgendaUtil@@QAEXAAVAgendaEntry@@AAVQDateTime@@1@Z @ 16 NONAME ; void AgendaUtil::getNextInstanceTimes(class AgendaEntry &, class QDateTime &, class QDateTime &)
+	?exportAsvCalendar@AgendaUtil@@QAE_NABVQString@@J@Z @ 17 NONAME ; bool AgendaUtil::exportAsvCalendar(class QString const &, long)
+	??_EAgendaAttendee@@UAE@I@Z @ 18 NONAME ; AgendaAttendee::~AgendaAttendee(unsigned int)
+	??9AgendaAlarm@@QBE_NABV0@@Z @ 19 NONAME ; bool AgendaAlarm::operator!=(class AgendaAlarm const &) const
+	?isNull@AgendaAlarm@@QBE_NXZ @ 20 NONAME ; bool AgendaAlarm::isNull(void) const
+	?extendedCategoryName@AgendaCategory@@QBE?AVQString@@XZ @ 21 NONAME ; class QString AgendaCategory::extendedCategoryName(void) const
+	?entryIds@AgendaUtil@@QAE?AV?$QList@K@@W4FilterFlags@1@@Z @ 22 NONAME ; class QList<unsigned long> AgendaUtil::entryIds(enum AgendaUtil::FilterFlags)
+	?isRepeating@AgendaEntry@@QAE_NXZ @ 23 NONAME ; bool AgendaEntry::isRepeating(void)
+	?deleteRepeatedEntry@AgendaUtil@@QAEXAAVAgendaEntry@@W4RecurrenceRange@1@@Z @ 24 NONAME ; void AgendaUtil::deleteRepeatedEntry(class AgendaEntry &, enum AgendaUtil::RecurrenceRange)
+	?tr@AgendaUtil@@SA?AVQString@@PBD0H@Z @ 25 NONAME ; class QString AgendaUtil::tr(char const *, char const *, int)
+	?description@AgendaEntry@@QBE?AVQString@@XZ @ 26 NONAME ; class QString AgendaEntry::description(void) const
+	??0AgendaUtil@@QAE@PAVQObject@@@Z @ 27 NONAME ; AgendaUtil::AgendaUtil(class QObject *)
+	?categories@AgendaEntry@@QAEAAV?$QList@VAgendaCategory@@@@XZ @ 28 NONAME ; class QList<class AgendaCategory> & AgendaEntry::categories(void)
+	?entriesChanged@AgendaUtil@@IAEXV?$QList@K@@@Z @ 29 NONAME ; void AgendaUtil::entriesChanged(class QList<unsigned long>)
+	??0AgendaGeoValue@@QAE@XZ @ 30 NONAME ; AgendaGeoValue::AgendaGeoValue(void)
+	?status@AgendaAttendee@@QBE?AW4StatusType@1@XZ @ 31 NONAME ; enum AgendaAttendee::StatusType AgendaAttendee::status(void) const
+	?markDatesWithEvents@AgendaUtil@@QAEXVQDateTime@@0W4FilterFlags@1@AAV?$QList@VQDate@@@@@Z @ 32 NONAME ; void AgendaUtil::markDatesWithEvents(class QDateTime, class QDateTime, enum AgendaUtil::FilterFlags, class QList<class QDate> &)
+	??9AgendaGeoValue@@QBE_NABV0@@Z @ 33 NONAME ; bool AgendaGeoValue::operator!=(class AgendaGeoValue const &) const
+	??0AgendaAlarm@@QAE@XZ @ 34 NONAME ; AgendaAlarm::AgendaAlarm(void)
+	?byMonth@AgendaRepeatRule@@QBE?AV?$QList@W4Month@AgendaRepeatRule@@@@XZ @ 35 NONAME ; class QList<enum AgendaRepeatRule::Month> AgendaRepeatRule::byMonth(void) const
+	?isNull@AgendaAttendee@@QBE_NXZ @ 36 NONAME ; bool AgendaAttendee::isNull(void) const
+	?areNoEntriesInCalendar@AgendaUtil@@QAE_NXZ @ 37 NONAME ; bool AgendaUtil::areNoEntriesInCalendar(void)
+	?clearGeoValue@AgendaEntry@@QBEXXZ @ 38 NONAME ; void AgendaEntry::clearGeoValue(void) const
+	?setAddress@AgendaAttendee@@QAEXABVQString@@@Z @ 39 NONAME ; void AgendaAttendee::setAddress(class QString const &)
+	?setRepeatRuleStart@AgendaRepeatRule@@QAEXABVQDateTime@@@Z @ 40 NONAME ; void AgendaRepeatRule::setRepeatRuleStart(class QDateTime const &)
+	?trUtf8@AgendaUtil@@SA?AVQString@@PBD0H@Z @ 41 NONAME ; class QString AgendaUtil::trUtf8(char const *, char const *, int)
+	?setLastModifiedDateTime@AgendaEntry@@QAEXABVQDateTime@@@Z @ 42 NONAME ; void AgendaEntry::setLastModifiedDateTime(class QDateTime const &)
+	??0AgendaAlarm@@QAE@ABV0@@Z @ 43 NONAME ; AgendaAlarm::AgendaAlarm(class AgendaAlarm const &)
+	?setSummary@AgendaEntry@@QAEXABVQString@@@Z @ 44 NONAME ; void AgendaEntry::setSummary(class QString const &)
+	?setByMonthDay@AgendaRepeatRule@@QAEXABV?$QList@H@@@Z @ 45 NONAME ; void AgendaRepeatRule::setByMonthDay(class QList<int> const &)
+	??1AgendaEntry@@UAE@XZ @ 46 NONAME ; AgendaEntry::~AgendaEntry(void)
+	?setResponseRequested@AgendaAttendee@@QAEX_N@Z @ 47 NONAME ; void AgendaAttendee::setResponseRequested(bool)
+	??1AgendaRepeatRule@@QAE@XZ @ 48 NONAME ; AgendaRepeatRule::~AgendaRepeatRule(void)
+	?byMonthDay@AgendaRepeatRule@@QBE?AV?$QList@H@@XZ @ 49 NONAME ; class QList<int> AgendaRepeatRule::byMonthDay(void) const
+	?detach@AgendaGeoValue@@AAEXXZ @ 50 NONAME ; void AgendaGeoValue::detach(void)
+	?detach@AgendaEntry@@AAEXXZ @ 51 NONAME ; void AgendaEntry::detach(void)
+	??9AgendaAttendee@@QBE_NABV0@@Z @ 52 NONAME ; bool AgendaAttendee::operator!=(class AgendaAttendee const &) const
+	??9AgendaRepeatRule@@QBE_NABV0@@Z @ 53 NONAME ; bool AgendaRepeatRule::operator!=(class AgendaRepeatRule const &) const
+	?weekStart@AgendaRepeatRule@@QBE?AW4Day@1@XZ @ 54 NONAME ; enum AgendaRepeatRule::Day AgendaRepeatRule::weekStart(void) const
+	??4AgendaAlarm@@QAEAAV0@ABV0@@Z @ 55 NONAME ; class AgendaAlarm & AgendaAlarm::operator=(class AgendaAlarm const &)
+	?lastModifiedDateTime@AgendaEntry@@QBE?AVQDateTime@@XZ @ 56 NONAME ; class QDateTime AgendaEntry::lastModifiedDateTime(void) const
+	?attendees@AgendaEntry@@QBEABV?$QList@VAgendaAttendee@@@@XZ @ 57 NONAME ; class QList<class AgendaAttendee> const & AgendaEntry::attendees(void) const
+	?setInterval@AgendaRepeatRule@@QAEXH@Z @ 58 NONAME ; void AgendaRepeatRule::setInterval(int)
+	?store@AgendaUtil@@QAEKAAVAgendaEntry@@W4RecurrenceRange@1@@Z @ 59 NONAME ; unsigned long AgendaUtil::store(class AgendaEntry &, enum AgendaUtil::RecurrenceRange)
+	??8AgendaGeoValue@@QBE_NABV0@@Z @ 60 NONAME ; bool AgendaGeoValue::operator==(class AgendaGeoValue const &) const
+	?id@AgendaEntry@@QBEKXZ @ 61 NONAME ; unsigned long AgendaEntry::id(void) const
+	?setByDay@AgendaRepeatRule@@QAEXABV?$QList@W4Day@AgendaRepeatRule@@@@@Z @ 62 NONAME ; void AgendaRepeatRule::setByDay(class QList<enum AgendaRepeatRule::Day> const &)
+	?setUntil@AgendaRepeatRule@@QAEXABVQDateTime@@@Z @ 63 NONAME ; void AgendaRepeatRule::setUntil(class QDateTime const &)
+	?setType@AgendaRepeatRule@@QAEXW4RuleType@1@@Z @ 64 NONAME ; void AgendaRepeatRule::setType(enum AgendaRepeatRule::RuleType)
+	?interval@AgendaRepeatRule@@QBEHXZ @ 65 NONAME ; int AgendaRepeatRule::interval(void) const
+	?rDates@AgendaEntry@@QBE?AV?$QList@VQDate@@@@XZ @ 66 NONAME ; class QList<class QDate> AgendaEntry::rDates(void) const
+	?repeatRuleStart@AgendaRepeatRule@@QBE?AVQDateTime@@XZ @ 67 NONAME ; class QDateTime AgendaRepeatRule::repeatRuleStart(void) const
+	??8AgendaAlarm@@QBE_NABV0@@Z @ 68 NONAME ; bool AgendaAlarm::operator==(class AgendaAlarm const &) const
+	??0AgendaRepeatRule@@QAE@ABV0@@Z @ 69 NONAME ; AgendaRepeatRule::AgendaRepeatRule(class AgendaRepeatRule const &)
+	?setStatus@AgendaAttendee@@QAEXW4StatusType@1@@Z @ 70 NONAME ; void AgendaAttendee::setStatus(enum AgendaAttendee::StatusType)
+	?setStatus@AgendaEntry@@QAEXW4Status@1@@Z @ 71 NONAME ; void AgendaEntry::setStatus(enum AgendaEntry::Status)
+	?setExtendedCategoryName@AgendaCategory@@QAEXABVQString@@@Z @ 72 NONAME ; void AgendaCategory::setExtendedCategoryName(class QString const &)
+	?setDescription@AgendaEntry@@QAEXABVQString@@@Z @ 73 NONAME ; void AgendaEntry::setDescription(class QString const &)
+	?recurrenceId@AgendaEntry@@QAE?AVQDateTime@@XZ @ 74 NONAME ; class QDateTime AgendaEntry::recurrenceId(void)
+	?until@AgendaRepeatRule@@QBE?AVQDateTime@@XZ @ 75 NONAME ; class QDateTime AgendaRepeatRule::until(void) const
+	?setByMonth@AgendaRepeatRule@@QAEXABV?$QList@W4Month@AgendaRepeatRule@@@@@Z @ 76 NONAME ; void AgendaRepeatRule::setByMonth(class QList<enum AgendaRepeatRule::Month> const &)
+	?qt_metacall@AgendaUtil@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 77 NONAME ; int AgendaUtil::qt_metacall(enum QMetaObject::Call, int, void * *)
+	?qt_metacast@AgendaUtil@@UAEPAXPBD@Z @ 78 NONAME ; void * AgendaUtil::qt_metacast(char const *)
+	?isNull@AgendaRepeatRule@@QBE_NXZ @ 79 NONAME ; bool AgendaRepeatRule::isNull(void) const
+	?getStaticMetaObject@AgendaUtil@@SAABUQMetaObject@@XZ @ 80 NONAME ; struct QMetaObject const & AgendaUtil::getStaticMetaObject(void)
+	??8AgendaAttendee@@QBE_NABV0@@Z @ 81 NONAME ; bool AgendaAttendee::operator==(class AgendaAttendee const &) const
+	?addCategory@AgendaEntry@@QAEXABVAgendaCategory@@@Z @ 82 NONAME ; void AgendaEntry::addCategory(class AgendaCategory const &)
+	?setLocation@AgendaEntry@@QAEXABVQString@@@Z @ 83 NONAME ; void AgendaEntry::setLocation(class QString const &)
+	?isTimedEntry@AgendaEntry@@QAE_NXZ @ 84 NONAME ; bool AgendaEntry::isTimedEntry(void)
+	?favourite@AgendaEntry@@QBEIXZ @ 85 NONAME ; unsigned int AgendaEntry::favourite(void) const
+	?entryViewCreationCompleted@AgendaUtil@@IAEXH@Z @ 86 NONAME ; void AgendaUtil::entryViewCreationCompleted(int)
+	?durationInSecs@AgendaEntry@@QBEHXZ @ 87 NONAME ; int AgendaEntry::durationInSecs(void) const
+	??1AgendaUtil@@UAE@XZ @ 88 NONAME ; AgendaUtil::~AgendaUtil(void)
+	?category@AgendaCategory@@QBE?AW4CategoryType@1@XZ @ 89 NONAME ; enum AgendaCategory::CategoryType AgendaCategory::category(void) const
+	?entryAdded@AgendaUtil@@IAEXK@Z @ 90 NONAME ; void AgendaUtil::entryAdded(unsigned long)
+	?role@AgendaAttendee@@QBE?AW4ParticipantRole@1@XZ @ 91 NONAME ; enum AgendaAttendee::ParticipantRole AgendaAttendee::role(void) const
+	?type@AgendaEntry@@QBE?AW4Type@1@XZ @ 92 NONAME ; enum AgendaEntry::Type AgendaEntry::type(void) const
+	??0AgendaEntry@@QAE@W4Type@0@@Z @ 93 NONAME ; AgendaEntry::AgendaEntry(enum AgendaEntry::Type)
+	?detach@AgendaRepeatRule@@AAEXXZ @ 94 NONAME ; void AgendaRepeatRule::detach(void)
+	?error@AgendaUtil@@QBE?AW4Error@1@XZ @ 95 NONAME ; enum AgendaUtil::Error AgendaUtil::error(void) const
+	?trUtf8@AgendaUtil@@SA?AVQString@@PBD0@Z @ 96 NONAME ; class QString AgendaUtil::trUtf8(char const *, char const *)
+	?status@AgendaEntry@@QBE?AW4Status@1@XZ @ 97 NONAME ; enum AgendaEntry::Status AgendaEntry::status(void) const
+	??0AgendaEntry@@QAE@ABV0@@Z @ 98 NONAME ; AgendaEntry::AgendaEntry(class AgendaEntry const &)
+	??4AgendaAttendee@@QAEAAV0@ABV0@@Z @ 99 NONAME ; class AgendaAttendee & AgendaAttendee::operator=(class AgendaAttendee const &)
+	?address@AgendaAttendee@@QBE?AVQString@@XZ @ 100 NONAME ; class QString AgendaAttendee::address(void) const
+	?entryDeleted@AgendaUtil@@IAEXK@Z @ 101 NONAME ; void AgendaUtil::entryDeleted(unsigned long)
+	?summary@AgendaEntry@@QBE?AVQString@@XZ @ 102 NONAME ; class QString AgendaEntry::summary(void) const
+	?priority@AgendaEntry@@QBEHXZ @ 103 NONAME ; int AgendaEntry::priority(void) const
+	?fetchById@AgendaUtil@@QAE?AVAgendaEntry@@K@Z @ 104 NONAME ; class AgendaEntry AgendaUtil::fetchById(unsigned long)
+	?setCommonName@AgendaAttendee@@QAEXABVQString@@@Z @ 105 NONAME ; void AgendaAttendee::setCommonName(class QString const &)
+	?setMethod@AgendaEntry@@QAEXW4Method@1@@Z @ 106 NONAME ; void AgendaEntry::setMethod(enum AgendaEntry::Method)
+	?setRDates@AgendaEntry@@QAEXABV?$QList@VQDate@@@@@Z @ 107 NONAME ; void AgendaEntry::setRDates(class QList<class QDate> const &)
+	?parentEntry@AgendaUtil@@QAE?AVAgendaEntry@@AAV2@@Z @ 108 NONAME ; class AgendaEntry AgendaUtil::parentEntry(class AgendaEntry &)
+	?addAttendee@AgendaEntry@@QAEXABVAgendaAttendee@@@Z @ 109 NONAME ; void AgendaEntry::addAttendee(class AgendaAttendee const &)
+	?setCompleted@AgendaUtil@@QAEXAAVAgendaEntry@@_NAAVQDateTime@@@Z @ 110 NONAME ; void AgendaUtil::setCompleted(class AgendaEntry &, bool, class QDateTime &)
+	??0AgendaCategory@@QAE@XZ @ 111 NONAME ; AgendaCategory::AgendaCategory(void)
+	?timeOffset@AgendaAlarm@@QBEHXZ @ 112 NONAME ; int AgendaAlarm::timeOffset(void) const
+	??0AgendaAttendee@@QAE@XZ @ 113 NONAME ; AgendaAttendee::AgendaAttendee(void)
+	?setAlarmSoundName@AgendaAlarm@@QAEXABVQString@@@Z @ 114 NONAME ; void AgendaAlarm::setAlarmSoundName(class QString const &)
+	?fetchEntriesInRange@AgendaUtil@@QAE?AV?$QList@VAgendaEntry@@@@VQDateTime@@0W4FilterFlags@1@@Z @ 115 NONAME ; class QList<class AgendaEntry> AgendaUtil::fetchEntriesInRange(class QDateTime, class QDateTime, enum AgendaUtil::FilterFlags)
+	?detach@AgendaAlarm@@AAEXXZ @ 116 NONAME ; void AgendaAlarm::detach(void)
+	?setWeekStart@AgendaRepeatRule@@QAEXW4Day@1@@Z @ 117 NONAME ; void AgendaRepeatRule::setWeekStart(enum AgendaRepeatRule::Day)
+	?setFavourite@AgendaEntry@@QAEXI@Z @ 118 NONAME ; void AgendaEntry::setFavourite(unsigned int)
+	?setDTStamp@AgendaEntry@@QAEXABVQDateTime@@@Z @ 119 NONAME ; void AgendaEntry::setDTStamp(class QDateTime const &)
+	?cloneEntry@AgendaUtil@@QAEKABVAgendaEntry@@W4Type@2@@Z @ 120 NONAME ; unsigned long AgendaUtil::cloneEntry(class AgendaEntry const &, enum AgendaEntry::Type)
+	?setRepeatRule@AgendaEntry@@QAEXABVAgendaRepeatRule@@@Z @ 121 NONAME ; void AgendaEntry::setRepeatRule(class AgendaRepeatRule const &)
+	?categories@AgendaEntry@@QBEABV?$QList@VAgendaCategory@@@@XZ @ 122 NONAME ; class QList<class AgendaCategory> const & AgendaEntry::categories(void) const
+	?tr@AgendaUtil@@SA?AVQString@@PBD0@Z @ 123 NONAME ; class QString AgendaUtil::tr(char const *, char const *)
+	??4AgendaRepeatRule@@QAEAAV0@ABV0@@Z @ 124 NONAME ; class AgendaRepeatRule & AgendaRepeatRule::operator=(class AgendaRepeatRule const &)
+	?setCompletedDateTime@AgendaEntry@@QAEXABVQDateTime@@@Z @ 125 NONAME ; void AgendaEntry::setCompletedDateTime(class QDateTime const &)
+	??0AgendaRepeatRule@@QAE@XZ @ 126 NONAME ; AgendaRepeatRule::AgendaRepeatRule(void)
+	?dtStamp@AgendaEntry@@QBE?AVQDateTime@@XZ @ 127 NONAME ; class QDateTime AgendaEntry::dtStamp(void) const
+	?method@AgendaEntry@@QBE?AW4Method@1@XZ @ 128 NONAME ; enum AgendaEntry::Method AgendaEntry::method(void) const
+	?type@AgendaRepeatRule@@QBE?AW4RuleType@1@XZ @ 129 NONAME ; enum AgendaRepeatRule::RuleType AgendaRepeatRule::type(void) const
+	??4AgendaGeoValue@@QAEAAV0@ABV0@@Z @ 130 NONAME ; class AgendaGeoValue & AgendaGeoValue::operator=(class AgendaGeoValue const &)
+	??0AgendaCategory@@QAE@W4CategoryType@0@@Z @ 131 NONAME ; AgendaCategory::AgendaCategory(enum AgendaCategory::CategoryType)
+	?commonName@AgendaAttendee@@QBE?AVQString@@XZ @ 132 NONAME ; class QString AgendaAttendee::commonName(void) const
+	?detach@AgendaCategory@@AAEXXZ @ 133 NONAME ; void AgendaCategory::detach(void)
+	??0AgendaGeoValue@@QAE@ABV0@@Z @ 134 NONAME ; AgendaGeoValue::AgendaGeoValue(class AgendaGeoValue const &)
+	?isWorkdaysRepeatingEntry@AgendaUtil@@SA_NABVAgendaRepeatRule@@@Z @ 135 NONAME ; bool AgendaUtil::isWorkdaysRepeatingEntry(class AgendaRepeatRule const &)
+	?setRole@AgendaAttendee@@QAEXW4ParticipantRole@1@@Z @ 136 NONAME ; void AgendaAttendee::setRole(enum AgendaAttendee::ParticipantRole)
+	?detach@AgendaAttendee@@AAEXXZ @ 137 NONAME ; void AgendaAttendee::detach(void)
+	?getLatLong@AgendaGeoValue@@QBEXAAN0@Z @ 138 NONAME ; void AgendaGeoValue::getLatLong(double &, double &) const
+	?maxTime@AgendaUtil@@SA?AVQDateTime@@XZ @ 139 NONAME ; class QDateTime AgendaUtil::maxTime(void)
+	?setCategory@AgendaCategory@@QAEXW4CategoryType@1@@Z @ 140 NONAME ; void AgendaCategory::setCategory(enum AgendaCategory::CategoryType)
+	?endTime@AgendaEntry@@QBE?AVQDateTime@@XZ @ 141 NONAME ; class QDateTime AgendaEntry::endTime(void) const
+	??9AgendaEntry@@QBE_NABV0@@Z @ 142 NONAME ; bool AgendaEntry::operator!=(class AgendaEntry const &) const
+	??0AgendaRepeatRule@@QAE@W4RuleType@0@@Z @ 143 NONAME ; AgendaRepeatRule::AgendaRepeatRule(enum AgendaRepeatRule::RuleType)
+	??9AgendaCategory@@QBE_NABV0@@Z @ 144 NONAME ; bool AgendaCategory::operator!=(class AgendaCategory const &) const
+	??0AgendaAttendee@@QAE@ABV0@@Z @ 145 NONAME ; AgendaAttendee::AgendaAttendee(class AgendaAttendee const &)
+	??0AgendaAttendee@@QAE@ABVQString@@@Z @ 146 NONAME ; AgendaAttendee::AgendaAttendee(class QString const &)
+	?importvCalendar@AgendaUtil@@QAEHABVQString@@AAVAgendaEntry@@@Z @ 147 NONAME ; int AgendaUtil::importvCalendar(class QString const &, class AgendaEntry &)
+	?instanceViewCreationCompleted@AgendaUtil@@IAEXH@Z @ 148 NONAME ; void AgendaUtil::instanceViewCreationCompleted(int)
+	??_EAgendaUtil@@UAE@I@Z @ 149 NONAME ; AgendaUtil::~AgendaUtil(unsigned int)
+	?setGeoValue@AgendaEntry@@QAEXABVAgendaGeoValue@@@Z @ 150 NONAME ; void AgendaEntry::setGeoValue(class AgendaGeoValue const &)
+	?getPreviousInstanceTimes@AgendaUtil@@QAEXAAVAgendaEntry@@AAVQDateTime@@1@Z @ 151 NONAME ; void AgendaUtil::getPreviousInstanceTimes(class AgendaEntry &, class QDateTime &, class QDateTime &)
+	?attendees@AgendaEntry@@QAEAAV?$QList@VAgendaAttendee@@@@XZ @ 152 NONAME ; class QList<class AgendaAttendee> & AgendaEntry::attendees(void)
+	?staticMetaObject@AgendaUtil@@2UQMetaObject@@B @ 153 NONAME ; struct QMetaObject const AgendaUtil::staticMetaObject
+	?entriesDeleted@AgendaUtil@@IAEXH@Z @ 154 NONAME ; void AgendaUtil::entriesDeleted(int)
+	?fetchAllEntries@AgendaUtil@@QAE?AV?$QList@VAgendaEntry@@@@W4FilterFlags@1@@Z @ 155 NONAME ; class QList<class AgendaEntry> AgendaUtil::fetchAllEntries(enum AgendaUtil::FilterFlags)
+	?setTimeOffset@AgendaAlarm@@QAEXH@Z @ 156 NONAME ; void AgendaAlarm::setTimeOffset(int)
+	??0AgendaEntry@@QAE@XZ @ 157 NONAME ; AgendaEntry::AgendaEntry(void)
+	?setPriority@AgendaEntry@@QAEXH@Z @ 158 NONAME ; void AgendaEntry::setPriority(int)
+	?setType@AgendaEntry@@QAEXW4Type@1@@Z @ 159 NONAME ; void AgendaEntry::setType(enum AgendaEntry::Type)
+	?setStartAndEndTime@AgendaEntry@@QAE_NABVQDateTime@@0@Z @ 160 NONAME ; bool AgendaEntry::setStartAndEndTime(class QDateTime const &, class QDateTime const &)
+	?deleteEntries@AgendaUtil@@QAEXAAVQDateTime@@0W4FilterFlags@1@@Z @ 161 NONAME ; void AgendaUtil::deleteEntries(class QDateTime &, class QDateTime &, enum AgendaUtil::FilterFlags)
+	?metaObject@AgendaUtil@@UBEPBUQMetaObject@@XZ @ 162 NONAME ; struct QMetaObject const * AgendaUtil::metaObject(void) const
+	?location@AgendaEntry@@QBE?AVQString@@XZ @ 163 NONAME ; class QString AgendaEntry::location(void) const
+	??8AgendaCategory@@QBE_NABV0@@Z @ 164 NONAME ; bool AgendaCategory::operator==(class AgendaCategory const &) const
+	??0AgendaCategory@@QAE@ABV0@@Z @ 165 NONAME ; AgendaCategory::AgendaCategory(class AgendaCategory const &)
+	??1AgendaGeoValue@@QAE@XZ @ 166 NONAME ; AgendaGeoValue::~AgendaGeoValue(void)
+	??4AgendaEntry@@QAEAAV0@ABV0@@Z @ 167 NONAME ; class AgendaEntry & AgendaEntry::operator=(class AgendaEntry const &)
+	??_EAgendaCategory@@UAE@I@Z @ 168 NONAME ; AgendaCategory::~AgendaCategory(unsigned int)
+	?createEntryIdListForDay@AgendaUtil@@QAE?AV?$QList@VAgendaEntry@@@@VQDateTime@@W4FilterFlags@1@@Z @ 169 NONAME ; class QList<class AgendaEntry> AgendaUtil::createEntryIdListForDay(class QDateTime, enum AgendaUtil::FilterFlags)
+	?repeatRule@AgendaEntry@@QBE?AVAgendaRepeatRule@@XZ @ 170 NONAME ; class AgendaRepeatRule AgendaEntry::repeatRule(void) const
+	??1AgendaCategory@@UAE@XZ @ 171 NONAME ; AgendaCategory::~AgendaCategory(void)
+	?deleteEntry@AgendaUtil@@QAE_NK@Z @ 172 NONAME ; bool AgendaUtil::deleteEntry(unsigned long)
+	??1AgendaAttendee@@UAE@XZ @ 173 NONAME ; AgendaAttendee::~AgendaAttendee(void)
+	?byDay@AgendaRepeatRule@@QBE?AV?$QList@W4Day@AgendaRepeatRule@@@@XZ @ 174 NONAME ; class QList<enum AgendaRepeatRule::Day> AgendaRepeatRule::byDay(void) const
+	?setLatLong@AgendaGeoValue@@QAEXNN@Z @ 175 NONAME ; void AgendaGeoValue::setLatLong(double, double)
+	?completedDateTime@AgendaEntry@@QBE?AVQDateTime@@XZ @ 176 NONAME ; class QDateTime AgendaEntry::completedDateTime(void) const
+	?setRecurrenceId@AgendaEntry@@QAEXAAVQDateTime@@@Z @ 177 NONAME ; void AgendaEntry::setRecurrenceId(class QDateTime &)
+	?isNull@AgendaGeoValue@@QBE_NXZ @ 178 NONAME ; bool AgendaGeoValue::isNull(void) const
 

--- a/agendainterface/agendautil/eabi/agendainterfaceu.def	Tue Jul 06 14:14:56 2010 +0300
+++ b/agendainterface/agendautil/eabi/agendainterfaceu.def	Wed Aug 18 09:47:38 2010 +0300
@@ -5,208 +5,204 @@
 	_ZN10AgendaUtil11parentEntryER11AgendaEntry @ 4 NONAME
 	_ZN10AgendaUtil11qt_metacallEN11QMetaObject4CallEiPPv @ 5 NONAME
 	_ZN10AgendaUtil11qt_metacastEPKc @ 6 NONAME
-	_ZN10AgendaUtil11updateEntryERK11AgendaEntryb @ 7 NONAME
-	_ZN10AgendaUtil12entryDeletedEm @ 8 NONAME
-	_ZN10AgendaUtil12entryUpdatedEm @ 9 NONAME
-	_ZN10AgendaUtil12setCompletedER11AgendaEntrybR9QDateTime @ 10 NONAME
-	_ZN10AgendaUtil13deleteEntriesER9QDateTimeS1_NS_11FilterFlagsE @ 11 NONAME
-	_ZN10AgendaUtil14entriesChangedE5QListImE @ 12 NONAME
-	_ZN10AgendaUtil14entriesDeletedEi @ 13 NONAME
-	_ZN10AgendaUtil15createExceptionERK11AgendaEntry9QDateTime @ 14 NONAME
-	_ZN10AgendaUtil15fetchAllEntriesENS_11FilterFlagsE @ 15 NONAME
-	_ZN10AgendaUtil15importvCalendarERK7QStringR11AgendaEntry @ 16 NONAME
-	_ZN10AgendaUtil16staticMetaObjectE @ 17 NONAME DATA 16
-	_ZN10AgendaUtil17exportAsvCalendarERK7QStringl @ 18 NONAME
-	_ZN10AgendaUtil19deleteRepeatedEntryER11AgendaEntryNS_15RecurrenceRangeE @ 19 NONAME
-	_ZN10AgendaUtil19fetchEntriesInRangeE9QDateTimeS0_NS_11FilterFlagsE @ 20 NONAME
-	_ZN10AgendaUtil19getStaticMetaObjectEv @ 21 NONAME
-	_ZN10AgendaUtil19markDatesWithEventsE9QDateTimeS0_NS_11FilterFlagsER5QListI5QDateE @ 22 NONAME
-	_ZN10AgendaUtil19storeRepeatingEntryERK11AgendaEntryb @ 23 NONAME
-	_ZN10AgendaUtil20getNextInstanceTimesER11AgendaEntryR9QDateTimeS3_ @ 24 NONAME
-	_ZN10AgendaUtil22areNoEntriesInCalendarEv @ 25 NONAME
-	_ZN10AgendaUtil23createEntryIdListForDayE9QDateTimeNS_11FilterFlagsE @ 26 NONAME
-	_ZN10AgendaUtil24clearRepeatingPropertiesER11AgendaEntry @ 27 NONAME
-	_ZN10AgendaUtil24getPreviousInstanceTimesER11AgendaEntryR9QDateTimeS3_ @ 28 NONAME
-	_ZN10AgendaUtil24isWorkdaysRepeatingEntryERK16AgendaRepeatRule @ 29 NONAME
-	_ZN10AgendaUtil26entryViewCreationCompletedEi @ 30 NONAME
-	_ZN10AgendaUtil29instanceViewCreationCompletedEi @ 31 NONAME
-	_ZN10AgendaUtil7maxTimeEv @ 32 NONAME
-	_ZN10AgendaUtil7minTimeEv @ 33 NONAME
-	_ZN10AgendaUtil8addEntryERK11AgendaEntry @ 34 NONAME
-	_ZN10AgendaUtil8entryIdsENS_11FilterFlagsE @ 35 NONAME
-	_ZN10AgendaUtil9fetchByIdEm @ 36 NONAME
-	_ZN10AgendaUtilC1EP7QObject @ 37 NONAME
-	_ZN10AgendaUtilC2EP7QObject @ 38 NONAME
-	_ZN10AgendaUtilD0Ev @ 39 NONAME
-	_ZN10AgendaUtilD1Ev @ 40 NONAME
-	_ZN10AgendaUtilD2Ev @ 41 NONAME
-	_ZN11AgendaAlarm13setTimeOffsetEi @ 42 NONAME
-	_ZN11AgendaAlarm17setAlarmSoundNameERK7QString @ 43 NONAME
-	_ZN11AgendaAlarm6detachEv @ 44 NONAME
-	_ZN11AgendaAlarmC1ERKS_ @ 45 NONAME
-	_ZN11AgendaAlarmC1Ev @ 46 NONAME
-	_ZN11AgendaAlarmC2ERKS_ @ 47 NONAME
-	_ZN11AgendaAlarmC2Ev @ 48 NONAME
-	_ZN11AgendaAlarmD1Ev @ 49 NONAME
-	_ZN11AgendaAlarmD2Ev @ 50 NONAME
-	_ZN11AgendaAlarmaSERKS_ @ 51 NONAME
-	_ZN11AgendaEntry10categoriesEv @ 52 NONAME
-	_ZN11AgendaEntry10setDTStampERK9QDateTime @ 53 NONAME
-	_ZN11AgendaEntry10setSummaryERK7QString @ 54 NONAME
-	_ZN11AgendaEntry11addAttendeeERK14AgendaAttendee @ 55 NONAME
-	_ZN11AgendaEntry11addCategoryERK14AgendaCategory @ 56 NONAME
-	_ZN11AgendaEntry11isRepeatingEv @ 57 NONAME
-	_ZN11AgendaEntry11setGeoValueERK14AgendaGeoValue @ 58 NONAME
-	_ZN11AgendaEntry11setLocationERK7QString @ 59 NONAME
-	_ZN11AgendaEntry11setPriorityEi @ 60 NONAME
-	_ZN11AgendaEntry12isTimedEntryEv @ 61 NONAME
-	_ZN11AgendaEntry12recurrenceIdEv @ 62 NONAME
-	_ZN11AgendaEntry12setFavouriteEj @ 63 NONAME
-	_ZN11AgendaEntry13setRepeatRuleERK16AgendaRepeatRule @ 64 NONAME
-	_ZN11AgendaEntry14setDescriptionERK7QString @ 65 NONAME
-	_ZN11AgendaEntry15setRecurrenceIdER9QDateTime @ 66 NONAME
-	_ZN11AgendaEntry18setStartAndEndTimeERK9QDateTimeS2_ @ 67 NONAME
-	_ZN11AgendaEntry20setCompletedDateTimeERK9QDateTime @ 68 NONAME
-	_ZN11AgendaEntry23setLastModifiedDateTimeERK9QDateTime @ 69 NONAME
-	_ZN11AgendaEntry6detachEv @ 70 NONAME
-	_ZN11AgendaEntry7setTypeENS_4TypeE @ 71 NONAME
-	_ZN11AgendaEntry8setAlarmERK11AgendaAlarm @ 72 NONAME
-	_ZN11AgendaEntry9attendeesEv @ 73 NONAME
-	_ZN11AgendaEntry9setMethodENS_6MethodE @ 74 NONAME
-	_ZN11AgendaEntry9setRDatesERK5QListI5QDateE @ 75 NONAME
-	_ZN11AgendaEntry9setStatusENS_6StatusE @ 76 NONAME
-	_ZN11AgendaEntryC1ENS_4TypeE @ 77 NONAME
-	_ZN11AgendaEntryC1ERKS_ @ 78 NONAME
-	_ZN11AgendaEntryC1Ev @ 79 NONAME
-	_ZN11AgendaEntryC2ENS_4TypeE @ 80 NONAME
-	_ZN11AgendaEntryC2ERKS_ @ 81 NONAME
-	_ZN11AgendaEntryC2Ev @ 82 NONAME
-	_ZN11AgendaEntryD0Ev @ 83 NONAME
-	_ZN11AgendaEntryD1Ev @ 84 NONAME
-	_ZN11AgendaEntryD2Ev @ 85 NONAME
-	_ZN11AgendaEntryaSERKS_ @ 86 NONAME
-	_ZN14AgendaAttendee10setAddressERK7QString @ 87 NONAME
-	_ZN14AgendaAttendee13setCommonNameERK7QString @ 88 NONAME
-	_ZN14AgendaAttendee20setResponseRequestedEb @ 89 NONAME
-	_ZN14AgendaAttendee6detachEv @ 90 NONAME
-	_ZN14AgendaAttendee7setRoleENS_15ParticipantRoleE @ 91 NONAME
-	_ZN14AgendaAttendee9setStatusENS_10StatusTypeE @ 92 NONAME
-	_ZN14AgendaAttendeeC1ERK7QString @ 93 NONAME
-	_ZN14AgendaAttendeeC1ERKS_ @ 94 NONAME
-	_ZN14AgendaAttendeeC1Ev @ 95 NONAME
-	_ZN14AgendaAttendeeC2ERK7QString @ 96 NONAME
-	_ZN14AgendaAttendeeC2ERKS_ @ 97 NONAME
-	_ZN14AgendaAttendeeC2Ev @ 98 NONAME
-	_ZN14AgendaAttendeeD0Ev @ 99 NONAME
-	_ZN14AgendaAttendeeD1Ev @ 100 NONAME
-	_ZN14AgendaAttendeeD2Ev @ 101 NONAME
-	_ZN14AgendaAttendeeaSERKS_ @ 102 NONAME
-	_ZN14AgendaCategory11setCategoryENS_12CategoryTypeE @ 103 NONAME
-	_ZN14AgendaCategory23setExtendedCategoryNameERK7QString @ 104 NONAME
-	_ZN14AgendaCategory6detachEv @ 105 NONAME
-	_ZN14AgendaCategoryC1ENS_12CategoryTypeE @ 106 NONAME
-	_ZN14AgendaCategoryC1ERKS_ @ 107 NONAME
-	_ZN14AgendaCategoryC1Ev @ 108 NONAME
-	_ZN14AgendaCategoryC2ENS_12CategoryTypeE @ 109 NONAME
-	_ZN14AgendaCategoryC2ERKS_ @ 110 NONAME
-	_ZN14AgendaCategoryC2Ev @ 111 NONAME
-	_ZN14AgendaCategoryD0Ev @ 112 NONAME
-	_ZN14AgendaCategoryD1Ev @ 113 NONAME
-	_ZN14AgendaCategoryD2Ev @ 114 NONAME
-	_ZN14AgendaCategoryaSERKS_ @ 115 NONAME
-	_ZN14AgendaGeoValue10setLatLongEdd @ 116 NONAME
-	_ZN14AgendaGeoValue6detachEv @ 117 NONAME
-	_ZN14AgendaGeoValueC1ERKS_ @ 118 NONAME
-	_ZN14AgendaGeoValueC1Ev @ 119 NONAME
-	_ZN14AgendaGeoValueC2ERKS_ @ 120 NONAME
-	_ZN14AgendaGeoValueC2Ev @ 121 NONAME
-	_ZN14AgendaGeoValueD1Ev @ 122 NONAME
-	_ZN14AgendaGeoValueD2Ev @ 123 NONAME
-	_ZN14AgendaGeoValueaSERKS_ @ 124 NONAME
-	_ZN16AgendaRepeatRule10setByMonthERK5QListINS_5MonthEE @ 125 NONAME
-	_ZN16AgendaRepeatRule11setIntervalEi @ 126 NONAME
-	_ZN16AgendaRepeatRule12setWeekStartENS_3DayE @ 127 NONAME
-	_ZN16AgendaRepeatRule13setByMonthDayERK5QListIiE @ 128 NONAME
-	_ZN16AgendaRepeatRule18setRepeatRuleStartERK9QDateTime @ 129 NONAME
-	_ZN16AgendaRepeatRule6detachEv @ 130 NONAME
-	_ZN16AgendaRepeatRule7setTypeENS_8RuleTypeE @ 131 NONAME
-	_ZN16AgendaRepeatRule8setByDayERK5QListINS_3DayEE @ 132 NONAME
-	_ZN16AgendaRepeatRule8setUntilERK9QDateTime @ 133 NONAME
-	_ZN16AgendaRepeatRuleC1ENS_8RuleTypeE @ 134 NONAME
-	_ZN16AgendaRepeatRuleC1ERKS_ @ 135 NONAME
-	_ZN16AgendaRepeatRuleC1Ev @ 136 NONAME
-	_ZN16AgendaRepeatRuleC2ENS_8RuleTypeE @ 137 NONAME
-	_ZN16AgendaRepeatRuleC2ERKS_ @ 138 NONAME
-	_ZN16AgendaRepeatRuleC2Ev @ 139 NONAME
-	_ZN16AgendaRepeatRuleD1Ev @ 140 NONAME
-	_ZN16AgendaRepeatRuleD2Ev @ 141 NONAME
-	_ZN16AgendaRepeatRuleaSERKS_ @ 142 NONAME
-	_ZNK10AgendaUtil10metaObjectEv @ 143 NONAME
-	_ZNK10AgendaUtil5errorEv @ 144 NONAME
-	_ZNK11AgendaAlarm10timeOffsetEv @ 145 NONAME
-	_ZNK11AgendaAlarm14alarmSoundNameEv @ 146 NONAME
-	_ZNK11AgendaAlarm6isNullEv @ 147 NONAME
-	_ZNK11AgendaAlarmeqERKS_ @ 148 NONAME
-	_ZNK11AgendaAlarmneERKS_ @ 149 NONAME
-	_ZNK11AgendaEntry10categoriesEv @ 150 NONAME
-	_ZNK11AgendaEntry10repeatRuleEv @ 151 NONAME
-	_ZNK11AgendaEntry11descriptionEv @ 152 NONAME
-	_ZNK11AgendaEntry14durationInSecsEv @ 153 NONAME
-	_ZNK11AgendaEntry17completedDateTimeEv @ 154 NONAME
-	_ZNK11AgendaEntry20lastModifiedDateTimeEv @ 155 NONAME
-	_ZNK11AgendaEntry2idEv @ 156 NONAME
-	_ZNK11AgendaEntry4typeEv @ 157 NONAME
-	_ZNK11AgendaEntry5alarmEv @ 158 NONAME
-	_ZNK11AgendaEntry6isNullEv @ 159 NONAME
-	_ZNK11AgendaEntry6methodEv @ 160 NONAME
-	_ZNK11AgendaEntry6rDatesEv @ 161 NONAME
-	_ZNK11AgendaEntry6statusEv @ 162 NONAME
-	_ZNK11AgendaEntry7dtStampEv @ 163 NONAME
-	_ZNK11AgendaEntry7endTimeEv @ 164 NONAME
-	_ZNK11AgendaEntry7summaryEv @ 165 NONAME
-	_ZNK11AgendaEntry8geoValueEv @ 166 NONAME
-	_ZNK11AgendaEntry8locationEv @ 167 NONAME
-	_ZNK11AgendaEntry8priorityEv @ 168 NONAME
-	_ZNK11AgendaEntry9attendeesEv @ 169 NONAME
-	_ZNK11AgendaEntry9favouriteEv @ 170 NONAME
-	_ZNK11AgendaEntry9startTimeEv @ 171 NONAME
-	_ZNK11AgendaEntryeqERKS_ @ 172 NONAME
-	_ZNK11AgendaEntryneERKS_ @ 173 NONAME
-	_ZNK14AgendaAttendee10commonNameEv @ 174 NONAME
-	_ZNK14AgendaAttendee17responseRequestedEv @ 175 NONAME
-	_ZNK14AgendaAttendee4roleEv @ 176 NONAME
-	_ZNK14AgendaAttendee6isNullEv @ 177 NONAME
-	_ZNK14AgendaAttendee6statusEv @ 178 NONAME
-	_ZNK14AgendaAttendee7addressEv @ 179 NONAME
-	_ZNK14AgendaAttendeeeqERKS_ @ 180 NONAME
-	_ZNK14AgendaAttendeeneERKS_ @ 181 NONAME
-	_ZNK14AgendaCategory20extendedCategoryNameEv @ 182 NONAME
-	_ZNK14AgendaCategory6isNullEv @ 183 NONAME
-	_ZNK14AgendaCategory8categoryEv @ 184 NONAME
-	_ZNK14AgendaCategoryeqERKS_ @ 185 NONAME
-	_ZNK14AgendaCategoryneERKS_ @ 186 NONAME
-	_ZNK14AgendaGeoValue10getLatLongERdS0_ @ 187 NONAME
-	_ZNK14AgendaGeoValue6isNullEv @ 188 NONAME
-	_ZNK14AgendaGeoValueeqERKS_ @ 189 NONAME
-	_ZNK14AgendaGeoValueneERKS_ @ 190 NONAME
-	_ZNK16AgendaRepeatRule10byMonthDayEv @ 191 NONAME
-	_ZNK16AgendaRepeatRule15repeatRuleStartEv @ 192 NONAME
-	_ZNK16AgendaRepeatRule4typeEv @ 193 NONAME
-	_ZNK16AgendaRepeatRule5byDayEv @ 194 NONAME
-	_ZNK16AgendaRepeatRule5untilEv @ 195 NONAME
-	_ZNK16AgendaRepeatRule6isNullEv @ 196 NONAME
-	_ZNK16AgendaRepeatRule7byMonthEv @ 197 NONAME
-	_ZNK16AgendaRepeatRule8intervalEv @ 198 NONAME
-	_ZNK16AgendaRepeatRule9weekStartEv @ 199 NONAME
-	_ZNK16AgendaRepeatRuleeqERKS_ @ 200 NONAME
-	_ZNK16AgendaRepeatRuleneERKS_ @ 201 NONAME
-	_ZTI10AgendaUtil @ 202 NONAME
-	_ZTI11AgendaEntry @ 203 NONAME
-	_ZTI14AgendaAttendee @ 204 NONAME
-	_ZTI14AgendaCategory @ 205 NONAME
-	_ZTV10AgendaUtil @ 206 NONAME
-	_ZTV11AgendaEntry @ 207 NONAME
-	_ZTV14AgendaAttendee @ 208 NONAME
-	_ZTV14AgendaCategory @ 209 NONAME
-	_ZNK11AgendaEntry13clearGeoValueEv @ 210 NONAME
+	_ZN10AgendaUtil12entryDeletedEm @ 7 NONAME
+	_ZN10AgendaUtil12entryUpdatedEm @ 8 NONAME
+	_ZN10AgendaUtil12setCompletedER11AgendaEntrybR9QDateTime @ 9 NONAME
+	_ZN10AgendaUtil13deleteEntriesER9QDateTimeS1_NS_11FilterFlagsE @ 10 NONAME
+	_ZN10AgendaUtil14entriesChangedE5QListImE @ 11 NONAME
+	_ZN10AgendaUtil14entriesDeletedEi @ 12 NONAME
+	_ZN10AgendaUtil15fetchAllEntriesENS_11FilterFlagsE @ 13 NONAME
+	_ZN10AgendaUtil15importvCalendarERK7QStringR11AgendaEntry @ 14 NONAME
+	_ZN10AgendaUtil16staticMetaObjectE @ 15 NONAME DATA 16
+	_ZN10AgendaUtil17exportAsvCalendarERK7QStringl @ 16 NONAME
+	_ZN10AgendaUtil19deleteRepeatedEntryER11AgendaEntryNS_15RecurrenceRangeE @ 17 NONAME
+	_ZN10AgendaUtil19fetchEntriesInRangeE9QDateTimeS0_NS_11FilterFlagsE @ 18 NONAME
+	_ZN10AgendaUtil19getStaticMetaObjectEv @ 19 NONAME
+	_ZN10AgendaUtil19markDatesWithEventsE9QDateTimeS0_NS_11FilterFlagsER5QListI5QDateE @ 20 NONAME
+	_ZN10AgendaUtil20getNextInstanceTimesER11AgendaEntryR9QDateTimeS3_ @ 21 NONAME
+	_ZN10AgendaUtil22areNoEntriesInCalendarEv @ 22 NONAME
+	_ZN10AgendaUtil23createEntryIdListForDayE9QDateTimeNS_11FilterFlagsE @ 23 NONAME
+	_ZN10AgendaUtil24getPreviousInstanceTimesER11AgendaEntryR9QDateTimeS3_ @ 24 NONAME
+	_ZN10AgendaUtil24isWorkdaysRepeatingEntryERK16AgendaRepeatRule @ 25 NONAME
+	_ZN10AgendaUtil26entryViewCreationCompletedEi @ 26 NONAME
+	_ZN10AgendaUtil29instanceViewCreationCompletedEi @ 27 NONAME
+	_ZN10AgendaUtil5storeER11AgendaEntryNS_15RecurrenceRangeE @ 28 NONAME
+	_ZN10AgendaUtil7maxTimeEv @ 29 NONAME
+	_ZN10AgendaUtil7minTimeEv @ 30 NONAME
+	_ZN10AgendaUtil8entryIdsENS_11FilterFlagsE @ 31 NONAME
+	_ZN10AgendaUtil9fetchByIdEm @ 32 NONAME
+	_ZN10AgendaUtilC1EP7QObject @ 33 NONAME
+	_ZN10AgendaUtilC2EP7QObject @ 34 NONAME
+	_ZN10AgendaUtilD0Ev @ 35 NONAME
+	_ZN10AgendaUtilD1Ev @ 36 NONAME
+	_ZN10AgendaUtilD2Ev @ 37 NONAME
+	_ZN11AgendaAlarm13setTimeOffsetEi @ 38 NONAME
+	_ZN11AgendaAlarm17setAlarmSoundNameERK7QString @ 39 NONAME
+	_ZN11AgendaAlarm6detachEv @ 40 NONAME
+	_ZN11AgendaAlarmC1ERKS_ @ 41 NONAME
+	_ZN11AgendaAlarmC1Ev @ 42 NONAME
+	_ZN11AgendaAlarmC2ERKS_ @ 43 NONAME
+	_ZN11AgendaAlarmC2Ev @ 44 NONAME
+	_ZN11AgendaAlarmD1Ev @ 45 NONAME
+	_ZN11AgendaAlarmD2Ev @ 46 NONAME
+	_ZN11AgendaAlarmaSERKS_ @ 47 NONAME
+	_ZN11AgendaEntry10categoriesEv @ 48 NONAME
+	_ZN11AgendaEntry10setDTStampERK9QDateTime @ 49 NONAME
+	_ZN11AgendaEntry10setSummaryERK7QString @ 50 NONAME
+	_ZN11AgendaEntry11addAttendeeERK14AgendaAttendee @ 51 NONAME
+	_ZN11AgendaEntry11addCategoryERK14AgendaCategory @ 52 NONAME
+	_ZN11AgendaEntry11isRepeatingEv @ 53 NONAME
+	_ZN11AgendaEntry11setGeoValueERK14AgendaGeoValue @ 54 NONAME
+	_ZN11AgendaEntry11setLocationERK7QString @ 55 NONAME
+	_ZN11AgendaEntry11setPriorityEi @ 56 NONAME
+	_ZN11AgendaEntry12isTimedEntryEv @ 57 NONAME
+	_ZN11AgendaEntry12recurrenceIdEv @ 58 NONAME
+	_ZN11AgendaEntry12setFavouriteEj @ 59 NONAME
+	_ZN11AgendaEntry13setRepeatRuleERK16AgendaRepeatRule @ 60 NONAME
+	_ZN11AgendaEntry14setDescriptionERK7QString @ 61 NONAME
+	_ZN11AgendaEntry15setRecurrenceIdER9QDateTime @ 62 NONAME
+	_ZN11AgendaEntry18setStartAndEndTimeERK9QDateTimeS2_ @ 63 NONAME
+	_ZN11AgendaEntry20setCompletedDateTimeERK9QDateTime @ 64 NONAME
+	_ZN11AgendaEntry23setLastModifiedDateTimeERK9QDateTime @ 65 NONAME
+	_ZN11AgendaEntry6detachEv @ 66 NONAME
+	_ZN11AgendaEntry7setTypeENS_4TypeE @ 67 NONAME
+	_ZN11AgendaEntry8setAlarmERK11AgendaAlarm @ 68 NONAME
+	_ZN11AgendaEntry9attendeesEv @ 69 NONAME
+	_ZN11AgendaEntry9setMethodENS_6MethodE @ 70 NONAME
+	_ZN11AgendaEntry9setRDatesERK5QListI5QDateE @ 71 NONAME
+	_ZN11AgendaEntry9setStatusENS_6StatusE @ 72 NONAME
+	_ZN11AgendaEntryC1ENS_4TypeE @ 73 NONAME
+	_ZN11AgendaEntryC1ERKS_ @ 74 NONAME
+	_ZN11AgendaEntryC1Ev @ 75 NONAME
+	_ZN11AgendaEntryC2ENS_4TypeE @ 76 NONAME
+	_ZN11AgendaEntryC2ERKS_ @ 77 NONAME
+	_ZN11AgendaEntryC2Ev @ 78 NONAME
+	_ZN11AgendaEntryD0Ev @ 79 NONAME
+	_ZN11AgendaEntryD1Ev @ 80 NONAME
+	_ZN11AgendaEntryD2Ev @ 81 NONAME
+	_ZN11AgendaEntryaSERKS_ @ 82 NONAME
+	_ZN14AgendaAttendee10setAddressERK7QString @ 83 NONAME
+	_ZN14AgendaAttendee13setCommonNameERK7QString @ 84 NONAME
+	_ZN14AgendaAttendee20setResponseRequestedEb @ 85 NONAME
+	_ZN14AgendaAttendee6detachEv @ 86 NONAME
+	_ZN14AgendaAttendee7setRoleENS_15ParticipantRoleE @ 87 NONAME
+	_ZN14AgendaAttendee9setStatusENS_10StatusTypeE @ 88 NONAME
+	_ZN14AgendaAttendeeC1ERK7QString @ 89 NONAME
+	_ZN14AgendaAttendeeC1ERKS_ @ 90 NONAME
+	_ZN14AgendaAttendeeC1Ev @ 91 NONAME
+	_ZN14AgendaAttendeeC2ERK7QString @ 92 NONAME
+	_ZN14AgendaAttendeeC2ERKS_ @ 93 NONAME
+	_ZN14AgendaAttendeeC2Ev @ 94 NONAME
+	_ZN14AgendaAttendeeD0Ev @ 95 NONAME
+	_ZN14AgendaAttendeeD1Ev @ 96 NONAME
+	_ZN14AgendaAttendeeD2Ev @ 97 NONAME
+	_ZN14AgendaAttendeeaSERKS_ @ 98 NONAME
+	_ZN14AgendaCategory11setCategoryENS_12CategoryTypeE @ 99 NONAME
+	_ZN14AgendaCategory23setExtendedCategoryNameERK7QString @ 100 NONAME
+	_ZN14AgendaCategory6detachEv @ 101 NONAME
+	_ZN14AgendaCategoryC1ENS_12CategoryTypeE @ 102 NONAME
+	_ZN14AgendaCategoryC1ERKS_ @ 103 NONAME
+	_ZN14AgendaCategoryC1Ev @ 104 NONAME
+	_ZN14AgendaCategoryC2ENS_12CategoryTypeE @ 105 NONAME
+	_ZN14AgendaCategoryC2ERKS_ @ 106 NONAME
+	_ZN14AgendaCategoryC2Ev @ 107 NONAME
+	_ZN14AgendaCategoryD0Ev @ 108 NONAME
+	_ZN14AgendaCategoryD1Ev @ 109 NONAME
+	_ZN14AgendaCategoryD2Ev @ 110 NONAME
+	_ZN14AgendaCategoryaSERKS_ @ 111 NONAME
+	_ZN14AgendaGeoValue10setLatLongEdd @ 112 NONAME
+	_ZN14AgendaGeoValue6detachEv @ 113 NONAME
+	_ZN14AgendaGeoValueC1ERKS_ @ 114 NONAME
+	_ZN14AgendaGeoValueC1Ev @ 115 NONAME
+	_ZN14AgendaGeoValueC2ERKS_ @ 116 NONAME
+	_ZN14AgendaGeoValueC2Ev @ 117 NONAME
+	_ZN14AgendaGeoValueD1Ev @ 118 NONAME
+	_ZN14AgendaGeoValueD2Ev @ 119 NONAME
+	_ZN14AgendaGeoValueaSERKS_ @ 120 NONAME
+	_ZN16AgendaRepeatRule10setByMonthERK5QListINS_5MonthEE @ 121 NONAME
+	_ZN16AgendaRepeatRule11setIntervalEi @ 122 NONAME
+	_ZN16AgendaRepeatRule12setWeekStartENS_3DayE @ 123 NONAME
+	_ZN16AgendaRepeatRule13setByMonthDayERK5QListIiE @ 124 NONAME
+	_ZN16AgendaRepeatRule18setRepeatRuleStartERK9QDateTime @ 125 NONAME
+	_ZN16AgendaRepeatRule6detachEv @ 126 NONAME
+	_ZN16AgendaRepeatRule7setTypeENS_8RuleTypeE @ 127 NONAME
+	_ZN16AgendaRepeatRule8setByDayERK5QListINS_3DayEE @ 128 NONAME
+	_ZN16AgendaRepeatRule8setUntilERK9QDateTime @ 129 NONAME
+	_ZN16AgendaRepeatRuleC1ENS_8RuleTypeE @ 130 NONAME
+	_ZN16AgendaRepeatRuleC1ERKS_ @ 131 NONAME
+	_ZN16AgendaRepeatRuleC1Ev @ 132 NONAME
+	_ZN16AgendaRepeatRuleC2ENS_8RuleTypeE @ 133 NONAME
+	_ZN16AgendaRepeatRuleC2ERKS_ @ 134 NONAME
+	_ZN16AgendaRepeatRuleC2Ev @ 135 NONAME
+	_ZN16AgendaRepeatRuleD1Ev @ 136 NONAME
+	_ZN16AgendaRepeatRuleD2Ev @ 137 NONAME
+	_ZN16AgendaRepeatRuleaSERKS_ @ 138 NONAME
+	_ZNK10AgendaUtil10metaObjectEv @ 139 NONAME
+	_ZNK10AgendaUtil5errorEv @ 140 NONAME
+	_ZNK11AgendaAlarm10timeOffsetEv @ 141 NONAME
+	_ZNK11AgendaAlarm14alarmSoundNameEv @ 142 NONAME
+	_ZNK11AgendaAlarm6isNullEv @ 143 NONAME
+	_ZNK11AgendaAlarmeqERKS_ @ 144 NONAME
+	_ZNK11AgendaAlarmneERKS_ @ 145 NONAME
+	_ZNK11AgendaEntry10categoriesEv @ 146 NONAME
+	_ZNK11AgendaEntry10repeatRuleEv @ 147 NONAME
+	_ZNK11AgendaEntry11descriptionEv @ 148 NONAME
+	_ZNK11AgendaEntry13clearGeoValueEv @ 149 NONAME
+	_ZNK11AgendaEntry14durationInSecsEv @ 150 NONAME
+	_ZNK11AgendaEntry17completedDateTimeEv @ 151 NONAME
+	_ZNK11AgendaEntry20lastModifiedDateTimeEv @ 152 NONAME
+	_ZNK11AgendaEntry2idEv @ 153 NONAME
+	_ZNK11AgendaEntry4typeEv @ 154 NONAME
+	_ZNK11AgendaEntry5alarmEv @ 155 NONAME
+	_ZNK11AgendaEntry6isNullEv @ 156 NONAME
+	_ZNK11AgendaEntry6methodEv @ 157 NONAME
+	_ZNK11AgendaEntry6rDatesEv @ 158 NONAME
+	_ZNK11AgendaEntry6statusEv @ 159 NONAME
+	_ZNK11AgendaEntry7dtStampEv @ 160 NONAME
+	_ZNK11AgendaEntry7endTimeEv @ 161 NONAME
+	_ZNK11AgendaEntry7summaryEv @ 162 NONAME
+	_ZNK11AgendaEntry8geoValueEv @ 163 NONAME
+	_ZNK11AgendaEntry8locationEv @ 164 NONAME
+	_ZNK11AgendaEntry8priorityEv @ 165 NONAME
+	_ZNK11AgendaEntry9attendeesEv @ 166 NONAME
+	_ZNK11AgendaEntry9favouriteEv @ 167 NONAME
+	_ZNK11AgendaEntry9startTimeEv @ 168 NONAME
+	_ZNK11AgendaEntryeqERKS_ @ 169 NONAME
+	_ZNK11AgendaEntryneERKS_ @ 170 NONAME
+	_ZNK14AgendaAttendee10commonNameEv @ 171 NONAME
+	_ZNK14AgendaAttendee17responseRequestedEv @ 172 NONAME
+	_ZNK14AgendaAttendee4roleEv @ 173 NONAME
+	_ZNK14AgendaAttendee6isNullEv @ 174 NONAME
+	_ZNK14AgendaAttendee6statusEv @ 175 NONAME
+	_ZNK14AgendaAttendee7addressEv @ 176 NONAME
+	_ZNK14AgendaAttendeeeqERKS_ @ 177 NONAME
+	_ZNK14AgendaAttendeeneERKS_ @ 178 NONAME
+	_ZNK14AgendaCategory20extendedCategoryNameEv @ 179 NONAME
+	_ZNK14AgendaCategory6isNullEv @ 180 NONAME
+	_ZNK14AgendaCategory8categoryEv @ 181 NONAME
+	_ZNK14AgendaCategoryeqERKS_ @ 182 NONAME
+	_ZNK14AgendaCategoryneERKS_ @ 183 NONAME
+	_ZNK14AgendaGeoValue10getLatLongERdS0_ @ 184 NONAME
+	_ZNK14AgendaGeoValue6isNullEv @ 185 NONAME
+	_ZNK14AgendaGeoValueeqERKS_ @ 186 NONAME
+	_ZNK14AgendaGeoValueneERKS_ @ 187 NONAME
+	_ZNK16AgendaRepeatRule10byMonthDayEv @ 188 NONAME
+	_ZNK16AgendaRepeatRule15repeatRuleStartEv @ 189 NONAME
+	_ZNK16AgendaRepeatRule4typeEv @ 190 NONAME
+	_ZNK16AgendaRepeatRule5byDayEv @ 191 NONAME
+	_ZNK16AgendaRepeatRule5untilEv @ 192 NONAME
+	_ZNK16AgendaRepeatRule6isNullEv @ 193 NONAME
+	_ZNK16AgendaRepeatRule7byMonthEv @ 194 NONAME
+	_ZNK16AgendaRepeatRule8intervalEv @ 195 NONAME
+	_ZNK16AgendaRepeatRule9weekStartEv @ 196 NONAME
+	_ZNK16AgendaRepeatRuleeqERKS_ @ 197 NONAME
+	_ZNK16AgendaRepeatRuleneERKS_ @ 198 NONAME
+	_ZTI10AgendaUtil @ 199 NONAME
+	_ZTI11AgendaEntry @ 200 NONAME
+	_ZTI14AgendaAttendee @ 201 NONAME
+	_ZTI14AgendaCategory @ 202 NONAME
+	_ZTV10AgendaUtil @ 203 NONAME
+	_ZTV11AgendaEntry @ 204 NONAME
+	_ZTV14AgendaAttendee @ 205 NONAME
+	_ZTV14AgendaCategory @ 206 NONAME
 

--- a/agendainterface/agendautil/inc/agendaentry.h	Tue Jul 06 14:14:56 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,400 +0,0 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Header file for AgendaEntry and utility classes.
-*
-*/
-
-#ifndef AGENDAENTRY_H
-#define AGENDAENTRY_H
-
-// System includes
-#include <QObject>
-
-// User includes
-#include "agendainterfacedefines.h"
-
-// Forward declarations
-class QDate;
-class QDateTime;
-class AgendaAlarmPrivate;
-class AgendaAttendeePrivate;
-class AgendaCategoryPrivate;
-class AgendaEntryPrivate;
-class AgendaRepeatRulePrivate;
-class AgendaGeoValuePrivate;
-
-class XQCALENDAR_EXPORT AgendaAttendee
-{
-public:
-	enum ParticipantRole {
-		RequiredParticipant = 0,
-		OptionalParticipant,
-		NonParticipant,
-		ChairParticipant,
-		ParticipantRoleUnknown = -1
-	};
-
-	enum StatusType {
-		StatusNeedsAction = 0,
-		StatusAccepted,
-		StatusTentative,
-		StatusConfirmed,
-		StatusDeclined,
-		StatusCompleted,
-		StatusDelegated,
-		StatusInProcess,
-		StatusUnknown = -1
-	};
-
-	AgendaAttendee();
-	virtual ~AgendaAttendee();
-	AgendaAttendee(const QString& address);
-	AgendaAttendee(const AgendaAttendee& other);
-
-	void setAddress(const QString& address);
-	void setCommonName(const QString& name);
-	void setResponseRequested(bool responseRequested);
-	void setRole(ParticipantRole role);
-	void setStatus(StatusType status);
-
-	QString address() const;
-	QString commonName() const;
-	bool responseRequested() const;
-	ParticipantRole role() const;
-	StatusType status() const;
-
-	bool isNull() const;
-
-	AgendaAttendee& operator=(const AgendaAttendee& other);
-	bool operator==(const AgendaAttendee& other) const;
-	bool operator!=(const AgendaAttendee& other) const;
-
-private:
-	void detach();
-
-private:
-	AgendaAttendeePrivate* d;
-};
-
-class XQCALENDAR_EXPORT AgendaCategory
-{
-public:
-	enum CategoryType {
-		AppointmentCategory,
-		BusinessCategory,
-		EducationCategory,
-		HolidayCategory,
-		MeetingCategory,
-		MiscellaneousCategory,
-		PersonalCategory,
-		PhoneCallCategory,
-		SickDayCategory,
-		SpecialOccasionCategory,
-		TravelCategory,
-		VacationCategory,
-		ExtendedCategory,
-		UnknownCategory = -1
-	};
-
-	AgendaCategory();
-	AgendaCategory(CategoryType category);
-	AgendaCategory(const AgendaCategory& other);
-	virtual ~AgendaCategory();
-
-	void setCategory(CategoryType categoryType);
-	CategoryType category() const;
-
-	void setExtendedCategoryName(const QString& name);
-	QString extendedCategoryName() const;
-
-	bool isNull() const;
-
-	AgendaCategory& operator=(const AgendaCategory& other);
-	bool operator==(const AgendaCategory& other) const;
-	bool operator!=(const AgendaCategory& other) const;
-
-private:
-	void detach();
-
-private:
-	AgendaCategoryPrivate* d;
-};
-
-
-class XQCALENDAR_EXPORT AgendaAlarm
-{
-public:
-	static const int MaxFileNameLength = 256;
-
-	AgendaAlarm();
-	AgendaAlarm(const AgendaAlarm& other);
-	~AgendaAlarm();
-
-	void setTimeOffset(int minutes);
-	void setAlarmSoundName(const QString& alarmSoundName);
-	QString alarmSoundName() const;
-	int timeOffset() const;
-
-	bool isNull() const;
-
-	AgendaAlarm& operator=(const AgendaAlarm& other);
-	bool operator==(const AgendaAlarm& other) const;
-	bool operator!=(const AgendaAlarm& other) const;
-
-private:
-	void detach();
-
-private:
-	AgendaAlarmPrivate* d;
-};
-
-class XQCALENDAR_EXPORT AgendaGeoValue
-{
-public:
-
-	AgendaGeoValue();
-	AgendaGeoValue(const AgendaGeoValue& other);
-	~AgendaGeoValue();
-
-	void setLatLong(double latitude, double longitude);
-	void getLatLong(double& latitude, double& longitude) const;
-
-	bool isNull() const;
-
-	AgendaGeoValue& operator=(const AgendaGeoValue& other);
-	bool operator==(const AgendaGeoValue& other) const;
-	bool operator!=(const AgendaGeoValue& other) const;
-
-private:
-	void detach();
-
-private:
-	AgendaGeoValuePrivate* d;
-};
-
-class XQCALENDAR_EXPORT AgendaRepeatRule
-{
-public:
-
-	enum RuleType {
-		InvalidRule = 0,
-		DailyRule,
-		WeeklyRule,
-		MonthlyRule,
-		YearlyRule
-	};
-
-	enum Day {
-		Monday,
-		Tuesday,
-		Wednesday,
-		Thursday,
-		Friday,
-		Saturday,
-		Sunday,
-		InvalidDay = -1
-	};
-
-	enum Month {
-		January,
-		February,
-		March,
-		April,
-		May,
-		June,
-		July,
-		August,
-		September,
-		October,
-		November,
-		December,
-		InvalidMonth = -1
-	};
-
-	AgendaRepeatRule();
-	AgendaRepeatRule(RuleType type);
-	AgendaRepeatRule(const AgendaRepeatRule& other);
-	~AgendaRepeatRule();
-
-	void setType(RuleType type);
-	RuleType type() const;
-
-	int count() const;
-
-	void setInterval(int interval);
-	int interval() const;
-
-	void setUntil(const QDateTime& date);
-	QDateTime until() const;
-
-	void setRepeatRuleStart(const QDateTime& dateTime);
-	QDateTime repeatRuleStart() const;
-
-	void setWeekStart(Day day);
-	Day weekStart() const;
-
-	void setByDay(const QList<Day>& days);
-	QList<Day> byDay() const;
-
-	void setByMonthDay(const QList<int>& monthDays);
-	QList<int> byMonthDay() const;
-
-	void setByMonth(const QList<Month>& months);
-	QList<Month> byMonth() const;
-
-	bool isNull() const;
-	AgendaRepeatRule& operator=(const AgendaRepeatRule& other);
-	bool operator==(const AgendaRepeatRule& other) const;
-	bool operator!=(const AgendaRepeatRule& other) const;
-
-private:
-	void detach();
-
-private:
-	AgendaRepeatRulePrivate* d;
-};
-
-class XQCALENDAR_EXPORT AgendaEntry
-{
-public:
-	enum Type {
-		TypeAppoinment,
-		TypeTodo,
-		TypeEvent,
-		TypeReminder,
-		TypeAnniversary,
-		TypeNote,
-		TypeUnknown = -1
-	};
-
-	enum Method {
-		MethodNone,
-		MethodPublish,
-		MethodRequest,
-		MethodReply,
-		MethodAdd,
-		MethodCancel,
-		MethodRefresh,
-		MethodCounter,
-		MethodDeclineCounter,
-		MethodUnknown = -1
-	};
-
-	enum Status {
-		Tentative,
-		Confirmed,
-		Cancelled,
-		TodoNeedsAction,
-		TodoCompleted,
-		TodoInProcess,
-		NullStatus,
-
-		VCalAccepted,
-		VCalNeedsAction,
-		VCalSent,
-		VCalDeclined,
-		VCalDelegated,
-
-		StatusUnknown = -1
-	};
-
-	AgendaEntry();
-	AgendaEntry(Type type);
-	AgendaEntry(const AgendaEntry& other);
-	virtual ~AgendaEntry();
-
-	void addAttendee(const AgendaAttendee& attendee);
-	void addCategory(const AgendaCategory& category);
-
-	bool setStartAndEndTime(
-			const QDateTime& startTime, const QDateTime& endTime);
-	QDateTime startTime() const;
-	QDateTime endTime() const;
-
-	QList<AgendaAttendee>& attendees();
-	const QList<AgendaAttendee>& attendees() const;
-	QList<AgendaCategory>& categories();
-	const QList<AgendaCategory>& categories() const;
-
-	void setDescription(const QString& description);
-	QString description() const;
-
-	void setType(Type type);
-	Type type() const;
-
-	void setAlarm(const AgendaAlarm& alarm);
-	AgendaAlarm alarm() const;
-
-	void setLocation(const QString& location);
-	QString location() const;
-
-	void setSummary(const QString& summary);
-	QString summary() const;
-
-	void setMethod(Method method);
-	Method method() const;
-
-	void setRepeatRule(const AgendaRepeatRule& repeatRule);
-	AgendaRepeatRule repeatRule() const;
-
-	void setPriority(int priority);
-	int priority() const;
-
-	void setRDates(const QList<QDate>& rdates);
-	QList<QDate> rDates() const;
-
-	void setRecurrenceId(QDateTime& recTime);
-	QDateTime recurrenceId();
-
-	bool isNull() const;
-
-	ulong id() const;
-	bool isTimedEntry();
-	bool isRepeating();
-
-	QDateTime lastModifiedDateTime() const;
-	void setLastModifiedDateTime(const QDateTime& dateTime);
-
-	Status status() const;
-	void setStatus(Status status);
-
-	uint favourite() const;
-	void setFavourite(uint favourite);
-
-	void setCompletedDateTime(const QDateTime& dateTime);
-	QDateTime completedDateTime() const;
-
-	void setDTStamp(const QDateTime& dateTime);
-	QDateTime dtStamp() const;
-	
-	void setGeoValue(const AgendaGeoValue& geoValue);
-	AgendaGeoValue geoValue() const;
-	void clearGeoValue() const;
-	
-	int durationInSecs() const;
-	AgendaEntry& operator=(const AgendaEntry& other);
-	bool operator==(const AgendaEntry& other) const;
-	bool operator!=(const AgendaEntry& other) const;
-
-private:
-	void detach();
-
-private:
-	AgendaEntryPrivate* d;
-	friend class AgendaUtilPrivate;
-};
-
-#endif // AGENDAENTRY_H
-
-// End of file	--Don't remove this.

--- a/agendainterface/agendautil/inc/agendaentry_p.h	Tue Jul 06 14:14:56 2010 +0300
+++ b/agendainterface/agendautil/inc/agendaentry_p.h	Wed Aug 18 09:47:38 2010 +0300
@@ -23,7 +23,7 @@
 #include <QTime>
 
 // User includes
-#include "agendaentry.h"
+#include <agendaentry.h>
 
 class AgendaAttendeePrivate
 {

--- a/agendainterface/agendautil/inc/agendautil.h	Tue Jul 06 14:14:56 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,133 +0,0 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Header file for AgendaUtil class.
-*
-*/
-
-#ifndef AGENDAUTIL_H
-#define AGENDAUTIL_H
-
-// System includes
-#include <QObject>
-#include <QList>
-
-// User includes
-#include "agendaentry.h"
-#include "agendainterfacedefines.h"
-
-// Forward declarations
-class QDateTime;
-class AgendaUtilPrivate;
-
-class XQCALENDAR_EXPORT AgendaUtil : public QObject
-{
-	Q_OBJECT
-
-public:
-
-	enum Error {
-		NoError = 0,
-		OutOfMemoryError,
-		AlreadyInUse,
-		UnknownError = -1
-	};
-
-	enum FilterFlags {
-		IncludeAppointments = 0x01,
-		IncludeReminders = 0x02,
-		IncludeEvents = 0x04,
-		IncludeAnniversaries = 0x08,
-		IncludeCompletedTodos = 0x10,
-		IncludeIncompletedTodos = 0x20,
-		IncludeAlarmedOnly = 0x40,
-		IncludeRptsNextInstanceOnly = 0x80,
-		IncludeNotes=0x300,
-		IncludeAll=IncludeAppointments
-		| IncludeReminders
-		| IncludeEvents
-		| IncludeAnniversaries
-		| IncludeCompletedTodos
-		| IncludeIncompletedTodos
-		| IncludeNotes
-	};
-
-	enum RecurrenceRange {
-		ThisOnly,
-		ThisAndAll,
-		ThisAndFuture,
-		ThisAndPrior
-	};
-
-	AgendaUtil(QObject* parent = 0);
-	~AgendaUtil();
-
-	ulong addEntry(const AgendaEntry& entry);
-	ulong cloneEntry(const AgendaEntry& entry, AgendaEntry::Type type);
-	bool deleteEntry(ulong id);
-	void deleteRepeatedEntry(
-			AgendaEntry& entry, AgendaUtil::RecurrenceRange range);
-	bool updateEntry(const AgendaEntry& entry, bool isChild = false);
-	bool storeRepeatingEntry(const AgendaEntry& entry, bool copyToChildren);
-	bool createException(const AgendaEntry& entry,QDateTime instanceOriginalDateTime);
-	QList<ulong> entryIds(
-			AgendaUtil::FilterFlags filter = AgendaUtil::IncludeAll);
-	QList<AgendaEntry> fetchAllEntries(
-			AgendaUtil::FilterFlags filter = AgendaUtil::IncludeAll);
-	QList<AgendaEntry> fetchEntriesInRange(
-			QDateTime rangeStart, QDateTime rangeEnd,
-			AgendaUtil::FilterFlags filter = AgendaUtil::IncludeAll);
-	QList<AgendaEntry> createEntryIdListForDay(
-			QDateTime day,
-			AgendaUtil::FilterFlags filter = AgendaUtil::IncludeAll);
-	AgendaEntry fetchById(ulong id);
-
-	int importvCalendar(const QString& fileName, AgendaEntry& entry);
-	bool exportAsvCalendar(const QString& fileName, long int calendarEntryId);
-
-	AgendaUtil::Error error() const;
-	void setCompleted(AgendaEntry& entry, bool complete, QDateTime& dateTime);
-	void deleteEntries(
-			QDateTime& start, QDateTime& end,
-			AgendaUtil::FilterFlags filter = AgendaUtil::IncludeAll);
-	AgendaEntry parentEntry(AgendaEntry& entry);
-	void clearRepeatingProperties(AgendaEntry& entry);
-	void getPreviousInstanceTimes(AgendaEntry& entry, QDateTime& startTime, 
-	                              QDateTime& endTime);
-	void getNextInstanceTimes(AgendaEntry& entry, QDateTime& startTime, 
-	                          QDateTime& endTime);
-	void markDatesWithEvents(QDateTime rangeStart, QDateTime rangeEnd,
-						 AgendaUtil::FilterFlags filter, QList<QDate>& dates);
-	bool areNoEntriesInCalendar();
-	static QDateTime minTime();
-	static QDateTime maxTime();
-
-	static bool isWorkdaysRepeatingEntry(const AgendaRepeatRule& repeatRule);
-	
-Q_SIGNALS:
-	void entriesChanged(QList<ulong> ids);
-	void entryAdded(ulong id);
-	void entryDeleted(ulong id);
-	void entryUpdated(ulong id);
-	void entriesDeleted(int status);
-	void entryViewCreationCompleted(int status);
-	void instanceViewCreationCompleted(int status);
-
-private:
-	friend class AgendaUtilPrivate;
-	AgendaUtilPrivate* d;
-};
-
-#endif // AGENDAUTIL_H
-
-// End of file	--Don't remove this.

--- a/agendainterface/agendautil/inc/agendautil_p.h	Tue Jul 06 14:14:56 2010 +0300
+++ b/agendainterface/agendautil/inc/agendautil_p.h	Wed Aug 18 09:47:38 2010 +0300
@@ -29,7 +29,7 @@
 #include <calcategory.h>
 
 // User includes
-#include "agendautil.h"
+#include <agendautil.h>
 
 // Forward declarations
 class CCalSession;
@@ -61,11 +61,8 @@
 	AgendaUtilPrivate(AgendaUtil* calendar);
 	~AgendaUtilPrivate();
 
-	ulong addEntry(const AgendaEntry& entry);
+	ulong store(AgendaEntry &entry, AgendaUtil::RecurrenceRange range);
 	ulong cloneEntry(const AgendaEntry& entry, AgendaEntry::Type type);
-	bool updateEntry(const AgendaEntry& entry, bool isChild = false);
-	bool storeRepeatingEntry(const AgendaEntry& entry, bool copyToChildren);
-	bool createException(const AgendaEntry& entry, QDateTime instanceOriginalDateTime);
 	
 	bool deleteEntry(ulong id);
 	void deleteRepeatedEntry(
@@ -92,7 +89,6 @@
 	AgendaUtil::Error error() const;
 	void setCompleted(AgendaEntry& entry, bool complete, QDateTime& dateTime);
 	AgendaEntry parentEntry(AgendaEntry& entry);
-	void clearRepeatingProperties(AgendaEntry& entry);
 	void getPreviousInstanceTimes(AgendaEntry& entry, QDateTime& startTime, 
 		                              QDateTime& endTime);
 	void getNextInstanceTimes(AgendaEntry& entry, QDateTime& startTime, 
@@ -114,6 +110,7 @@
 private:
 	AgendaEntry createAgendaEntryFromCalEntry(
 			CCalEntry& calEntry, CCalInstance* instance = NULL);
+	void createCCalEntryFromAgendaEntry(AgendaEntry &agendaEntry, CCalEntry &calEntry);
 	bool addAttendeesToEntry(
 			const QList<AgendaAttendee>& attendees, CCalEntry& entry);
 	bool addCategoriesToEntry(
@@ -142,17 +139,7 @@
 									const CalCommon::TCalTimeRange& timeRange);
 	TTime getNextInstanceForRepeatOther(CCalEntry& aEntry, 
 								   const CalCommon::TCalTimeRange& timeRange);
-	bool haveRepeatPropertiesChanged(const CCalEntry& newEntry, 
-	                                  const CCalEntry& oldEntry);
-	void copyChildrenExceptionData( CCalEntry& editedEntry,
-								RPointerArray<CCalEntry>& oldEntries );
-	bool isFieldSame( CCalEntry& entryOne, CCalEntry& entryTwo,
-								DifferenceFlag flag);
-	void copyField( const CCalEntry& src, CCalEntry& dst,
-							DifferenceFlag field );
-	void storeEachChildEntry(CCalEntry &entry,
-							  RPointerArray<CCalEntry> &oldEntries,
-							  bool resetLocalUid);
+	
 	TCalTime generateRecurrenceIdFromEntry( CCalEntry& entry, 
 											TCalTime instanceDate );
 	
@@ -161,7 +148,7 @@
 						  
 	AgendaRepeatRule createAgendaRRuleFromTCalRRule(TCalRRule &calRRule);
 	
-	TCalRRule createTCalRRuleFromAgendaRRule(AgendaRepeatRule &agendaRRule);
+	TCalRRule createTCalRRuleFromAgendaRRule(AgendaRepeatRule &agendaRRule, bool isNonFloating);
 
 
 private:
@@ -174,6 +161,8 @@
 	bool mInstanceViewCreated;
 	mutable int iError;
 	bool mIsDeleting;
+	bool mIsInstanceViewBeingDeleted;
+	bool mIsEntryViewBeingDeleted;
 
 	enum CompareResult {
 		Equal = 0, 			// 1. == 2.