X-Git-Url: http://Server1/repobrowser/?a=blobdiff_plain;f=source%2Fobjects%2Fcalendarobject%2FCalendarObject.h;h=005bb56129acd5fe30653ac206fedae1829caaac;hb=00eaa33b5ee0bbd98f0ca3bb618e1539bfb3bd78;hp=f23f08b9fa3151c8d4bbf8bf385e07802f47e82b;hpb=998a20ed92cae6cb809722792fa384e00b5f7828;p=xestiacalendar%2F.git

diff --git a/source/objects/calendarobject/CalendarObject.h b/source/objects/calendarobject/CalendarObject.h
index f23f08b..005bb56 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.
@@ -35,6 +40,15 @@ 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;
@@ -45,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;
@@ -92,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;