summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--common/domain/applicationdomaintype.cpp2
-rw-r--r--common/domain/applicationdomaintype.h2
-rw-r--r--common/domain/event.fbs2
-rw-r--r--common/domain/typeimplementations.cpp2
-rw-r--r--examples/caldavresource/caldavresource.cpp5
5 files changed, 12 insertions, 1 deletions
diff --git a/common/domain/applicationdomaintype.cpp b/common/domain/applicationdomaintype.cpp
index 93b02a9..78d46ee 100644
--- a/common/domain/applicationdomaintype.cpp
+++ b/common/domain/applicationdomaintype.cpp
@@ -128,6 +128,8 @@ SINK_REGISTER_PROPERTY(Event, Uid);
128SINK_REGISTER_PROPERTY(Event, Summary); 128SINK_REGISTER_PROPERTY(Event, Summary);
129SINK_REGISTER_PROPERTY(Event, Description); 129SINK_REGISTER_PROPERTY(Event, Description);
130SINK_REGISTER_PROPERTY(Event, StartTime); 130SINK_REGISTER_PROPERTY(Event, StartTime);
131SINK_REGISTER_PROPERTY(Event, EndTime);
132SINK_REGISTER_PROPERTY(Event, Ical);
131SINK_REGISTER_PROPERTY(Event, Calendar); 133SINK_REGISTER_PROPERTY(Event, Calendar);
132 134
133SINK_REGISTER_ENTITY(Calendar); 135SINK_REGISTER_ENTITY(Calendar);
diff --git a/common/domain/applicationdomaintype.h b/common/domain/applicationdomaintype.h
index e05acaa..43d385c 100644
--- a/common/domain/applicationdomaintype.h
+++ b/common/domain/applicationdomaintype.h
@@ -400,6 +400,8 @@ struct SINK_EXPORT Event : public Entity {
400 SINK_PROPERTY(QString, Summary, summary); 400 SINK_PROPERTY(QString, Summary, summary);
401 SINK_PROPERTY(QString, Description, description); 401 SINK_PROPERTY(QString, Description, description);
402 SINK_PROPERTY(QDateTime, StartTime, startTime); 402 SINK_PROPERTY(QDateTime, StartTime, startTime);
403 SINK_PROPERTY(QDateTime, EndTime, endTime);
404 SINK_PROPERTY(QByteArray, Ical, ical);
403 SINK_REFERENCE_PROPERTY(Calendar, Calendar, calendar); 405 SINK_REFERENCE_PROPERTY(Calendar, Calendar, calendar);
404}; 406};
405 407
diff --git a/common/domain/event.fbs b/common/domain/event.fbs
index 68c8608..77aaef6 100644
--- a/common/domain/event.fbs
+++ b/common/domain/event.fbs
@@ -5,6 +5,8 @@ table Event {
5 summary:string; 5 summary:string;
6 description:string; 6 description:string;
7 startTime:string; 7 startTime:string;
8 endTime:string;
9 ical:string;
8 calendar:string; 10 calendar:string;
9} 11}
10 12
diff --git a/common/domain/typeimplementations.cpp b/common/domain/typeimplementations.cpp
index fe70d74..615c8e8 100644
--- a/common/domain/typeimplementations.cpp
+++ b/common/domain/typeimplementations.cpp
@@ -207,6 +207,8 @@ void TypeImplementation<Event>::configure(PropertyMapper &propertyMapper)
207 SINK_REGISTER_SERIALIZER(propertyMapper, Event, Description, description); 207 SINK_REGISTER_SERIALIZER(propertyMapper, Event, Description, description);
208 SINK_REGISTER_SERIALIZER(propertyMapper, Event, Uid, uid); 208 SINK_REGISTER_SERIALIZER(propertyMapper, Event, Uid, uid);
209 SINK_REGISTER_SERIALIZER(propertyMapper, Event, StartTime, startTime); 209 SINK_REGISTER_SERIALIZER(propertyMapper, Event, StartTime, startTime);
210 SINK_REGISTER_SERIALIZER(propertyMapper, Event, EndTime, endTime);
211 SINK_REGISTER_SERIALIZER(propertyMapper, Event, Ical, ical);
210 SINK_REGISTER_SERIALIZER(propertyMapper, Event, Calendar, calendar); 212 SINK_REGISTER_SERIALIZER(propertyMapper, Event, Calendar, calendar);
211} 213}
212 214
diff --git a/examples/caldavresource/caldavresource.cpp b/examples/caldavresource/caldavresource.cpp
index 2bcdfa1..57f030b 100644
--- a/examples/caldavresource/caldavresource.cpp
+++ b/examples/caldavresource/caldavresource.cpp
@@ -66,7 +66,8 @@ protected:
66 { 66 {
67 const auto &rid = resourceID(remoteItem); 67 const auto &rid = resourceID(remoteItem);
68 68
69 auto incidence = KCalCore::ICalFormat().fromString(remoteItem.data()); 69 auto ical = remoteItem.data();
70 auto incidence = KCalCore::ICalFormat().fromString(ical);
70 71
71 using Type = KCalCore::IncidenceBase::IncidenceType; 72 using Type = KCalCore::IncidenceBase::IncidenceType;
72 73
@@ -79,6 +80,8 @@ protected:
79 localEvent.setSummary(remoteEvent.summary()); 80 localEvent.setSummary(remoteEvent.summary());
80 localEvent.setDescription(remoteEvent.description()); 81 localEvent.setDescription(remoteEvent.description());
81 localEvent.setStartTime(remoteEvent.dtStart()); 82 localEvent.setStartTime(remoteEvent.dtStart());
83 localEvent.setEndTime(remoteEvent.dtEnd());
84 localEvent.setIcal(ical);
82 localEvent.setCalendar(calendarLocalId); 85 localEvent.setCalendar(calendarLocalId);
83 86
84 SinkTrace() << "Found an event:" << localEvent.getSummary() << "with id:" << rid; 87 SinkTrace() << "Found an event:" << localEvent.getSummary() << "with id:" << rid;