Replace most RecurranceRuleData structure with RecurranceRuleDataTokens.

[xestiacalendar/.git] / source / objects / calendarobject / CalendarObject.h

diff --git a/source/objects/calendarobject/CalendarObject.h b/source/objects/calendarobject/CalendarObject.h
index b40c6f3..c59615d 100644 (file)
--- a/source/objects/calendarobject/CalendarObject.h
+++ b/source/objects/calendarobject/CalendarObject.h
@@ -59,7 +59,7 @@ class CalendarObject{
        vector<std::string> CateogriesListTokens;
        
        std::string ClassData;
-       std::string ClassListTokens;
+       std::string ClassDataTokens;
        
        vector<std::string> CommentList;
        vector<std::string> CommentListAltID;
@@ -67,7 +67,7 @@ class CalendarObject{
        vector<std::string> CommentListTokens;
        
        vector<std::string> DescriptionList;
-       vector<std::string> DescriptionListAltID;
+       vector<std::string> DescriptionListAltRep;
        vector<std::string> DescriptionListLanguage;
        vector<std::string> DescriptionListTokens;
        
@@ -75,12 +75,14 @@ class CalendarObject{
        std::string GeographicTokens;
        
        std::string LocationData;
-       std::string LocationDataAltID;
+       std::string LocationDataAltRep;
+       std::string LocationDataLanguage;
+       std::string LocationDataTokens;
        
        std::string PercentCompleteData;
        std::string PercentCompleteTokens;
        
-       int PriorityData;
+       int PriorityData = -1;
        std::string PriorityTokens;
        
        vector<std::string> ResourcesData;
@@ -92,7 +94,7 @@ class CalendarObject{
        std::string StatusTokens;
        
        std::string SummaryData;
-       std::string SummaryDataAltID;
+       std::string SummaryDataAltRep;
        std::string SummaryDataLanguage;
        std::string SummaryDataTokens;
        
@@ -165,6 +167,7 @@ class CalendarObject{
        
        std::string RecurranceIDData;
        std::string RecurranceIDDataTimeZoneParam;
+       std::string RecurranceIDDataRangeParam;
        std::string RecurranceIDDataValue;
        std::string RecurranceIDDataTokens;
        
@@ -186,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;
@@ -211,15 +205,15 @@ class CalendarObject{
        std::string LastModifiedData;
        std::string LastModifiedTokens;
 
-       std::string SequenceData;
+       int SequenceData = -1;
        std::string SequenceTokens;
 
        vector<std::string> XTokensData;
        vector<std::string> XTokensDataTokens;
 
-       vector<std::string> RequestStatusData;
-       vector<std::string> RequestStatusLanguage;
-       vector<std::string> RequestStatusTokens;
+       std::string RequestStatusData;
+       std::string RequestStatusLanguage;
+       std::string RequestStatusTokens;
        
        protected:
        // Initial Loading Data.