Replace most RecurranceRuleData structure with RecurranceRuleDataTokens.

diff --git a/source/objects/calendarobject/CalendarObject.h b/source/objects/calendarobject/CalendarObject.h
index 12f5369..c59615d 100644 (file)
--- a/source/objects/calendarobject/CalendarObject.h
+++ b/source/objects/calendarobject/CalendarObject.h
@@ -189,16 +189,7 @@ class CalendarObject{
        vector<std::string> RecurranceDateDataTokens;
        
        std::string RecurranceRuleData;
-       std::string RecurranceRuleDataFrequency;
-       std::string RecurranceRuleDataCount;
-       std::string RecurranceRuleDataInterval;
-       std::string RecurranceRuleDataUntil;
-       std::string RecurranceRuleDataMonth;
-       std::string RecurranceRuleDataWeekStarting;
-       std::string RecurranceRuleDataWeekByDay;
-       std::string RecurranceRuleDataWeekByMonthDay;
-       std::string RecurranceRuleDataWeekByWeekNumber;
-       std::string RecurranceRuleDataWeekBySetPosition;
+       std::string RecurranceRuleDataTokens;
        
        std::string TriggerDataList;
        std::string TriggerDataValue;