src/kolabcontainers.cpp src/kolabcontainers.h src/xcalconversions.h

[Christian Mollekopf]

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

New commits:
commit aee771de11df88a63eef5f77fa1630a50ece6a23
Author: Christian Mollekopf <mollekopf at kolabsys.com>
Date:   Wed May 23 14:40:28 2012 +0200

    Changed default cutype to Individual, added room.

diff --git a/src/kolabcontainers.cpp b/src/kolabcontainers.cpp
index c731a5e..47c76e3 100644
--- a/src/kolabcontainers.cpp
+++ b/src/kolabcontainers.cpp
@@ -398,7 +398,7 @@ struct Attendee::Private
     : partStat(PartNeedsAction),
     role(Required),
     rsvp(false),
-    cutype(CutypeUnknown)
+    cutype(CutypeIndividual)
     {};
     
     ContactReference contact;
diff --git a/src/kolabcontainers.h b/src/kolabcontainers.h
index 7358718..f2a5018 100644
--- a/src/kolabcontainers.h
+++ b/src/kolabcontainers.h
@@ -344,7 +344,8 @@ enum Cutype {
     CutypeUnknown,
     CutypeGroup,
     CutypeIndividual,
-    CutypeResource
+    CutypeResource,
+    CutypeRoom
 };
 
 class Attendee {
diff --git a/src/xcalconversions.h b/src/xcalconversions.h
index 5aa4c7a..68947ee 100644
--- a/src/xcalconversions.h
+++ b/src/xcalconversions.h
@@ -100,6 +100,7 @@ const char* const GROUP = "GROUP";
 const char* const INDIVIDUAL = "INDIVIDUAL";
 const char* const RESOURCE = "RESOURCE";
 const char* const UNKNOWN = "UNKNOWN";
+const char* const ROOM = "ROOM";
 
 //Alarms
 const char* const START = "START";
@@ -916,6 +917,12 @@ void setIncidenceProperties(I &inc, const T &prop)
                             a.setCutype(CutypeIndividual);
                         } else if (p->text() == GROUP) {
                             a.setCutype(CutypeGroup);
+                        } else if (p->text() == ROOM) {
+                            a.setCutype(CutypeGroup);
+                        } else if (p->text() == UNKNOWN) {
+                            a.setCutype(CutypeGroup);
+                        } else {
+                            WARNING("Invalid attendee cutype");
                         }
                     }
 
@@ -1201,9 +1208,15 @@ void getIncidenceProperties(T &prop, const I &inc)
                     case CutypeResource:
                         type = RESOURCE;
                         break;
+                    case CutypeRoom:
+                        type = ROOM;
+                        break;
+                    case CutypeUnknown:
+                        type = UNKNOWN;
+                        break;
                     default:
                         WARNING("unknown cutype");
-                        type = UNKNOWN;
+                        type = INDIVIDUAL;
                         break;
                 }
                 p.baseParameter().push_back(icalendar_2_0::CutypeParamType(type));