Corrected spelling of CategoriesListTokens.

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

diff --git a/source/objects/calendarobject/CalendarObject.h b/source/objects/calendarobject/CalendarObject.h
index 7404216..2b2bf7f 100644 (file)
--- a/source/objects/calendarobject/CalendarObject.h
+++ b/source/objects/calendarobject/CalendarObject.h
@@ -30,6 +30,7 @@ class CalendarObject{
        CalendarObjectLoadResult LoadFile(std::string LoadFilename);
        CalendarObjectLoadResult LoadString(std::string *LoadStringData);
        CalendarObjectValidResult ValidBaseObject();
+       void ProcessBaseData();
        
        // Setup virtual subroutines for use by objects
        // inheriting from CalendarObject later on.
@@ -39,20 +40,27 @@ class CalendarObject{
        
        // Object data.
        
+       std::string MethodData;
+       std::string MethodTokens;
+       
+       std::string CalendarScaleData;
+       std::string CalendarScaleTokens;
+       
        std::string UniqueID;
        std::string UniqueIDTokens;
        
        vector<std::string> AttachList;
        vector<std::string> AttachListTokens;
        vector<std::string> AttachListEncoding;
+       vector<std::string> AttachListFormatType;
        vector<std::string> AttachListValue;
        
        vector<std::string> CategoriesList;
        vector<std::string> CategoriesListLanguage;
-       vector<std::string> CateogriesListTokens;
+       vector<std::string> CategoriesListTokens;
        
        std::string ClassData;
-       std::string ClassListTokens;
+       std::string ClassDataTokens;
        
        vector<std::string> CommentList;
        vector<std::string> CommentListAltID;
@@ -60,7 +68,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;
        
@@ -68,12 +76,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;
@@ -85,24 +95,24 @@ class CalendarObject{
        std::string StatusTokens;
        
        std::string SummaryData;
-       std::string SummaryDataAltID;
+       std::string SummaryDataAltRep;
        std::string SummaryDataLanguage;
        std::string SummaryDataTokens;
        
-       std::string DataTimeEndData;
-       std::string DataTimeEndDataValue;
-       std::string DataTimeEndDataTimeZoneID;
-       std::string DataTimeEndDataTokens;
+       std::string DateTimeEndData;
+       std::string DateTimeEndDataValue;
+       std::string DateTimeEndDataTimeZoneID;
+       std::string DateTimeEndDataTokens;
 
        std::string DueData;
        std::string DueDataValue;
        std::string DueDataTimeZoneID;
        std::string DueDataTokens;
 
-       std::string DataTimeStartData;
-       std::string DataTimeStartDataValue;
-       std::string DataTimeStartDataTimeZoneID;
-       std::string DataTimeStartDataTokens;
+       std::string DateTimeStartData;
+       std::string DateTimeStartDataValue;
+       std::string DateTimeStartDataTimeZoneID;
+       std::string DateTimeStartDataTokens;
 
        std::string DurationData;
        std::string DurationDataTokens;
@@ -158,6 +168,7 @@ class CalendarObject{
        
        std::string RecurranceIDData;
        std::string RecurranceIDDataTimeZoneParam;
+       std::string RecurranceIDDataRangeParam;
        std::string RecurranceIDDataValue;
        std::string RecurranceIDDataTokens;
        
@@ -179,16 +190,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;
@@ -204,15 +206,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.