X-Git-Url: http://Server1/repobrowser/?p=xestiacalendar%2F.git;a=blobdiff_plain;f=source%2Fobjects%2Fcalendartimezone%2FCalendarTimezone.cpp;h=a1f6648318c47558b33f99993b18e80c51bef2da;hp=d699f13e4bd39b0c243237eaf67b81e12e8ebcfd;hb=6028a1fc2134c5d1fe9c0147381cf81c4a0ef126;hpb=3e3ae5dc244fc2f0a905d0e3ba04d974809f02b7

diff --git a/source/objects/calendartimezone/CalendarTimezone.cpp b/source/objects/calendartimezone/CalendarTimezone.cpp
index d699f13..a1f6648 100644
--- a/source/objects/calendartimezone/CalendarTimezone.cpp
+++ b/source/objects/calendartimezone/CalendarTimezone.cpp
@@ -22,49 +22,49 @@ using namespace std;
 
 CalendarObjectValidResult CalendarTimezoneObject::ValidObject(){
  
-	bool ValidBegin = false;
-	bool ValidEnd = false;
-	bool ValidTimeZoneID = false;
-	int SeekCount = 0;
-	string PropertyName;
+	bool validBegin = false;
+	bool validEnd = false;
+	bool validTimeZoneID = false;
+int seekCount = 0;
+	string propertyName;
 	
 	// Look for BEGIN:VEVENT.
 	
-	for (vector<string>::iterator iter = ObjectName.begin();
-		iter != ObjectName.end(); iter++){
+	for (vector<string>::iterator iter = objectName.begin();
+		iter != objectName.end(); iter++){
 	
-		if (ObjectName[SeekCount] == "BEGIN" &&
-			ObjectData[SeekCount] == "VTIMEZONE"){
+		if (objectName[seekCount] == "BEGIN" &&
+			objectData[seekCount] == "VTIMEZONE"){
 			
-			if (ValidBegin == false){
-				ValidBegin = true;
+			if (validBegin == false){
+				validBegin = true;
 			} else {
 				return CALENDAROBJECTVALID_INVALIDFORMAT;
 			}
 				
 		}
 		
-		if (ObjectName[SeekCount] == "END" &&
-			ObjectData[SeekCount] == "VTIMEZONE" &&
-			ValidBegin == false){
+		if (objectName[seekCount] == "END" &&
+			objectData[seekCount] == "VTIMEZONE" &&
+			validBegin == false){
 		
 			return CALENDAROBJECTVALID_INVALIDFORMAT;
 				
 		}
 		
-		SeekCount++;
+		seekCount++;
 			
 	}
 	
-	SeekCount = 0;
+	seekCount = 0;
 	
 	// Look for TZID.
 	
-	for (vector<string>::iterator iter = ObjectName.begin();
-		iter != ObjectName.end(); iter++){
+	for (vector<string>::iterator iter = objectName.begin();
+		iter != objectName.end(); iter++){
 			
 		try{
-			PropertyName = ObjectName[SeekCount].substr(0,4);
+			PropertyName = objectName[seekCount].substr(0,4);
 		}
 			
 		catch(const out_of_range& oor){
@@ -73,45 +73,45 @@ CalendarObjectValidResult CalendarTimezoneObject::ValidObject(){
 		
 		if (PropertyName == "TZID"){
 			
-			if (ValidTimeZoneID == false){
-				ValidTimeZoneID = true;
+			if (validTimeZoneID == false){
+				validTimeZoneID = true;
 			} else {
 				return CALENDAROBJECTVALID_INVALIDFORMAT;
 			}
 				
 		}
 			
-		SeekCount++;
+		seekCount++;
 			
 	}
 	
-	SeekCount = 0;
+	seekCount = 0;
 	
 	// Look for END:VEVENT.
 	
-	for (vector<string>::iterator iter = ObjectName.begin();
-		iter != ObjectName.end(); iter++){
+	for (vector<string>::iterator iter = objectName.begin();
+		iter != objectName.end(); iter++){
 	
-		if (ObjectName[SeekCount] == "END" &&
-			ObjectData[SeekCount] == "VTIMEZONE"){
+		if (objectName[seekCount] == "END" &&
+			objectData[seekCount] == "VTIMEZONE"){
 			
-			if (ValidEnd == false){
-				ValidEnd = true;
+			if (validEnd == false){
+				validEnd = true;
 			} else {
 				return CALENDAROBJECTVALID_INVALIDFORMAT;
 			}
 				
 		}
 			
-		SeekCount++;
+		seekCount++;
 			
 	}
 	
 	// Check if the VEVENT is valid.
 	
-	if (ValidBegin == true && 
-		ValidEnd == true && 
-		ValidTimeZoneID == true){
+	if (validBegin == true && 
+		validEnd == true && 
+		validTimeZoneID == true){
 		
 		return CALENDAROBJECTVALID_OK;
 			
@@ -127,668 +127,666 @@ void CalendarTimezoneObject::ProcessData(){
 
 	// Process the data.
 	
-	multimap<string,string> DataReceived;
-	map<string,string> PropertyData;
-	string *PropertyNameData = nullptr;
-	int ObjectSeekCount = 0;
+	multimap<string,string> dataReceived;
+	map<string,string> propertyData;
+	string *propertyNameData = nullptr;
+	int objectSeekCount = 0;
 	
 	// Process the data from TZID.
 	
-	DataReceived = ProcessTextVectors(&ObjectName, &ObjectData, false, "TZID");
+	dataReceived = ProcessTextVectors(&objectName, &objectData, false, "TZID");
 	
-	if (DataReceived.begin() != DataReceived.end()){
+	if (dataReceived.begin() != dataReceived.end()){
 	
 		try {
-			TimeZoneDataTokens = DataReceived.begin()->first.substr(5);
+			timeZoneDataTokens = dataReceived.begin()->first.substr(5);
 		}
 		
 		catch(const out_of_range &oor){
 			// Do nothing as there is no data.
 		}		
 		
-		TimeZoneData = DataReceived.begin()->second;
+		timeZoneData = dataReceived.begin()->second;
 		
 	}
 	
 	// Process the data from LAST-MODIFIED.
 	
-	DataReceived = ProcessTextVectors(&ObjectName, &ObjectData, false, "LAST-MODIFIED");
+	dataReceived = ProcessTextVectors(&objectName, &objectData, false, "LAST-MODIFIED");
 	
-	if (DataReceived.begin() != DataReceived.end()){
+	if (dataReceived.begin() != dataReceived.end()){
 	
 		try {
-			LastModifiedTokens = DataReceived.begin()->first.substr(14);
+			lastModifiedTokens = dataReceived.begin()->first.substr(14);
 		}
 		
 		catch(const out_of_range &oor){
 			// Do nothing as there is no data.
 		}		
 		
-		LastModifiedData = DataReceived.begin()->second;
+		lastModifiedData = dataReceived.begin()->second;
 		
 	}
 	
 	// Process the data from TZURL.
 	
-	DataReceived = ProcessTextVectors(&ObjectName, &ObjectData, false, "TZURL");
+	dataReceived = ProcessTextVectors(&objectName, &objectData, false, "TZURL");
 	
-	if (DataReceived.begin() != DataReceived.end()){
+	if (dataReceived.begin() != dataReceived.end()){
 	
 		try {
-			TimeZoneURLTokens = DataReceived.begin()->first.substr(6);
+			timeZoneURLTokens = dataReceived.begin()->first.substr(6);
 		}
 		
 		catch(const out_of_range &oor){
 			// Do nothing as there is no data.
 		}		
 		
-		TimeZoneURLData = DataReceived.begin()->second;
+		timeZoneURLData = dataReceived.begin()->second;
 		
 	}
 	
 	// Process data from each STANDARD and DAYLIGHT.
 	
 	ProcessStandardDaylight();
+
+	int seekCount = 0;
 	
-	int TZSeekCount = 0;
-	int SeekCount = 0;
-	
-	for (vector<vector<string>>::iterator tzsiter = TimezoneStandardName.begin();
-		tzsiter != TimezoneStandardName.end(); tzsiter++){
+	for (vector<vector<string>>::iterator tzsiter = timezoneStandardName.begin();
+		tzsiter != timezoneStandardName.end(); tzsiter++){
 
-		bool DateTimeStartFound = false;
-		bool TimeZoneOffsetToFound = false;
-		bool TimeZoneOffsetFromFound = false;
+		bool dateTimeStartFound = false;
+		bool timeZoneOffsetToFound = false;
+		bool timeZoneOffsetFromFound = false;
 		
-		TimezoneDataStruct NewTZData;
+		timezoneDataStruct newTZData;
 					
 		// Process the data from DTSTART.
 	
-		DataReceived = ProcessTextVectors(&TimezoneStandardName[SeekCount], 
-				&TimezoneStandardData[SeekCount], false, "DTSTART");
+		dataReceived = ProcessTextVectors(&timezoneStandardName[seekCount], 
+				&timezoneStandardData[seekCount], false, "DTSTART");
 	
-		if (DataReceived.begin() != DataReceived.end()){
+		if (dataReceived.begin() != dataReceived.end()){
 	
 			try {
-				NewTZData.DateTimeStartTokens = DataReceived.begin()->first.substr(8);
+				newTZData.dateTimeStartTokens = dataReceived.begin()->first.substr(8);
 			}
 		
 			catch(const out_of_range &oor){
 				// Do nothing as there is no data.
 			}
 		
-			NewTZData.DateTimeStartData = DataReceived.begin()->second;
-			DateTimeStartFound = true;
+			newTZData.dateTimeStartData = dataReceived.begin()->second;
+			dateTimeStartFound = true;
 		
 		}
 			
 		// Process the data from TZOFFSETFROM.
 			
-		DataReceived = ProcessTextVectors(&TimezoneStandardName[SeekCount], 
-				&TimezoneStandardData[SeekCount], false, "TZOFFSETFROM");
+		dataReceived = ProcessTextVectors(&timezoneStandardName[seekCount], 
+				&timezoneStandardData[seekCount], false, "TZOFFSETFROM");
 	
-		if (DataReceived.begin() != DataReceived.end()){
+		if (dataReceived.begin() != dataReceived.end()){
 	
 			try {
-				NewTZData.TimeZoneOffsetFromTokens = DataReceived.begin()->first.substr(13);
+				newTZData.timeZoneOffsetFromTokens = dataReceived.begin()->first.substr(13);
 			}
 		
 			catch(const out_of_range &oor){
 				// Do nothing as there is no data.
 			}
 		
-			NewTZData.TimeZoneOffsetFromData = DataReceived.begin()->second;
-			TimeZoneOffsetFromFound = true;
+			newTZData.timeZoneOffsetFromData = dataReceived.begin()->second;
+			timeZoneOffsetFromFound = true;
 		
 		}
 			
 		// Process the data from TZOFFSETTO.
 			
-		DataReceived = ProcessTextVectors(&TimezoneStandardName[SeekCount], 
-				&TimezoneStandardData[SeekCount], false, "TZOFFSETTO");
+		dataReceived = ProcessTextVectors(&timezoneStandardName[seekCount], 
+				&timezoneStandardData[seekCount], false, "TZOFFSETTO");
 	
-		if (DataReceived.begin() != DataReceived.end()){
+		if (dataReceived.begin() != dataReceived.end()){
 	
 			try {
-				NewTZData.TimeZoneOffsetToTokens = DataReceived.begin()->first.substr(11);
+				newTZData.timeZoneOffsetToTokens = dataReceived.begin()->first.substr(11);
 			}
 		
 			catch(const out_of_range &oor){
 				// Do nothing as there is no data.
 			}
 		
-			NewTZData.TimeZoneOffsetToData = DataReceived.begin()->second;
-			TimeZoneOffsetToFound = true;
+			newTZData.timeZoneOffsetToData = dataReceived.begin()->second;
+			timeZoneOffsetToFound = true;
 		
 		}
 		
 		// Process the data from RRULE.
 
-		DataReceived = ProcessTextVectors(&TimezoneStandardName[SeekCount], 
-			&TimezoneStandardData[SeekCount], false, "RRULE");
+		dataReceived = ProcessTextVectors(&timezoneStandardName[seekCount], 
+			&timezoneStandardData[seekCount], false, "RRULE");
 	
-		if (DataReceived.begin() != DataReceived.end()){
+		if (dataReceived.begin() != dataReceived.end()){
 	
 			try {
-				NewTZData.RecurranceRuleDataTokens = DataReceived.begin()->first.substr(6);
+				newTZData.recurranceRuleDataTokens = dataReceived.begin()->first.substr(6);
 			}
 		
 			catch(const out_of_range &oor){
 				// Do nothing as there is no data.
 			}		
 			
-			NewTZData.RecurranceRuleData = DataReceived.begin()->second;
+			newTZData.recurranceRuleData = dataReceived.begin()->second;
 		
 		}
 			
 		// Process the data from COMMENT.
 	
-		DataReceived = ProcessTextVectors(&TimezoneStandardName[SeekCount], 
-			&TimezoneStandardData[SeekCount], true, "COMMENT");
+		dataReceived = ProcessTextVectors(&timezoneStandardName[seekCount], 
+			&timezoneStandardData[seekCount], true, "COMMENT");
 
-		ObjectSeekCount = 0;
+		objectSeekCount = 0;
 	
-		for(multimap<string,string>::iterator propiter = DataReceived.begin(); 
-			propiter != DataReceived.end(); 
+		for(multimap<string,string>::iterator propiter = dataReceived.begin(); 
+			propiter != dataReceived.end(); 
 			++propiter){
 		
-			NewTZData.CommentListTokens.push_back("");
-			NewTZData.CommentListAltRep.push_back("");
-			NewTZData.CommentListLanguage.push_back("");
-			NewTZData.CommentList.push_back("");
+			newTZData.commentListTokens.push_back("");
+			newTZData.commentListAltRep.push_back("");
+			newTZData.commentListLanguage.push_back("");
+			newTZData.commentList.push_back("");
 			
 			bool TokenData = false;
-			string PropertyTokens;
+			string propertyTokens;
 		
-			PropertyNameData = (string*)&propiter->first;
+			propertyNameData = (string*)&propiter->first;
 		
-			PropertyData = SplitValues(*PropertyNameData);
+			propertyData = SplitValues(*propertyNameData);
 			
-			for(map<string,string>::iterator propdataiter = PropertyData.begin();
-				propdataiter != PropertyData.end(); propdataiter++){
+			for(map<string,string>::iterator propdataiter = propertyData.begin();
+				propdataiter != propertyData.end(); propdataiter++){
 			
 				if (propdataiter->first == "ALTREP"){
 				
-					NewTZData.CommentListAltRep[ObjectSeekCount] = propdataiter->second;
+					newTZData.commentListAltRep[objectSeekCount] = propdataiter->second;
 				
 				} else if (propdataiter->first == "LANGUAGE"){
 				
-					NewTZData.CommentListLanguage[ObjectSeekCount] = propdataiter->second;
+					newTZData.commentListLanguage[objectSeekCount] = propdataiter->second;
 				
 				} else {
 				
 					if (TokenData == false){
 						TokenData = true;
 					} else {
-						PropertyTokens += ";";
+						propertyTokens += ";";
 					}
 				
-					PropertyTokens += propdataiter->first;
-					PropertyTokens += "=";
-					PropertyTokens += propdataiter->second;
+					propertyTokens += propdataiter->first;
+					propertyTokens += "=";
+					propertyTokens += propdataiter->second;
 				
 				}
 				
 			}
 		
-			if (PropertyTokens.size() > 0){
-				NewTZData.CommentListTokens[ObjectSeekCount] = PropertyTokens;
+			if (propertyTokens.size() > 0){
+				newTZData.commentListTokens[objectSeekCount] = propertyTokens;
 			}
 			
-			NewTZData.CommentList[ObjectSeekCount] = propiter->second;
+			newTZData.commentList[objectSeekCount] = propiter->second;
 			
-			ObjectSeekCount++;
+			objectSeekCount++;
 		
 		}
 		
 		// Process the data from RDATE.
 			
-		DataReceived = ProcessTextVectors(&TimezoneStandardName[SeekCount], 
-			&TimezoneStandardData[SeekCount], true, "RDATE");
+		dataReceived = ProcessTextVectors(&timezoneStandardName[seekCount], 
+			&timezoneStandardData[seekCount], true, "RDATE");
 
-		ObjectSeekCount = 0;
+		objectSeekCount = 0;
 	
-		for(multimap<string,string>::iterator propiter = DataReceived.begin(); 
-			propiter != DataReceived.end(); 
+		for(multimap<string,string>::iterator propiter = dataReceived.begin(); 
+			propiter != dataReceived.end(); 
 			++propiter){
 		
-			NewTZData.RecurranceDateDataTokens.push_back("");
-			NewTZData.RecurranceDateDataValue.push_back("");
-			NewTZData.RecurranceDateDataTimeZoneParam.push_back("");
-			NewTZData.RecurranceDateData.push_back("");
+			newTZData.recurranceDateDataTokens.push_back("");
+			newTZData.recurranceDateDataValue.push_back("");
+			newTZData.recurranceDateDataTimeZoneParam.push_back("");
+			newTZData.recurranceDateData.push_back("");
 			
 			bool TokenData = false;
-			string PropertyTokens;
+			string propertyTokens;
 		
-			PropertyNameData = (string*)&propiter->first;
+			propertyNameData = (string*)&propiter->first;
 		
-			PropertyData = SplitValues(*PropertyNameData);
+			propertyData = SplitValues(*propertyNameData);
 			
-			for(map<string,string>::iterator dataiter = PropertyData.begin();
-				dataiter != PropertyData.end(); dataiter++){
+			for(map<string,string>::iterator dataiter = propertyData.begin();
+				dataiter != propertyData.end(); dataiter++){
 			
 				if (dataiter->first == "VALUE"){
 			
-					NewTZData.RecurranceDateDataValue[ObjectSeekCount] = dataiter->second;
+					newTZData.recurranceDateDataValue[objectSeekCount] = dataiter->second;
 				
 				} else if (dataiter->first == "TZID"){
 				
-					NewTZData.RecurranceDateDataTimeZoneParam[ObjectSeekCount] = dataiter->second;
+					newTZData.recurranceDateDataTimeZoneParam[objectSeekCount] = dataiter->second;
 				
 				} else {
 				
 					if (TokenData == false){
 						TokenData = true;
 					} else {
-						PropertyTokens += ";";
+						propertyTokens += ";";
 					}
 				
-					PropertyTokens += dataiter->first;
-					PropertyTokens += "=";
-					PropertyTokens += dataiter->second;
+					propertyTokens += dataiter->first;
+					propertyTokens += "=";
+					propertyTokens += dataiter->second;
 				
 				}
 				
 			}
 		
-			if (PropertyTokens.size() > 0){
-				NewTZData.RecurranceDateDataTokens[ObjectSeekCount] = PropertyTokens;
+			if (propertyTokens.size() > 0){
+				newTZData.recurranceDateDataTokens[objectSeekCount] = propertyTokens;
 			}
 			
-			NewTZData.RecurranceDateData[ObjectSeekCount] = propiter->second;
+			newTZData.recurranceDateData[objectSeekCount] = propiter->second;
 		
-			ObjectSeekCount++;
+			objectSeekCount++;
 		
 		}
 			
-		// Process the data from TZNAME.
+// Process the data from TZNAME.
 			
-		DataReceived = ProcessTextVectors(&TimezoneStandardName[SeekCount], 
-			&TimezoneStandardData[SeekCount], true, "TZNAME");
+		dataReceived = ProcessTextVectors(&timezoneStandardName[seekCount], 
+			&timezoneStandardData[seekCount], true, "TZNAME");
 
-		ObjectSeekCount = 0;
+		objectSeekCount = 0;
 	
-		for(multimap<string,string>::iterator propiter = DataReceived.begin(); 
-			propiter != DataReceived.end(); 
+		for(multimap<string,string>::iterator propiter = dataReceived.begin(); 
+			propiter != dataReceived.end(); 
 			++propiter){
 		
-			NewTZData.TimeZoneNameTokens.push_back("");
-			NewTZData.TimeZoneNameLanguage.push_back("");
-			NewTZData.TimeZoneNameData.push_back("");
+			newTZData.timeZoneNameTokens.push_back("");
+			newTZData.timeZoneNameLanguage.push_back("");
+			newTZData.timeZoneNameData.push_back("");
 			
 			bool TokenData = false;
-			string PropertyTokens;
+			string propertyTokens;
 		
-			PropertyNameData = (string*)&propiter->first;
+			propertyNameData = (string*)&propiter->first;
 		
-			PropertyData = SplitValues(*PropertyNameData);
+			propertyData = SplitValues(*propertyNameData);
 			
-			for(map<string,string>::iterator dataiter = PropertyData.begin();
-				dataiter != PropertyData.end(); dataiter++){
+			for(map<string,string>::iterator dataiter = propertyData.begin();
+				dataiter != propertyData.end(); dataiter++){
 			
 				if (dataiter->first == "LANGUAGE"){
 				
-					NewTZData.TimeZoneNameLanguage[ObjectSeekCount] = dataiter->second;
+					newTZData.timeZoneNameLanguage[objectSeekCount] = dataiter->second;
 				
 				} else {
 				
 					if (TokenData == false){
 						TokenData = true;
 					} else {
-						PropertyTokens += ";";
+						propertyTokens += ";";
 					}
 				
-					PropertyTokens += dataiter->first;
-					PropertyTokens += "=";
-					PropertyTokens += dataiter->second;
+					propertyTokens += dataiter->first;
+					propertyTokens += "=";
+					propertyTokens += dataiter->second;
 				
 				}
 				
 			}
 		
-			if (PropertyTokens.size() > 0){
-				NewTZData.TimeZoneNameTokens[ObjectSeekCount] = PropertyTokens;
+			if (propertyTokens.size() > 0){
+				newTZData.timeZoneNameTokens[objectSeekCount] = propertyTokens;
 			}
 			
-			NewTZData.TimeZoneNameData[ObjectSeekCount] = propiter->second;
+			newTZData.timeZoneNameData[objectSeekCount] = propiter->second;
 		
-			ObjectSeekCount++;
+			objectSeekCount++;
 		
 		}
 			
-		ObjectSeekCount = 0;
+		objectSeekCount = 0;
 	
 		// Process data from X-*
 	
-		for(vector<string>::iterator propiter = TimezoneStandardName[SeekCount].begin(); 
-			propiter != TimezoneStandardName[SeekCount].end(); ++propiter){
+		for(vector<string>::iterator propiter = timezoneStandardName[seekCount].begin(); 
+			propiter != timezoneStandardName[seekCount].end(); ++propiter){
 		
 			if (propiter->substr(0,2) == "X-" &&
 				propiter->size() > 2){
 					
-				NewTZData.XTokensData.push_back(TimezoneStandardData[SeekCount][ObjectSeekCount]);
-				NewTZData.XTokensDataTokens.push_back(TimezoneStandardName[SeekCount][ObjectSeekCount]);
+				newTZData.xTokensData.push_back(timezoneStandardData[seekCount][objectSeekCount]);
+				newTZData.xTokensDataTokens.push_back(timezoneStandardName[seekCount][objectSeekCount]);
 				
 			}
 		
-			ObjectSeekCount++;
+			objectSeekCount++;
 		
 		}
 		
 		// Check if the required values were given and
-		// insert NewTZData into the vector list of
+		// insert newTZData into the vector list of
 		// standard timezones.
 			
-		if (DateTimeStartFound == true &&
-			TimeZoneOffsetToFound == true &&
-			TimeZoneOffsetFromFound == true){
+		if (dateTimeStartFound == true &&
+			timeZoneOffsetToFound == true &&
+			timeZoneOffsetFromFound == true){
 					
-			TimezoneStandardCollection.push_back(NewTZData);
+			timezoneStandardCollection.push_back(newTZData);
 					
 		}
 			
-		SeekCount++;
+		seekCount++;
 			
 	}
 
-	TZSeekCount = 0;
-	SeekCount = 0;
+	seekCount = 0;
 	
-	for (vector<vector<string>>::iterator tzsiter = TimezoneDaylightName.begin();
-		tzsiter != TimezoneDaylightName.end(); tzsiter++){
+	for (vector<vector<string>>::iterator tzsiter = timezoneDaylightName.begin();
+		tzsiter != timezoneDaylightName.end(); tzsiter++){
 
-		bool DateTimeStartFound = false;
-		bool TimeZoneOffsetToFound = false;
-		bool TimeZoneOffsetFromFound = false;
+		bool dateTimeStartFound = false;
+		bool timeZoneOffsetToFound = false;
+		bool timeZoneOffsetFromFound = false;
 		
-		TimezoneDataStruct NewTZData;
+		TimezoneDataStruct newTZData;
 					
 		// Process the data from DTSTART.
 	
-		DataReceived = ProcessTextVectors(&TimezoneDaylightName[SeekCount], 
-				&TimezoneDaylightData[SeekCount], false, "DTSTART");
+		dataReceived = ProcessTextVectors(&timezoneDaylightName[seekCount], 
+				&timezoneDaylightData[seekCount], false, "DTSTART");
 	
-		if (DataReceived.begin() != DataReceived.end()){
+		if (dataReceived.begin() != dataReceived.end()){
 	
 			try {
-				NewTZData.DateTimeStartTokens = DataReceived.begin()->first.substr(8);
+				newTZData.dateTimeStartTokens = dataReceived.begin()->first.substr(8);
 			}
 		
 			catch(const out_of_range &oor){
 				// Do nothing as there is no data.
 			}
 		
-			NewTZData.DateTimeStartData = DataReceived.begin()->second;
-			DateTimeStartFound = true;
+			newTZData.dateTimeStartData = dataReceived.begin()->second;
+			dateTimeStartFound = true;
 		
 		}
 			
 		// Process the data from TZOFFSETFROM.
 			
-		DataReceived = ProcessTextVectors(&TimezoneDaylightName[SeekCount], 
-				&TimezoneDaylightData[SeekCount], false, "TZOFFSETFROM");
+		dataReceived = ProcessTextVectors(&timezoneDaylightName[seekCount], 
+				&timezoneDaylightData[seekCount], false, "TZOFFSETFROM");
 	
-		if (DataReceived.begin() != DataReceived.end()){
+		if (dataReceived.begin() != dataReceived.end()){
 	
 			try {
-				NewTZData.TimeZoneOffsetFromTokens = DataReceived.begin()->first.substr(13);
+				newTZData.timeZoneOffsetFromTokens = dataReceived.begin()->first.substr(13);
 			}
 		
 			catch(const out_of_range &oor){
 				// Do nothing as there is no data.
 			}
 		
-			NewTZData.TimeZoneOffsetFromData = DataReceived.begin()->second;
-			TimeZoneOffsetFromFound = true;
+			newTZData.timeZoneOffsetFromData = dataReceived.begin()->second;
+			timeZoneOffsetFromFound = true;
 		
 		}
 			
 		// Process the data from TZOFFSETTO.
 			
-		DataReceived = ProcessTextVectors(&TimezoneDaylightName[SeekCount], 
-				&TimezoneDaylightData[SeekCount], false, "TZOFFSETTO");
+		dataReceived = ProcessTextVectors(&timezoneDaylightName[seekCount], 
+				&timezoneDaylightData[seekCount], false, "TZOFFSETTO");
 	
-		if (DataReceived.begin() != DataReceived.end()){
+		if (dataReceived.begin() != dataReceived.end()){
 	
 			try {
-				NewTZData.TimeZoneOffsetToTokens = DataReceived.begin()->first.substr(11);
+				newTZData.timeZoneOffsetToTokens = dataReceived.begin()->first.substr(11);
 			}
 		
 			catch(const out_of_range &oor){
 				// Do nothing as there is no data.
 			}
 		
-			NewTZData.TimeZoneOffsetToData = DataReceived.begin()->second;
-			TimeZoneOffsetToFound = true;
+			newTZData.timeZoneOffsetToData = dataReceived.begin()->second;
+			timeZoneOffsetToFound = true;
 		
 		}
 		
 		// Process the data from RRULE.
 
-		DataReceived = ProcessTextVectors(&TimezoneDaylightName[SeekCount], 
-			&TimezoneDaylightData[SeekCount], false, "RRULE");
+		dataReceived = ProcessTextVectors(&timezoneDaylightName[seekCount], 
+			&timezoneDaylightData[seekCount], false, "RRULE");
 	
-		if (DataReceived.begin() != DataReceived.end()){
+		if (dataReceived.begin() != dataReceived.end()){
 	
 			try {
-				NewTZData.RecurranceRuleDataTokens = DataReceived.begin()->first.substr(6);
+				newTZData.recurranceRuleDataTokens = dataReceived.begin()->first.substr(6);
 			}
 		
 			catch(const out_of_range &oor){
 				// Do nothing as there is no data.
 			}		
 			
-			NewTZData.RecurranceRuleData = DataReceived.begin()->second;
+			newTZData.recurranceRuleData = dataReceived.begin()->second;
 		
 		}
 			
 		// Process the data from COMMENT.
 	
-		DataReceived = ProcessTextVectors(&TimezoneDaylightName[SeekCount], 
-			&TimezoneDaylightData[SeekCount], true, "COMMENT");
+		dataReceived = ProcessTextVectors(&timezoneDaylightName[seekCount], 
+			&timezoneDaylightData[seekCount], true, "COMMENT");
 
-		ObjectSeekCount = 0;
+		objectSeekCount = 0;
 	
-		for(multimap<string,string>::iterator propiter = DataReceived.begin(); 
-			propiter != DataReceived.end(); 
+		for(multimap<string,string>::iterator propiter = dataReceived.begin(); 
+			propiter != dataReceived.end(); 
 			++propiter){
 		
-			NewTZData.CommentListTokens.push_back("");
-			NewTZData.CommentListAltRep.push_back("");
-			NewTZData.CommentListLanguage.push_back("");
-			NewTZData.CommentList.push_back("");
+			newTZData.commentListTokens.push_back("");
+			newTZData.commentListAltRep.push_back("");
+			newTZData.commentListLanguage.push_back("");
+			newTZData.commentList.push_back("");
 			
 			bool TokenData = false;
-			string PropertyTokens;
+			string propertyTokens;
 		
-			PropertyNameData = (string*)&propiter->first;
+			propertyNameData = (string*)&propiter->first;
 		
-			PropertyData = SplitValues(*PropertyNameData);
+			propertyData = SplitValues(*propertyNameData);
 			
-			for(map<string,string>::iterator propdataiter = PropertyData.begin();
-				propdataiter != PropertyData.end(); propdataiter++){
+			for(map<string,string>::iterator propdataiter = propertyData.begin();
+				propdataiter != propertyData.end(); propdataiter++){
 			
 				if (propdataiter->first == "ALTREP"){
 				
-					NewTZData.CommentListAltRep[ObjectSeekCount] = propdataiter->second;
+					newTZData.commentListAltRep[objectSeekCount] = propdataiter->second;
 				
 				} else if (propdataiter->first == "LANGUAGE"){
 				
-					NewTZData.CommentListLanguage[ObjectSeekCount] = propdataiter->second;
+					newTZData.commentListLanguage[objectSeekCount] = propdataiter->second;
 				
 				} else {
 				
 					if (TokenData == false){
 						TokenData = true;
 					} else {
-						PropertyTokens += ";";
+						propertyTokens += ";";
 					}
 				
-					PropertyTokens += propdataiter->first;
-					PropertyTokens += "=";
-					PropertyTokens += propdataiter->second;
+					propertyTokens += propdataiter->first;
+					propertyTokens += "=";
+					propertyTokens += propdataiter->second;
 				
 				}
 				
 			}
 		
-			if (PropertyTokens.size() > 0){
-				NewTZData.CommentListTokens[ObjectSeekCount] = PropertyTokens;
+			if (propertyTokens.size() > 0){
+				newTZData.commentListTokens[objectSeekCount] = propertyTokens;
 			}
 			
-			NewTZData.CommentList[ObjectSeekCount] = propiter->second;
+			newTZData.commentList[objectSeekCount] = propiter->second;
 			
-			ObjectSeekCount++;
+			objectSeekCount++;
 		
 		}
 		
 		// Process the data from RDATE.
 			
-		DataReceived = ProcessTextVectors(&TimezoneDaylightName[SeekCount], 
-			&TimezoneDaylightData[SeekCount], true, "RDATE");
+		dataReceived = ProcessTextVectors(&timezoneDaylightName[seekCount], 
+			&timezoneDaylightData[seekCount], true, "RDATE");
 
-		ObjectSeekCount = 0;
+		objectSeekCount = 0;
 	
-		for(multimap<string,string>::iterator propiter = DataReceived.begin(); 
-			propiter != DataReceived.end(); 
+		for(multimap<string,string>::iterator propiter = dataReceived.begin(); 
+			propiter != dataReceived.end(); 
 			++propiter){
 		
-			NewTZData.RecurranceDateDataTokens.push_back("");
-			NewTZData.RecurranceDateDataValue.push_back("");
-			NewTZData.RecurranceDateDataTimeZoneParam.push_back("");
-			NewTZData.RecurranceDateData.push_back("");
+			newTZData.recurranceDateDataTokens.push_back("");
+			newTZData.recurranceDateDataValue.push_back("");
+			newTZData.recurranceDateDataTimeZoneParam.push_back("");
+			newTZData.recurranceDateData.push_back("");
 			
 			bool TokenData = false;
-			string PropertyTokens;
+			string propertyTokens;
 		
-			PropertyNameData = (string*)&propiter->first;
+			propertyNameData = (string*)&propiter->first;
 		
-			PropertyData = SplitValues(*PropertyNameData);
+			propertyData = SplitValues(*propertyNameData);
 			
-			for(map<string,string>::iterator dataiter = PropertyData.begin();
-				dataiter != PropertyData.end(); dataiter++){
+			for(map<string,string>::iterator dataiter = propertyData.begin();
+				dataiter != propertyData.end(); dataiter++){
 			
 				if (dataiter->first == "VALUE"){
 			
-					NewTZData.RecurranceDateDataValue[ObjectSeekCount] = dataiter->second;
+					newTZData.recurranceDateDataValue[objectSeekCount] = dataiter->second;
 				
 				} else if (dataiter->first == "TZID"){
 				
-					NewTZData.RecurranceDateDataTimeZoneParam[ObjectSeekCount] = dataiter->second;
+					newTZData.recurranceDateDataTimeZoneParam[objectSeekCount] = dataiter->second;
 				
 				} else {
 				
 					if (TokenData == false){
 						TokenData = true;
 					} else {
-						PropertyTokens += ";";
+						propertyTokens += ";";
 					}
 				
-					PropertyTokens += dataiter->first;
-					PropertyTokens += "=";
-					PropertyTokens += dataiter->second;
+					propertyTokens += dataiter->first;
+					propertyTokens += "=";
+					propertyTokens += dataiter->second;
 				
 				}
 				
 			}
 		
-			if (PropertyTokens.size() > 0){
-				NewTZData.RecurranceDateDataTokens[ObjectSeekCount] = PropertyTokens;
+			if (propertyTokens.size() > 0){
+				newTZData.recurranceDateDataTokens[objectSeekCount] = propertyTokens;
 			}
 			
-			NewTZData.RecurranceDateData[ObjectSeekCount] = propiter->second;
+			newTZData.recurranceDateData[objectSeekCount] = propiter->second;
 		
-			ObjectSeekCount++;
+			objectSeekCount++;
 		
 		}
 			
 		// Process the data from TZNAME.
 			
-		DataReceived = ProcessTextVectors(&TimezoneDaylightName[SeekCount], 
-			&TimezoneDaylightData[SeekCount], true, "TZNAME");
+		dataReceived = ProcessTextVectors(&timezoneDaylightName[seekCount], 
+			&timezoneDaylightData[seekCount], true, "TZNAME");
 
-		ObjectSeekCount = 0;
+		objectSeekCount = 0;
 	
-		for(multimap<string,string>::iterator propiter = DataReceived.begin(); 
-			propiter != DataReceived.end(); 
+		for(multimap<string,string>::iterator propiter = dataReceived.begin(); 
+			propiter != dataReceived.end(); 
 			++propiter){
 		
-			NewTZData.TimeZoneNameTokens.push_back("");
-			NewTZData.TimeZoneNameLanguage.push_back("");
-			NewTZData.TimeZoneNameData.push_back("");
+			newTZData.timeZoneNameTokens.push_back("");
+			newTZData.timeZoneNameLanguage.push_back("");
+			newTZData.timeZoneNameData.push_back("");
 			
 			bool TokenData = false;
-			string PropertyTokens;
+			string propertyTokens;
 		
-			PropertyNameData = (string*)&propiter->first;
+			propertyNameData = (string*)&propiter->first;
 		
-			PropertyData = SplitValues(*PropertyNameData);
+			propertyData = SplitValues(*propertyNameData);
 			
-			for(map<string,string>::iterator dataiter = PropertyData.begin();
-				dataiter != PropertyData.end(); dataiter++){
+			for(map<string,string>::iterator dataiter = propertyData.begin();
+				dataiter != propertyData.end(); dataiter++){
 			
 				if (dataiter->first == "LANGUAGE"){
 				
-					NewTZData.TimeZoneNameLanguage[ObjectSeekCount] = dataiter->second;
+					newTZData.timeZoneNameLanguage[objectSeekCount] = dataiter->second;
 				
 				} else {
 				
 					if (TokenData == false){
 						TokenData = true;
 					} else {
-						PropertyTokens += ";";
+						propertyTokens += ";";
 					}
 				
-					PropertyTokens += dataiter->first;
-					PropertyTokens += "=";
-					PropertyTokens += dataiter->second;
+					propertyTokens += dataiter->first;
+					propertyTokens += "=";
+					propertyTokens += dataiter->second;
 				
 				}
 				
 			}
 		
-			if (PropertyTokens.size() > 0){
-				NewTZData.TimeZoneNameTokens[ObjectSeekCount] = PropertyTokens;
+			if (propertyTokens.size() > 0){
+				newTZData.timeZoneNameTokens[objectSeekCount] = propertyTokens;
 			}
 			
-			NewTZData.TimeZoneNameData[ObjectSeekCount] = propiter->second;
+			newTZData.timeZoneNameData[objectSeekCount] = propiter->second;
 		
-			ObjectSeekCount++;
+			objectSeekCount++;
 		
 		}
 			
-		ObjectSeekCount = 0;
+		objectSeekCount = 0;
 	
 		// Process data from X-*
 	
-		for(vector<string>::iterator propiter = TimezoneDaylightName[SeekCount].begin(); 
-			propiter != TimezoneDaylightName[SeekCount].end(); ++propiter){
+		for(vector<string>::iterator propiter = timezoneDaylightName[seekCount].begin(); 
+			propiter != timezoneDaylightName[seekCount].end(); ++propiter){
 		
 			if (propiter->substr(0,2) == "X-" &&
 				propiter->size() > 2){
 					
-				NewTZData.XTokensData.push_back(TimezoneDaylightData[SeekCount][ObjectSeekCount]);
-				NewTZData.XTokensDataTokens.push_back(TimezoneDaylightName[SeekCount][ObjectSeekCount]);
+				newTZData.xTokensData.push_back(timezoneDaylightData[seekCount][objectSeekCount]);
+				newTZData.xTokensDataTokens.push_back(timezoneDaylightName[seekCount][objectSeekCount]);
 				
 			}
 		
-			ObjectSeekCount++;
+			objectSeekCount++;
 		
 		}
 		
 		// Check if the required values were given and
-		// insert NewTZData into the vector list of
+		// insert newTZData into the vector list of
 		// daylight timezones.
 			
-		if (DateTimeStartFound == true &&
-			TimeZoneOffsetToFound == true &&
-			TimeZoneOffsetFromFound == true){
+		if (dateTimeStartFound == true &&
+			timeZoneOffsetToFound == true &&
+			timeZoneOffsetFromFound == true){
 					
-			TimezoneDaylightCollection.push_back(NewTZData);
+			timezoneDaylightCollection.push_back(newTZData);
 					
 		}
 			
-		SeekCount++;
+		seekCount++;
 			
 	}
 	
@@ -796,36 +794,36 @@ void CalendarTimezoneObject::ProcessData(){
 
 void CalendarTimezoneObject::ProcessStandardDaylight(){
 
-	int SeekCount = 0;
+	int seekCount = 0;
 	
 	bool TZMode = false; // False = STANDARD, True = DAYLIGHT.
-	bool ValidBegin = false;
-	vector<string> TimezoneObjectName;
-	vector<string> TimezoneObjectData;
+	bool validBegin = false;
+	vector<string> timezoneObjectName;
+	vector<string> timezoneObjectData;
 	
-	for (vector<string>::iterator iter = ObjectName.begin();
-		iter != ObjectName.end(); iter++){	
+	for (vector<string>::iterator iter = objectName.begin();
+		iter != objectName.end(); iter++){	
 	
 		// Check if the current name is BEGIN and
 		// data is either STANDARD or DAYLIGHT.
 			
-		if (ObjectName[SeekCount] == "BEGIN" &&
-			(ObjectData[SeekCount] == "STANDARD" || 
-			ObjectData[SeekCount] == "DAYLIGHT")){
+		if (objectName[seekCount] == "BEGIN" &&
+			(objectData[seekCount] == "STANDARD" || 
+			objectData[seekCount] == "DAYLIGHT")){
 			
-			if (ValidBegin == false){
-				ValidBegin = true;
+			if (validBegin == false){
+				validBegin = true;
 			} else {
 				
 			}
 			
-			if (ObjectData[SeekCount] == "STANDARD"){
+			if (objectData[seekCount] == "STANDARD"){
 				TZMode = false;
-			} else if (ObjectData[SeekCount] == "DAYLIGHT") {
+			} else if (objectData[seekCount] == "DAYLIGHT") {
 				TZMode = true;
 			}
 			
-			SeekCount++;
+			seekCount++;
 			continue;
 			
 		}
@@ -833,34 +831,34 @@ void CalendarTimezoneObject::ProcessStandardDaylight(){
 		// Check if current name is END and
 		// data is either STANDARD or DAYLIGHT.
 		
-		if (ObjectName[SeekCount] == "END" &&
-			(ObjectData[SeekCount] == "STANDARD" || 
-			ObjectData[SeekCount] == "DAYLIGHT") && 
-			ValidBegin == true){
+		if (objectName[seekCount] == "END" &&
+			(objectData[seekCount] == "STANDARD" || 
+			objectData[seekCount] == "DAYLIGHT") && 
+			validBegin == true){
 				
-			if (TZMode == false && TimezoneObjectName.size() > 0){
-				TimezoneStandardName.push_back(TimezoneObjectName);
-				TimezoneStandardData.push_back(TimezoneObjectData);
+			if (TZMode == false && timezoneObjectName.size() > 0){
+				timezoneStandardName.push_back(timezoneObjectName);
+				timezoneStandardData.push_back(timezoneObjectData);
 			} else {
-				TimezoneDaylightName.push_back(TimezoneObjectName);
-				TimezoneDaylightData.push_back(TimezoneObjectData);
+				timezoneDaylightName.push_back(timezoneObjectName);
+				timezoneDaylightData.push_back(timezoneObjectData);
 			}
 			
-			TimezoneObjectName.clear();
-			TimezoneObjectData.clear();
+			timezoneObjectName.clear();
+			timezoneObjectData.clear();
 			
-			ValidBegin = false;
+			validBegin = false;
 				
 		}
 		
-		if (ValidBegin == true){
+		if (validBegin == true){
 			
-			TimezoneObjectName.push_back(ObjectName[SeekCount]);
-			TimezoneObjectData.push_back(ObjectData[SeekCount]);
+			timezoneObjectName.push_back(objectName[seekCount]);
+			timezoneObjectData.push_back(objectData[seekCount]);
 			
 		}
 		
-		SeekCount++;
+		seekCount++;
 			
 	}