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

diff --git a/source/objects/calendarobject/CalendarObject.h b/source/objects/calendarobject/CalendarObject.h
index a355ed0..6b33513 100644
--- a/source/objects/calendarobject/CalendarObject.h
+++ b/source/objects/calendarobject/CalendarObject.h
@@ -1,3 +1,6 @@
+#ifndef __OBJECTS_CALENDAROBJECT_CALENDAROBJECT_H__
+#define __OBJECTS_CALENDAROBJECT_CALENDAROBJECT_H__
+
 #include <string>
 #include <iostream>
 #include <fstream>
@@ -52,17 +55,18 @@ class CalendarObject{
 	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 ClassDataTokens;
 	
 	vector<std::string> CommentList;
-	vector<std::string> CommentListAltID;
+	vector<std::string> CommentListAltRep;
 	vector<std::string> CommentListLanguage;
 	vector<std::string> CommentListTokens;
 	
@@ -86,22 +90,23 @@ class CalendarObject{
 	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;
@@ -154,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;
 	
@@ -167,6 +172,7 @@ class CalendarObject{
 	
 	std::string RecurranceIDData;
 	std::string RecurranceIDDataTimeZoneParam;
+	std::string RecurranceIDDataRangeParam;
 	std::string RecurranceIDDataValue;
 	std::string RecurranceIDDataTokens;
 	
@@ -188,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;
@@ -232,3 +229,5 @@ class CalendarObject{
 	virtual void ProcessData() {};
   
 };
+
+#endif
\ No newline at end of file