X-Git-Url: http://Server1/repobrowser/?a=blobdiff_plain;ds=sidebyside;f=source%2Fobjects%2Fcalendarobject%2FCalendarObject.h;h=2b2bf7f19a131c8088fbf4e62289ae1ed3e81047;hb=f10cd3208d61792beb75122fd177014312f85b43;hp=12f5369fc1682ab13664f825ae45db8a050f52bd;hpb=f53595647be46dd59b042f252d6aa9a0f744d420;p=xestiacalendar%2F.git

diff --git a/source/objects/calendarobject/CalendarObject.h b/source/objects/calendarobject/CalendarObject.h
index 12f5369..2b2bf7f 100644
--- a/source/objects/calendarobject/CalendarObject.h
+++ b/source/objects/calendarobject/CalendarObject.h
@@ -52,11 +52,12 @@ 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;
@@ -98,10 +99,10 @@ class CalendarObject{
 	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;
@@ -189,16 +190,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;