From: Steve Brokenshire <sbrokenshire@xestia.co.uk>
Date: Sun, 24 Jan 2016 15:14:05 +0000 (+0000)
Subject: Replace most RecurranceRuleData structure with RecurranceRuleDataTokens.
X-Git-Tag: release-0.02~658
X-Git-Url: http://Server1/repobrowser/?a=commitdiff_plain;h=74b68f39d9ccf55221f07a31f14bd58cb11101d1;p=xestiacalendar%2F.git

Replace most RecurranceRuleData structure with RecurranceRuleDataTokens.
---

diff --git a/source/objects/calendarobject/CalendarObject.h b/source/objects/calendarobject/CalendarObject.h
index 12f5369..c59615d 100644
--- a/source/objects/calendarobject/CalendarObject.h
+++ b/source/objects/calendarobject/CalendarObject.h
@@ -189,16 +189,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;