Added RecurrenceIDDataRangeParam in CalendarObject.

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

diff --git a/source/objects/calendarobject/CalendarObject.h b/source/objects/calendarobject/CalendarObject.h
index 9887f93..12f5369 100644 (file)
--- a/source/objects/calendarobject/CalendarObject.h
+++ b/source/objects/calendarobject/CalendarObject.h
@@ -4,6 +4,9 @@
 #include <sstream>
 #include <vector>
 #include <stdexcept>
+#include <map>
+
+#include "../../common/text.h"
 
 using namespace std;
 
@@ -27,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.
@@ -36,6 +40,12 @@ class CalendarObject{
        
        // Object data.
        
+       std::string MethodData;
+       std::string MethodTokens;
+       
+       std::string CalendarScaleData;
+       std::string CalendarScaleTokens;
+       
        std::string UniqueID;
        std::string UniqueIDTokens;
        
@@ -49,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;
@@ -57,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;
        
@@ -65,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;
@@ -82,7 +94,7 @@ class CalendarObject{
        std::string StatusTokens;
        
        std::string SummaryData;
-       std::string SummaryDataAltID;
+       std::string SummaryDataAltRep;
        std::string SummaryDataLanguage;
        std::string SummaryDataTokens;
        
@@ -96,10 +108,10 @@ class CalendarObject{
        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;
@@ -155,6 +167,7 @@ class CalendarObject{
        
        std::string RecurranceIDData;
        std::string RecurranceIDDataTimeZoneParam;
+       std::string RecurranceIDDataRangeParam;
        std::string RecurranceIDDataValue;
        std::string RecurranceIDDataTokens;
        
@@ -201,15 +214,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.