Changed variable type to std::string for three RequestStatus variables.

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

diff --git a/source/objects/calendarobject/CalendarObject.h b/source/objects/calendarobject/CalendarObject.h
index 20db2c6..fb7e8ca 100644 (file)
--- a/source/objects/calendarobject/CalendarObject.h
+++ b/source/objects/calendarobject/CalendarObject.h
@@ -3,6 +3,10 @@
 #include <fstream>
 #include <sstream>
 #include <vector>
+#include <stdexcept>
+#include <map>
+
+#include "../../common/text.h"
 
 using namespace std;
 
@@ -26,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.
@@ -33,13 +38,17 @@ class CalendarObject{
        virtual CalendarObjectValidResult ValidObject() { return CALENDAROBJECTVALID_OK; };
        virtual void Clear() {};
        
-       protected:
-       // Initial Loading Data.
-       vector<std::string> ObjectName;
-       vector<std::string> ObjectData;
-       
        // 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;
@@ -50,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;
@@ -58,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;
        
@@ -66,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;
@@ -97,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;
@@ -202,15 +213,20 @@ 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.
+       vector<std::string> ObjectName;
+       vector<std::string> ObjectData;
 
        private:
        virtual void ProcessData() {};