X-Git-Url: http://Server1/repobrowser/?a=blobdiff_plain;f=source%2Fobjects%2Fcalendarobject%2FCalendarObject.h;h=6b335131be20828933ecfa123808fc7e55fc99ed;hb=52069b98994d3695c73f4b22d2ea66a04fdda2cf;hp=9887f93d291ebc51024bb1f8ccfa6527bdfd10a8;hpb=18812065ef7d2e79e817ac8f29422fc663ee11e5;p=xestiacalendar%2F.git

diff --git a/source/objects/calendarobject/CalendarObject.h b/source/objects/calendarobject/CalendarObject.h
index 9887f93..6b33513 100644
--- a/source/objects/calendarobject/CalendarObject.h
+++ b/source/objects/calendarobject/CalendarObject.h
@@ -1,9 +1,15 @@
+#ifndef __OBJECTS_CALENDAROBJECT_CALENDAROBJECT_H__
+#define __OBJECTS_CALENDAROBJECT_CALENDAROBJECT_H__
+
 #include <string>
 #include <iostream>
 #include <fstream>
 #include <sstream>
 #include <vector>
 #include <stdexcept>
+#include <map>
+
+#include "../../common/text.h"
 
 using namespace std;
 
@@ -27,6 +33,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,28 +43,35 @@ 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;
+	vector<std::string> CommentListAltRep;
 	vector<std::string> CommentListLanguage;
 	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,41 +79,44 @@ 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;
-	vector<std::string> ResourcesDataAltID;
+	vector<std::string> ResourcesDataAltRep;
 	vector<std::string> ResourcesDataLanguage;
 	vector<std::string> ResourcesDataTokens;
 
 	std::string StatusData;
+	std::string StatusLanguage;
 	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;
@@ -142,7 +159,7 @@ class CalendarObject{
 	vector<std::string> AttendeeListTokens;
 
 	vector<std::string> ContactList;
-	vector<std::string> ContactListAltID;
+	vector<std::string> ContactListAltRep;
 	vector<std::string> ContactListLanguage;
 	vector<std::string> ContactListTokens;
 	
@@ -155,6 +172,7 @@ class CalendarObject{
 	
 	std::string RecurranceIDData;
 	std::string RecurranceIDDataTimeZoneParam;
+	std::string RecurranceIDDataRangeParam;
 	std::string RecurranceIDDataValue;
 	std::string RecurranceIDDataTokens;
 	
@@ -176,16 +194,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;
@@ -201,7 +210,7 @@ class CalendarObject{
 	std::string LastModifiedData;
 	std::string LastModifiedTokens;
 
-	std::string SequenceData;
+	int SequenceData = -1;
 	std::string SequenceTokens;
 
 	vector<std::string> XTokensData;
@@ -220,3 +229,5 @@ class CalendarObject{
 	virtual void ProcessData() {};
   
 };
+
+#endif
\ No newline at end of file