src/kolabcontainers.h src/xcalconversions.h

[Jeroen van Meeuwen]

 src/kolabcontainers.h |    8 ++++----
 src/xcalconversions.h |   10 +++++++++-
 2 files changed, 13 insertions(+), 5 deletions(-)

New commits:
commit 961160efe7c23e816e19c87033886dc8f1b62659
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date:   Wed May 23 09:48:58 2012 +0100

    Actually bring the CUTYPEs to libkolabxml correctly

diff --git a/src/kolabcontainers.h b/src/kolabcontainers.h
index b41b8b0..7358718 100644
--- a/src/kolabcontainers.h
+++ b/src/kolabcontainers.h
@@ -341,10 +341,10 @@ enum Role {
 };
 
 enum Cutype {
-    Unknown,
-    Group,
-    Individual,
-    Resource
+    CutypeUnknown,
+    CutypeGroup,
+    CutypeIndividual,
+    CutypeResource
 };
 
 class Attendee {
diff --git a/src/xcalconversions.h b/src/xcalconversions.h
index 390b286..0fa9def 100644
--- a/src/xcalconversions.h
+++ b/src/xcalconversions.h
@@ -96,6 +96,8 @@ const char* const FR = "FR";
 const char* const SA = "SA";
 const char* const SU = "SU";
 
+const char* const GROUP = "GROUP";
+const char* const INDIVIDUAL = "INDIVIDUAL";
 const char* const RESOURCE = "RESOURCE";
 const char* const UNKNOWN = "UNKNOWN";
 
@@ -1186,7 +1188,13 @@ void getIncidenceProperties(T &prop, const I &inc)
             if (a.cutype() != Unknown) {
                 std::string type;
                 switch (a.cutype()) {
-                    case Resource:
+                    case CutypeIndividual:
+                        type = INDIVIDUAL;
+                        break;
+                    case CutypeGroup:
+                        type = GROUP;
+                        break;
+                    case CutypeResource:
                         type = RESOURCE;
                         break;
                     default: