Avoid mapping to kcalcore enum

Can define our own values. Further the participation was coerced to boolean(?)
sailfishos · May 17, 2019 · c397856 · c397856
1 parent e539f3f
commit c397856
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 4 deletions.
diff --git a/src/calendareventquery.h b/src/calendareventquery.h
@@ -53,15 +53,14 @@ class Person : public QObject
     Q_PROPERTY(int participationRole READ participationRole CONSTANT FINAL)
 
 public:
-    // mapping to KCalcore::Attendee::Role
     enum AttendeeRole {
         RequiredParticipant,
         OptionalParticipant,
         NonParticipant,
         ChairParticipant
     };
 
-    Person(const QString &aName, const QString &aEmail, bool aIsOrganizer, bool aParticipationRole)
+    Person(const QString &aName, const QString &aEmail, bool aIsOrganizer, AttendeeRole aParticipationRole)
         : m_name(aName), m_email(aEmail), m_isOrganizer(aIsOrganizer), m_participationRole(aParticipationRole)
     {
     }

diff --git a/src/calendarutils.cpp b/src/calendarutils.cpp
@@ -152,8 +152,22 @@ QList<QObject *> NemoCalendarUtils::convertAttendeeList(const QList<NemoCalendar
 {
     QList<QObject*> result;
     foreach (const NemoCalendarData::Attendee &attendee, list) {
-        QObject *person = new Person(attendee.name, attendee.email, attendee.isOrganizer,
-                                     attendee.participationRole);
+        Person::AttendeeRole role;
+        switch (attendee.participationRole) {
+        case KCalCore::Attendee::ReqParticipant:
+            role = Person::RequiredParticipant;
+            break;
+        case KCalCore::Attendee::OptParticipant:
+            role = Person::OptionalParticipant;
+            break;
+        case KCalCore::Attendee::Chair:
+            role = Person::ChairParticipant;
+            break;
+        default:
+            role = Person::NonParticipant;
+            break;
+        }
+        QObject *person = new Person(attendee.name, attendee.email, attendee.isOrganizer, role);
         result.append(person);
     }