X-Git-Url: http://Server1/repobrowser/?a=blobdiff_plain;f=source%2Fobjects%2Fcalendarobject%2FCalendarObject.h;h=b40c6f3f4ff5e55965a8fbdcbd38088fdf1c52c0;hb=cebb37aa7d20bc00003fc9c66b8a75a75a071dd7;hp=20db2c6fe6a2b8c61535e93ae965cf8ab5434ebe;hpb=d4a9fcb732fb54151e52c926d0ac25e85dbe60ee;p=xestiacalendar%2F.git

diff --git a/source/objects/calendarobject/CalendarObject.h b/source/objects/calendarobject/CalendarObject.h
index 20db2c6..b40c6f3 100644
--- 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;
@@ -97,10 +106,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;
@@ -211,6 +220,11 @@ class CalendarObject{
 	vector<std::string> RequestStatusData;
 	vector<std::string> RequestStatusLanguage;
 	vector<std::string> RequestStatusTokens;
+	
+	protected:
+	// Initial Loading Data.
+	vector<std::string> ObjectName;
+	vector<std::string> ObjectData;
 
 	private:
 	virtual void ProcessData() {};