src/kolabcontainers.cpp src/xcalconversions.h

Jeroen van Meeuwen vanmeeuwen at kolabsys.com
Wed May 23 10:53:52 CEST 2012


 src/kolabcontainers.cpp |    2 +-
 src/xcalconversions.h   |    8 ++++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

New commits:
commit 7bdfc440db4aae164b45db14b8d6fd7b3465b74d
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date:   Wed May 23 09:53:34 2012 +0100

    More corrections to renaming the Cutype constants

diff --git a/src/kolabcontainers.cpp b/src/kolabcontainers.cpp
index 51e9a6c..c731a5e 100644
--- a/src/kolabcontainers.cpp
+++ b/src/kolabcontainers.cpp
@@ -398,7 +398,7 @@ struct Attendee::Private
     : partStat(PartNeedsAction),
     role(Required),
     rsvp(false),
-    cutype(Unknown)
+    cutype(CutypeUnknown)
     {};
     
     ContactReference contact;
diff --git a/src/xcalconversions.h b/src/xcalconversions.h
index 0fa9def..5aa4c7a 100644
--- a/src/xcalconversions.h
+++ b/src/xcalconversions.h
@@ -911,7 +911,11 @@ void setIncidenceProperties(I &inc, const T &prop)
                     }
                     if (const icalendar_2_0::CutypeParamType * p = dynamic_cast<const icalendar_2_0::CutypeParamType*> (&*it)) {
                         if (p->text() == RESOURCE) {
-                            a.setCutype(Resource);
+                            a.setCutype(CutypeResource);
+                        } else if (p->text() == INDIVIDUAL) {
+                            a.setCutype(CutypeIndividual);
+                        } else if (p->text() == GROUP) {
+                            a.setCutype(CutypeGroup);
                         }
                     }
 
@@ -1185,7 +1189,7 @@ void getIncidenceProperties(T &prop, const I &inc)
                 p.baseParameter().push_back(delegatedFrom);
             }
 
-            if (a.cutype() != Unknown) {
+            if (a.cutype() != CutypeUnknown) {
                 std::string type;
                 switch (a.cutype()) {
                     case CutypeIndividual:





More information about the commits mailing list