X-Git-Url: http://Server1/repobrowser/?p=xestiacalendar%2F.git;a=blobdiff_plain;f=source%2Fobjects%2Fcalendartask%2FCalendarTask.cpp;h=84a7a50e287c6c8266b199e8d0830c46fb1952a5;hp=481bcd052ec065a9e3ec27d257fc66c984cdee11;hb=3e3ae5dc244fc2f0a905d0e3ba04d974809f02b7;hpb=70ed651ee4e950f44eb581e754869e40b9e5c744

diff --git a/source/objects/calendartask/CalendarTask.cpp b/source/objects/calendartask/CalendarTask.cpp
index 481bcd0..84a7a50 100644
--- a/source/objects/calendartask/CalendarTask.cpp
+++ b/source/objects/calendartask/CalendarTask.cpp
@@ -22,127 +22,127 @@ using namespace std;
 
 CalendarObjectValidResult CalendarTaskObject::ValidObject(){
 
-	bool ValidBegin = false;
-	bool ValidEnd = false;
-	bool ValidDateTimeStamp = false;
-	bool ValidUniqueID = false;
-	int SeekCount = 0;
-	string PropertyName;
+	bool validBegin = false;
+	bool validEnd = false;
+	bool validDateTimeStamp = false;
+	bool validUniqueID = false;
+	int seekCount = 0;
+	string propertyName;
 	
 	// Look for BEGIN:VTODO.
 	
-	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] == "VTODO"){
+		if (objectName[seekCount] == "BEGIN" &&
+			objectData[seekCount] == "VTODO"){
 			
-			if (ValidBegin == false){
-				ValidBegin = true;
+			if (validBegin == false){
+				validBegin = true;
 			} else {
 				return CALENDAROBJECTVALID_INVALIDFORMAT;
 			}
 				
 		}
 		
-		if (ObjectName[SeekCount] == "END" &&
-			ObjectData[SeekCount] == "VTODO" &&
-			ValidBegin == false){
+		if (objectName[seekCount] == "END" &&
+			objectData[seekCount] == "VTODO" &&
+			validBegin == false){
 		
 			return CALENDAROBJECTVALID_INVALIDFORMAT;
 				
 		}
 		
-		SeekCount++;
+		seekCount++;
 			
 	}
 	
-	SeekCount = 0;
+	seekCount = 0;
 	
 	// Look for DTSTAMP.
 	
-	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,7);
+			propertyName = objectName[seekCount].substr(0,7);
 		}
 			
 		catch(const out_of_range& oor){
 			continue;
 		}
 		
-		if (PropertyName == "DTSTAMP"){
+		if (propertyName == "DTSTAMP"){
 			
-			if (ValidDateTimeStamp == false){
-				ValidDateTimeStamp = true;
+			if (validDateTimeStamp == false){
+				validDateTimeStamp = true;
 			} else {
 				return CALENDAROBJECTVALID_INVALIDFORMAT;
 			}
 				
 		}
 			
-		SeekCount++;
+		seekCount++;
 
 	}
 	
-	SeekCount = 0;
+	seekCount = 0;
 	
 	// Look for UID.
 	
-	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,3);
+			propertyName = objectName[seekCount].substr(0,3);
 		}
 		
 		catch(const out_of_range& oor){
 			continue;
 		}
 			
-		if (PropertyName == "UID"){
+		if (propertyName == "UID"){
 			
-			if (ValidUniqueID == false){
-				ValidUniqueID = true;
+			if (validUniqueID == false){
+				validUniqueID = true;
 			} else {
 				return CALENDAROBJECTVALID_INVALIDFORMAT;
 			}
 				
 		}
 			
-		SeekCount++;
-			
+		seekCount++;
+		
 	}
 	
-	SeekCount = 0;
+	seekCount = 0;
 		
 	// Look for END:VTODO.
 	
-	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] == "VTODO"){
+		if (objectName[SeekCount] == "END" &&
+			objectData[SeekCount] == "VTODO"){
 			
-			if (ValidEnd == false){
-				ValidEnd = true;
+			if (validEnd == false){
+				validEnd = true;
 			} else {
 				return CALENDAROBJECTVALID_INVALIDFORMAT;
 			}
 				
 		}
 			
-		SeekCount++;
+		seekCount++;
 			
 	}
 	
 	// Check if the VTODO is valid.
 	
-	if (ValidBegin == true && 
-		ValidEnd == true && 
-		ValidDateTimeStamp == true &&
-		ValidUniqueID == true){
+	if (validBegin == true && 
+		validEnd == true && 
+		validDateTimeStamp == true &&
+		validUniqueID == true){
 			
 		return CALENDAROBJECTVALID_OK;
 			
@@ -158,377 +158,377 @@ void CalendarTaskObject::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;
 	
 	// Get the Date Time Stamp (DTSTAMP).
 	
-	DataReceived = ProcessTextVectors(&ObjectName, &ObjectData, false, "DTSTAMP");
+	dataReceived = ProcessTextVectors(&objectName, &objectData, false, "DTSTAMP");
 	
 	// Process the data from DTSTAMP.
 	
-	if (DataReceived.begin() != DataReceived.end()){
+	if (dataReceived.begin() != dataReceived.end()){
 	
 		try {
-			DateTimeStampTokens = DataReceived.begin()->first.substr(8);
+			dateTimeStampTokens = dataReceived.begin()->first.substr(8);
 		}
 		
 		catch(const out_of_range &oor){
 			// Do nothing as there is no data.
 		}		
 		
-		DateTimeStampData = DataReceived.begin()->second;
+		dateTimeStampData = dataReceived.begin()->second;
 		
 	}
 	
 	// Get the Unique ID (UID).
 	
-	DataReceived = ProcessTextVectors(&ObjectName, &ObjectData, false, "UID");
+	dataReceived = ProcessTextVectors(&objectName, &objectData, false, "UID");
 	
 	// Process the data from UID.
 	
-	if (DataReceived.begin() != DataReceived.end()){
+	if (dataReceived.begin() != dataReceived.end()){
 	
 		try {
-			UniqueIDTokens = DataReceived.begin()->first.substr(4);
+			uniqueIDTokens = dataReceived.begin()->first.substr(4);
 		}
 		
 		catch(const out_of_range &oor){
 			// Do nothing as there is no data.
 		}		
 		
-		UniqueID = DataReceived.begin()->second;
+		uniqueID = dataReceived.begin()->second;
 		
 	}
 	
 	// Process the data from CLASS.
 	
-	DataReceived = ProcessTextVectors(&ObjectName, &ObjectData, false, "CLASS");
+	dataReceived = ProcessTextVectors(&objectName, &objectData, false, "CLASS");
 	
-	if (DataReceived.begin() != DataReceived.end()){
+	if (dataReceived.begin() != dataReceived.end()){
 	
 		try {
-			ClassDataTokens = DataReceived.begin()->first.substr(6);
+			classDataTokens = dataReceived.begin()->first.substr(6);
 		}
 		
 		catch(const out_of_range &oor){
 			// Do nothing as there is no data.
 		}		
 		
-		ClassData = DataReceived.begin()->second;
+		classData = dataReceived.begin()->second;
 		
 	}
 	
 	// Process the data from COMPLETED.
 	
-	DataReceived = ProcessTextVectors(&ObjectName, &ObjectData, false, "COMPLETED");
+	dataReceived = processTextVectors(&ObjectName, &ObjectData, false, "COMPLETED");
 	
-	if (DataReceived.begin() != DataReceived.end()){
+	if (dataReceived.begin() != dataReceived.end()){
 	
 		try {
-			CompletedDataTokens = DataReceived.begin()->first.substr(10);
+			completedDataTokens = dataReceived.begin()->first.substr(10);
 		}
 		
 		catch(const out_of_range &oor){
 			// Do nothing as there is no data.
 		}		
 		
-		CompletedData = DataReceived.begin()->second;
+		completedData = dataReceived.begin()->second;
 		
 	}
 	
 	// Process the data from CREATED.
 	
-	DataReceived = ProcessTextVectors(&ObjectName, &ObjectData, false, "CREATED");
+	dataReceived = ProcessTextVectors(&objectName, &objectData, false, "CREATED");
 	
 	if (DataReceived.begin() != DataReceived.end()){
 	
 		try {
-			DateTimeCreatedTokens = DataReceived.begin()->first.substr(8);
+			dateTimeCreatedTokens = dataReceived.begin()->first.substr(8);
 		}
 		
 		catch(const out_of_range &oor){
 			// Do nothing as there is no data.
 		}		
 		
-		DateTimeCreatedData = DataReceived.begin()->second;
+		dateTimeCreatedData = dataReceived.begin()->second;
 		
 	}
 	
 	// Process the data from DESCRIPTION.
 	
-	DataReceived = ProcessTextVectors(&ObjectName, &ObjectData, false, "DESCRIPTION");
+	dataReceived = ProcessTextVectors(&objectName, &objectData, false, "DESCRIPTION");
 	
-	if (DataReceived.begin() != DataReceived.end()){
+	if (dataReceived.begin() != dataReceived.end()){
 	
-		bool TokenData = false;
-		string PropertyTokens;
+		bool tokenData = false;
+		string propertyTokens;
 		
-		PropertyNameData = (string*)&DataReceived.begin()->first;
+		propertyNameData = (string*)&dataReceived.begin()->first;
 		
-		PropertyData = SplitValues(*PropertyNameData);
+		propertyData = SplitValues(*propertyNameData);
 		
-		for(map<string,string>::iterator iter = PropertyData.begin();
-			iter != PropertyData.end(); iter++){
+		for(map<string,string>::iterator iter = propertyData.begin();
+			iter != propertyData.end(); iter++){
 			
 			if (iter->first == "ALTREP"){
 				
-				DescriptionListAltRep.clear();
-				DescriptionListAltRep.push_back(iter->second);
+				descriptionListAltRep.clear();
+				descriptionListAltRep.push_back(iter->second);
 				
 			} else if (iter->first == "LANGUAGE"){
 				
-				DescriptionListLanguage.clear();
-				DescriptionListLanguage.push_back(iter->second);
+				descriptionListLanguage.clear();
+				descriptionListLanguage.push_back(iter->second);
 				
 			} else {
 				
-				if (TokenData == false){
-					TokenData = true;
+				if (tokenData == false){
+					tokenData = true;
 				} else {
-					PropertyTokens += ";";
+					propertyTokens += ";";
 				}
 				
-				PropertyTokens += iter->first;
-				PropertyTokens += "=";
-				PropertyTokens += iter->second;
+				propertyTokens += iter->first;
+				propertyTokens += "=";
+				propertyTokens += iter->second;
 				
 			}
 				
 		}
 		
-		if (PropertyTokens.size() > 0){
-			DescriptionListTokens.clear();
-			DescriptionListTokens.push_back(PropertyTokens);
+		if (propertyTokens.size() > 0){
+			descriptionListTokens.clear();
+			descriptionListTokens.push_back(PropertyTokens);
 		}
 		
-		DescriptionList.clear();
-		DescriptionList.push_back(DataReceived.begin()->second);
+		descriptionList.clear();
+		descriptionList.push_back(dataReceived.begin()->second);
 		
 	}
 	
 	// Get the Date Time Start value.
 	
-	DataReceived = ProcessTextVectors(&ObjectName, &ObjectData, false, "DTSTART");
+	dataReceived = ProcessTextVectors(&objectName, &objectData, false, "DTSTART");
 	
 	// Process the data from DTSTART.
 	
-	if (DataReceived.begin() != DataReceived.end()){
+	if (dataReceived.begin() != dataReceived.end()){
 	
-		bool TokenData = false;
-		string PropertyTokens;
+		bool tokenData = false;
+		string propertyTokens;
 		
-		PropertyNameData = (string*)&DataReceived.begin()->first;
+		propertyNameData = (string*)&dataReceived.begin()->first;
 		
-		PropertyData = SplitValues(*PropertyNameData);
+		propertyData = SplitValues(*propertyNameData);
 		
-		for(map<string,string>::iterator iter = PropertyData.begin();
-			iter != PropertyData.end(); iter++){
+		for(map<string,string>::iterator iter = propertyData.begin();
+			iter != propertyData.end(); iter++){
 			
 			if (iter->first == "VALUE"){
 				
-				DateTimeStartDataValue = iter->second;
+				dateTimeStartDataValue = iter->second;
 				
 			} else if (iter->first == "TZID"){
 				
-				DateTimeStartDataTimeZoneID = iter->second;
+				dateTimeStartDataTimeZoneID = iter->second;
 				
 			} else {
 				
-				if (TokenData == false){
-					TokenData = true;
+				if (tokenData == false){
+					tokenData = true;
 				} else {
-					PropertyTokens += ";";
+					propertyTokens += ";";
 				}
 				
-				PropertyTokens += iter->first;
-				PropertyTokens += "=";
-				PropertyTokens += iter->second;
+				propertyTokens += iter->first;
+				propertyTokens += "=";
+				propertyTokens += iter->second;
 				
 			}
 				
 		}
 		
-		if (PropertyTokens.size() > 0){
-			DateTimeStartDataTokens = PropertyTokens;
+		if (propertyTokens.size() > 0){
+			dateTimeStartDataTokens = propertyTokens;
 		}
 		
-		DateTimeStartData = DataReceived.begin()->second;
+		dateTimeStartData = dataReceived.begin()->second;
 		
 	}
 	
 	// Process the data from GEO.
 	
-	DataReceived = ProcessTextVectors(&ObjectName, &ObjectData, false, "GEO");
+	dataReceived = ProcessTextVectors(&objectName, &objectData, false, "GEO");
 	
-	if (DataReceived.begin() != DataReceived.end()){
+	if (dataReceived.begin() != dataReceived.end()){
 	
 		try {
-			GeographicTokens = DataReceived.begin()->first.substr(4);
+			geographicTokens = dataReceived.begin()->first.substr(4);
 		}
 		
 		catch(const out_of_range &oor){
 			// Do nothing as there is no data.
 		}		
 		
-		GeographicData = DataReceived.begin()->second;
+		geographicData = 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 LOCATION.
 	
-	DataReceived = ProcessTextVectors(&ObjectName, &ObjectData, false, "LOCATION");
+	dataReceived = ProcessTextVectors(&objectName, &objectData, false, "LOCATION");
 	
-	if (DataReceived.begin() != DataReceived.end()){
+	if (dataReceived.begin() != dataReceived.end()){
 	
-		bool TokenData = false;
-		string PropertyTokens;
+		bool tokenData = false;
+		string propertyTokens;
 		
-		PropertyNameData = (string*)&DataReceived.begin()->first;
+		propertyNameData = (string*)&dataReceived.begin()->first;
 		
-		PropertyData = SplitValues(*PropertyNameData);
+		propertyData = SplitValues(*propertyNameData);
 		
-		for(map<string,string>::iterator iter = PropertyData.begin();
-			iter != PropertyData.end(); iter++){
+		for(map<string,string>::iterator iter = propertyData.begin();
+			iter != propertyData.end(); iter++){
 			
 			if (iter->first == "ALTREP"){
 				
-				LocationDataAltRep = iter->second;
+				locationDataAltRep = iter->second;
 				
 			} else if (iter->first == "LANGUAGE"){
 				
-				LocationDataLanguage = iter->second;
+				locationDataLanguage = iter->second;
 				
 			} else {
 				
-				if (TokenData == false){
-					TokenData = true;
+				if (tokenData == false){
+					tokenData = true;
 				} else {
-					PropertyTokens += ";";
+					propertyTokens += ";";
 				}
 				
-				PropertyTokens += iter->first;
-				PropertyTokens += "=";
-				PropertyTokens += iter->second;
+				propertyTokens += iter->first;
+				propertyTokens += "=";
+				propertyTokens += iter->second;
 				
 			}
 				
 		}
 		
-		if (PropertyTokens.size() > 0){
+		if (propertyTokens.size() > 0){
 			
-			LocationDataTokens = PropertyTokens;
+			locationDataTokens = propertyTokens;
 			
 		}
 		
-		LocationData = DataReceived.begin()->second;
+		locationData = dataReceived.begin()->second;
 		
 	}
 	
 	// Process the data from ORGANIZER.
 	
-	DataReceived = ProcessTextVectors(&ObjectName, &ObjectData, false, "ORGANIZER");
+	dataReceived = ProcessTextVectors(&objectName, &objectData, false, "ORGANIZER");
 	
-	if (DataReceived.begin() != DataReceived.end()){
+	if (dataReceived.begin() != dataReceived.end()){
 	
-		bool TokenData = false;
-		string PropertyTokens;
+		bool tokenData = false;
+		string propertyTokens;
 		
-		PropertyNameData = (string*)&DataReceived.begin()->first;
+		propertyNameData = (string*)&dataReceived.begin()->first;
 		
-		PropertyData = SplitValues(*PropertyNameData);
+		propertyData = SplitValues(*propertyNameData);
 		
-		for(map<string,string>::iterator iter = PropertyData.begin();
-			iter != PropertyData.end(); iter++){
+		for(map<string,string>::iterator iter = propertyData.begin();
+			iter != propertyData.end(); iter++){
 			
 			if (iter->first == "CN"){
 				
-				OrganiserDataCommonName = iter->second;
+				organiserDataCommonName = iter->second;
 				
 			} else if (iter->first == "DIR"){
 				
-				OrganiserDataDirectoryEntry = iter->second;
+				organiserDataDirectoryEntry = iter->second;
 				
 			} else if (iter->first == "SENT-BY"){
 				
-				OrganiserDataSentByParam = iter->second;
+				organiserDataSentByParam = iter->second;
 				
 			} else if (iter->first == "LANGUAGE"){
 				
-				OrganiserDataLanguage = iter->second;
+				organiserDataLanguage = iter->second;
 				
 			} else {
 				
-				if (TokenData == false){
-					TokenData = true;
+				if (tokenData == false){
+					tokenData = true;
 				} else {
-					PropertyTokens += ";";
+					propertyTokens += ";";
 				}
 				
-				PropertyTokens += iter->first;
-				PropertyTokens += "=";
-				PropertyTokens += iter->second;
+				propertyTokens += iter->first;
+				propertyTokens += "=";
+				propertyTokens += iter->second;
 				
 			}
 				
 		}
 		
-		if (PropertyTokens.size() > 0){
+		if (propertyTokens.size() > 0){
 			
-			OrganiserDataTokens = PropertyTokens;
+			organiserDataTokens = propertyTokens;
 			
 		}
 		
-		OrganiserData = DataReceived.begin()->second;
+		organiserData = dataReceived.begin()->second;
 		
 	}
 	
 	// Process the data from PERCENT-COMPLETE.
 	
-	DataReceived = ProcessTextVectors(&ObjectName, &ObjectData, false, "PERCENT-COMPLETE");
+	dataReceived = ProcessTextVectors(&objectName, &objectData, false, "PERCENT-COMPLETE");
 	
-	if (DataReceived.begin() != DataReceived.end()){
+	if (dataReceived.begin() != dataReceived.end()){
 	
 		try {
-			PercentCompleteTokens = DataReceived.begin()->first.substr(17);
+			percentCompleteTokens = dataReceived.begin()->first.substr(17);
 		}
 		
 		catch(const out_of_range &oor){
 			// Do nothing as there is no data.
 		}
 		
-		PercentCompleteData = DataReceived.begin()->second;
+		percentCompleteData = dataReceived.begin()->second;
 		
 	}
 	
 	// Process the data from PRIORITY.
 	
-	DataReceived = ProcessTextVectors(&ObjectName, &ObjectData, false, "PRIORITY");
+	dataReceived = ProcessTextVectors(&objectName, &objectData, false, "PRIORITY");
 	
-	if (DataReceived.begin() != DataReceived.end()){
+	if (dataReceived.begin() != dataReceived.end()){
 	
 		try {
-			PriorityTokens = DataReceived.begin()->first.substr(9);
+			priorityTokens = dataReceived.begin()->first.substr(9);
 		}
 		
 		catch(const out_of_range &oor){
@@ -536,77 +536,77 @@ void CalendarTaskObject::ProcessData(){
 		}		
 		
 		try {
-			PriorityData = stoi(DataReceived.begin()->second);
+			priorityData = stoi(dataReceived.begin()->second);
 		}
 		
 		catch(const invalid_argument &oor){
-			PriorityTokens.clear();
+			priorityTokens.clear();
 		}
 		
 	}
 	
 	// Process the data from RECURRENCE-ID.
 	
-	DataReceived = ProcessTextVectors(&ObjectName, &ObjectData, false, "RECURRENCE-ID");
+	dataReceived = ProcessTextVectors(&objectName, &objectData, false, "RECURRENCE-ID");
 	
-	if (DataReceived.begin() != DataReceived.end()){
+	if (dataReceived.begin() != dataReceived.end()){
 	
-		bool TokenData = false;
-		string PropertyTokens;
+		bool tokenData = false;
+		string propertyTokens;
 		
-		PropertyNameData = (string*)&DataReceived.begin()->first;
+		propertyNameData = (string*)&dataReceived.begin()->first;
 		
-		PropertyData = SplitValues(*PropertyNameData);
+		propertyData = SplitValues(*propertyNameData);
 		
-		for(map<string,string>::iterator iter = PropertyData.begin();
-			iter != PropertyData.end(); iter++){
+		for(map<string,string>::iterator iter = propertyData.begin();
+			iter != propertyData.end(); iter++){
 			
 			if (iter->first == "TZID"){
 				
-				RecurranceIDDataTimeZoneParam = iter->second;
+				recurranceIDDataTimeZoneParam = iter->second;
 				
 			} else if (iter->first == "VALUE"){
 				
-				RecurranceIDDataValue = iter->second;
+				recurranceIDDataValue = iter->second;
 				
 			} else if (iter->first == "RANGE"){
 				
-				RecurranceIDDataRangeParam = iter->second;
+				recurranceIDDataRangeParam = iter->second;
 				
 			} else {
 				
-				if (TokenData == false){
-					TokenData = true;
+				if (tokenData == false){
+					tokenData = true;
 				} else {
-					PropertyTokens += ";";
+					propertyTokens += ";";
 				}
 				
-				PropertyTokens += iter->first;
-				PropertyTokens += "=";
-				PropertyTokens += iter->second;
+				propertyTokens += iter->first;
+				propertyTokens += "=";
+				propertyTokens += iter->second;
 				
 			}
 				
 		}
 		
-		if (PropertyTokens.size() > 0){
+		if (propertyTokens.size() > 0){
 			
-			RecurranceIDDataTokens = PropertyTokens;
+			recurranceIDDataTokens = propertyTokens;
 			
 		}
 		
-		RecurranceIDData = DataReceived.begin()->second;
+		recurranceIDData = dataReceived.begin()->second;
 		
 	}
 	
 	// Process the data from SEQUENCE.
 	
-	DataReceived = ProcessTextVectors(&ObjectName, &ObjectData, false, "SEQUENCE");
+	dataReceived = ProcessTextVectors(&objectName, &objectData, false, "SEQUENCE");
 	
-	if (DataReceived.begin() != DataReceived.end()){
+	if (dataReceived.begin() != dataReceived.end()){
 	
 		try {
-			SequenceTokens = DataReceived.begin()->first.substr(9);
+			sequenceTokens = dataReceived.begin()->first.substr(9);
 		}
 		
 		catch(const out_of_range &oor){
@@ -614,217 +614,217 @@ void CalendarTaskObject::ProcessData(){
 		}		
 		
 		try {
-			SequenceData = stoi(DataReceived.begin()->second);
+			sequenceData = stoi(dataReceived.begin()->second);
 		}
 		
 		catch(const invalid_argument &oor){
-			SequenceTokens.clear();
+			sequenceTokens.clear();
 		}
 		
 	}
 	
 	// Process the data from STATUS.
 	
-	DataReceived = ProcessTextVectors(&ObjectName, &ObjectData, false, "STATUS");
+	dataReceived = ProcessTextVectors(&objectName, &objectData, false, "STATUS");
 	
-	if (DataReceived.begin() != DataReceived.end()){
+	if (dataReceived.begin() != dataReceived.end()){
 	
-		bool TokenData = false;
-		string PropertyTokens;
+		bool tokenData = false;
+		string propertyTokens;
 		
-		PropertyNameData = (string*)&DataReceived.begin()->first;
+		propertyNameData = (string*)&dataReceived.begin()->first;
 		
-		PropertyData = SplitValues(*PropertyNameData);
+		propertyData = SplitValues(*propertyNameData);
 		
-		for(map<string,string>::iterator iter = PropertyData.begin();
-			iter != PropertyData.end(); iter++){
+		for(map<string,string>::iterator iter = propertyData.begin();
+			iter != propertyData.end(); iter++){
 			
 			if (iter->first == "LANGUAGE"){
 				
-				StatusLanguage = iter->second;
+				statusLanguage = iter->second;
 				
 			} else {
 				
-				if (TokenData == false){
-					TokenData = true;
+				if (tokenData == false){
+					tokenData = true;
 				} else {
-					PropertyTokens += ";";
+					propertyTokens += ";";
 				}
 				
-				PropertyTokens += iter->first;
-				PropertyTokens += "=";
-				PropertyTokens += iter->second;
+				propertyTokens += iter->first;
+				propertyTokens += "=";
+				propertyTokens += iter->second;
 				
 			}
 				
 		}
 		
-		if (PropertyTokens.size() > 0){
+		if (propertyTokens.size() > 0){
 			
-			StatusTokens = PropertyTokens;
+			statusTokens = propertyTokens;
 			
 		}
 		
-		StatusData = DataReceived.begin()->second;
+		statusData = dataReceived.begin()->second;
 		
 	}
 	
 	// Process the data from SUMMARY.
 	
-	DataReceived = ProcessTextVectors(&ObjectName, &ObjectData, false, "SUMMARY");
+	dataReceived = ProcessTextVectors(&objectName, &objectData, false, "SUMMARY");
 	
-	if (DataReceived.begin() != DataReceived.end()){
+	if (dataReceived.begin() != dataReceived.end()){
 	
-		bool TokenData = false;
-		string PropertyTokens;
+		bool tokenData = false;
+		string propertyTokens;
 		
-		PropertyNameData = (string*)&DataReceived.begin()->first;
+		propertyNameData = (string*)&dataReceived.begin()->first;
 		
-		PropertyData = SplitValues(*PropertyNameData);
+		propertyData = SplitValues(*propertyNameData);
 		
-		for(map<string,string>::iterator iter = PropertyData.begin();
-			iter != PropertyData.end(); iter++){
+		for(map<string,string>::iterator iter = propertyData.begin();
+			iter != propertyData.end(); iter++){
 			
 			if (iter->first == "ALTREP"){
 				
-				SummaryDataAltRep = iter->second;
+				summaryDataAltRep = iter->second;
 				
 			} else if (iter->first == "LANGUAGE"){
 				
-				SummaryDataLanguage = iter->second;
+				summaryDataLanguage = iter->second;
 				
 			} else {
 				
-				if (TokenData == false){
-					TokenData = true;
+				if (tokenData == false){
+					tokenData = true;
 				} else {
-					PropertyTokens += ";";
+					propertyTokens += ";";
 				}
 				
-				PropertyTokens += iter->first;
-				PropertyTokens += "=";
-				PropertyTokens += iter->second;
+				propertyTokens += iter->first;
+				propertyTokens += "=";
+				propertyTokens += iter->second;
 				
 			}
 				
 		}
 		
-		if (PropertyTokens.size() > 0){
+		if (propertyTokens.size() > 0){
 			
-			SummaryDataTokens = PropertyTokens;
+			summaryDataTokens = propertyTokens;
 			
 		}
 		
-		SummaryData = DataReceived.begin()->second;
+		summaryData = dataReceived.begin()->second;
 		
 	}
 	
 	// Process the data from URL.
 	
-	DataReceived = ProcessTextVectors(&ObjectName, &ObjectData, false, "URL");
+	dataReceived = ProcessTextVectors(&objectName, &objectData, false, "URL");
 	
-	if (DataReceived.begin() != DataReceived.end()){
+	if (dataReceived.begin() != dataReceived.end()){
 	
 		try {
-			URLDataTokens = DataReceived.begin()->first.substr(4);
+			urlDataTokens = dataReceived.begin()->first.substr(4);
 		}
 		
 		catch(const out_of_range &oor){
 			// Do nothing as there is no data.
 		}		
 		
-		URLData = DataReceived.begin()->second;
+		urlData = dataReceived.begin()->second;
 		
 	}
 	
 	// Process the data from RRULE.
 	
-	DataReceived = ProcessTextVectors(&ObjectName, &ObjectData, false, "RRULE");
+	dataReceived = ProcessTextVectors(&objectName, &objectData, false, "RRULE");
 	
-	if (DataReceived.begin() != DataReceived.end()){
+	if (dataReceived.begin() != dataReceived.end()){
 	
 		try {
-			RecurranceRuleDataTokens = DataReceived.begin()->first.substr(6);
+			recurranceRuleDataTokens = dataReceived.begin()->first.substr(6);
 		}
 		
 		catch(const out_of_range &oor){
 			// Do nothing as there is no data.
 		}		
 		
-		RecurranceRuleData = DataReceived.begin()->second;
+		recurranceRuleData = dataReceived.begin()->second;
 		
 	}
 	
-	bool DueProcessed = false;
+	bool dueProcessed = false;
 	
 	// Process the data from DUE.
 	
-	DataReceived = ProcessTextVectors(&ObjectName, &ObjectData, false, "DUE");
+	dataReceived = ProcessTextVectors(&objectName, &objectData, false, "DUE");
 	
-	if (DataReceived.begin() != DataReceived.end()){
+	if (dataReceived.begin() != dataReceived.end()){
 	
-		bool TokenData = false;
-		string PropertyTokens;
+		bool tokenData = false;
+		string propertyTokens;
 		
-		PropertyNameData = (string*)&DataReceived.begin()->first;
+		propertyNameData = (string*)&dataReceived.begin()->first;
 		
-		PropertyData = SplitValues(*PropertyNameData);
+		propertyData = SplitValues(*propertyNameData);
 		
-		for(map<string,string>::iterator iter = PropertyData.begin();
-			iter != PropertyData.end(); iter++){
+		for(map<string,string>::iterator iter = propertyData.begin();
+			iter != propertyData.end(); iter++){
 			
 			if (iter->first == "TZID"){
 				
-				DueDataTimeZoneID = iter->second;
+				dueDataTimeZoneID = iter->second;
 				
 			} else if (iter->first == "VALUE"){
 				
-				DueDataValue = iter->second;
+				dueDataValue = iter->second;
 				
 			} else {
 				
-				if (TokenData == false){
-					TokenData = true;
+				if (tokenData == false){
+					tokenData = true;
 				} else {
-					PropertyTokens += ";";
+					propertyTokens += ";";
 				}
 				
-				PropertyTokens += iter->first;
-				PropertyTokens += "=";
-				PropertyTokens += iter->second;
+				propertyTokens += iter->first;
+				propertyTokens += "=";
+				propertyTokens += iter->second;
 				
 			}
 				
 		}
 		
-		if (PropertyTokens.size() > 0){
+		if (propertyTokens.size() > 0){
 			
-			DueDataTokens = PropertyTokens;
+			dueDataTokens = propertyTokens;
 			
 		}
 		
-		DueData = DataReceived.begin()->second;
-		DueProcessed = true;
+		dueData = dataReceived.begin()->second;
+		dueProcessed = true;
 		
 	}
 	
 	// If there is no DUE, then check for DURATION.
 	
-	if (DueProcessed == false){
+	if (dueProcessed == false){
 
-		DataReceived = ProcessTextVectors(&ObjectName, &ObjectData, false, "DURATION");
+		dataReceived = ProcessTextVectors(&objectName, &objectData, false, "DURATION");
 	
-		if (DataReceived.begin() != DataReceived.end()){
+		if (dataReceived.begin() != dataReceived.end()){
 	
 			try {
-				DurationDataTokens = DataReceived.begin()->first.substr(9);
+				durationDataTokens = dataReceived.begin()->first.substr(9);
 			}
 		
 			catch(const out_of_range &oor){
 				// Do nothing as there is no data.
 			}		
 		
-			DurationData = DataReceived.begin()->second;
+			durationData = dataReceived.begin()->second;
 		
 		}
 		
@@ -832,671 +832,671 @@ void CalendarTaskObject::ProcessData(){
 
 	// Process the data from ATTACH.
 	
-	DataReceived = ProcessTextVectors(&ObjectName, &ObjectData, true, "ATTACH");
+	dataReceived = ProcessTextVectors(&objectName, &objectData, true, "ATTACH");
 	
-	for(multimap<string,string>::iterator iter = DataReceived.begin(); 
-		iter != DataReceived.end(); 
+	for(multimap<string,string>::iterator iter = dataReceived.begin(); 
+		iter != dataReceived.end(); 
 		++iter){
 		
-		AttachListEncoding.push_back("");
-		AttachListValue.push_back("");
-		AttachListFormatType.push_back("");
-		AttachListTokens.push_back("");
-		AttachList.push_back("");
+		attachListEncoding.push_back("");
+		attachListValue.push_back("");
+		attachListFormatType.push_back("");
+		attachListTokens.push_back("");
+		attachList.push_back("");
 			
-		bool TokenData = false;
-		string PropertyTokens;
+		bool tokenData = false;
+		string propertyTokens;
 		
-		PropertyNameData = (string*)&iter->first;
+		propertyNameData = (string*)&iter->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 == "ENCODING"){
 				
-				AttachListEncoding[ObjectSeekCount] = dataiter->second;
+				attachListEncoding[objectSeekCount] = dataiter->second;
 				
 			} else if (dataiter->first == "VALUE"){
 				
-				AttachListValue[ObjectSeekCount] = dataiter->second;
+				attachListValue[objectSeekCount] = dataiter->second;
 				
 			} else if (dataiter->first == "FMTTYPE"){
 				
-				AttachListFormatType[ObjectSeekCount] = dataiter->second;
+				attachListFormatType[objectSeekCount] = dataiter->second;
 				
 			} else {
 				
-				if (TokenData == false){
-					TokenData = true;
+				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){
-			AttachListTokens[ObjectSeekCount] = PropertyTokens;
+		if (propertyTokens.size() > 0){
+			attachListTokens[objectSeekCount] = propertyTokens;
 		}
 			
-		AttachList[ObjectSeekCount] = iter->second;
+		attachList[objectSeekCount] = iter->second;
 		
-		ObjectSeekCount++;
+		objectSeekCount++;
 		
 	}
 	
 	// Process the data from ATTENDEE.
 	
-	DataReceived = ProcessTextVectors(&ObjectName, &ObjectData, true, "ATTENDEE");
+	dataReceived = ProcessTextVectors(&objectName, &objectData, true, "ATTENDEE");
 	
-	ObjectSeekCount = 0;
+	objectSeekCount = 0;
 	
-	for(multimap<string,string>::iterator iter = DataReceived.begin(); 
-		iter != DataReceived.end(); 
+	for(multimap<string,string>::iterator iter = dataReceived.begin(); 
+		iter != dataReceived.end(); 
 		++iter){
 			
-		AttendeeListMember.push_back("");
-		AttendeeListDelegatedFrom.push_back("");
-		AttendeeListDelegatedTo.push_back("");
-		AttendeeListRole.push_back("");
-		AttendeeListRSVP.push_back("");
-		AttendeeListDirectoryEntry.push_back("");
-		AttendeeListSentBy.push_back("");
-		AttendeeListCommonName.push_back("");
-		AttendeeListCalendarUserType.push_back("");
-		AttendeeListParticipationStatus.push_back("");
-		AttendeeListLanguage.push_back("");
-		AttendeeListTokens.push_back("");
-		AttendeeList.push_back("");
+		attendeeListMember.push_back("");
+		attendeeListDelegatedFrom.push_back("");
+		attendeeListDelegatedTo.push_back("");
+		attendeeListRole.push_back("");
+		attendeeListRSVP.push_back("");
+		attendeeListDirectoryEntry.push_back("");
+		attendeeListSentBy.push_back("");
+		attendeeListCommonName.push_back("");
+		attendeeListCalendarUserType.push_back("");
+		attendeeListParticipationStatus.push_back("");
+		attendeeListLanguage.push_back("");
+		attendeeListTokens.push_back("");
+		attendeeList.push_back("");
 			
-		bool TokenData = false;
-		string PropertyTokens;
+		bool tokenData = false;
+		string propertyTokens;
 		
-		PropertyNameData = (string*)&iter->first;
+		propertyNameData = (string*)&iter->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 == "CUTYPE"){
 				
-				AttendeeListCalendarUserType[ObjectSeekCount] = dataiter->second;
+				attendeeListCalendarUserType[objectSeekCount] = dataiter->second;
 				
 			} else if (dataiter->first == "MEMBER"){
 				
-				AttendeeListMember[ObjectSeekCount] = dataiter->second;
+				attendeeListMember[objectSeekCount] = dataiter->second;
 				
 			} else if (dataiter->first == "ROLE"){
 				
-				AttendeeListRole[ObjectSeekCount] = dataiter->second;
+				attendeeListRole[objectSeekCount] = dataiter->second;
 				
 			} else if (dataiter->first == "PARTSTAT"){
 				
-				AttendeeListParticipationStatus[ObjectSeekCount] = dataiter->second;
+				attendeeListParticipationStatus[objectSeekCount] = dataiter->second;
 				
 			} else if (dataiter->first == "RSVP"){
 				
-				AttendeeListRSVP[ObjectSeekCount] = dataiter->second;
+				attendeeListRSVP[objectSeekCount] = dataiter->second;
 				
 			} else if (dataiter->first == "DELEGATED-TO"){
 				
-				AttendeeListDelegatedTo[ObjectSeekCount] = dataiter->second;
+				attendeeListDelegatedTo[objectSeekCount] = dataiter->second;
 				
 			} else if (dataiter->first == "DELEGATED-FROM"){
 				
-				AttendeeListDelegatedFrom[ObjectSeekCount] = dataiter->second;
+				attendeeListDelegatedFrom[objectSeekCount] = dataiter->second;
 				
 			} else if (dataiter->first == "SENT-BY"){
 				
-				AttendeeListSentBy[ObjectSeekCount] = dataiter->second;
+				attendeeListSentBy[objectSeekCount] = dataiter->second;
 				
 			} else if (dataiter->first == "CN"){
 				
-				AttendeeListCommonName[ObjectSeekCount] = dataiter->second;
+				attendeeListCommonName[objectSeekCount] = dataiter->second;
 				
 			} else if (dataiter->first == "DIR"){
 				
-				AttendeeListDirectoryEntry[ObjectSeekCount] = dataiter->second;
+				attendeeListDirectoryEntry[objectSeekCount] = dataiter->second;
 				
 			} else if (dataiter->first == "LANGUAGE"){
 				
-				AttendeeListLanguage[ObjectSeekCount] = dataiter->second;
+				attendeeListLanguage[objectSeekCount] = dataiter->second;
 				
 			} else {
 				
-				if (TokenData == false){
-					TokenData = true;
+				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){
-			AttendeeListTokens[ObjectSeekCount] = PropertyTokens;
+		if (propertyTokens.size() > 0){
+			attendeeListTokens[objectSeekCount] = propertyTokens;
 		}
 			
-		AttendeeList[ObjectSeekCount] = iter->second;
+		attendeeList[objectSeekCount] = iter->second;
 		
-		ObjectSeekCount++;
+		objectSeekCount++;
 		
 	}
 
 	// Process the data from CATEGORIES.
 	
-	DataReceived = ProcessTextVectors(&ObjectName, &ObjectData, true, "CATEGORIES");
+	dataReceived = ProcessTextVectors(&objectName, &objectData, true, "CATEGORIES");
 	
-	ObjectSeekCount = 0;
+	objectSeekCount = 0;
 	
-	for(multimap<string,string>::iterator iter = DataReceived.begin(); 
-		iter != DataReceived.end(); 
+	for(multimap<string,string>::iterator iter = dataReceived.begin(); 
+		iter != dataReceived.end(); 
 		++iter){
 		
-		CategoriesListTokens.push_back("");
-		CategoriesListLanguage.push_back("");
-		CategoriesList.push_back("");
+		categoriesListTokens.push_back("");
+		categoriesListLanguage.push_back("");
+		categoriesList.push_back("");
 			
-		bool TokenData = false;
-		string PropertyTokens;
+		bool tokenData = false;
+		string propertyTokens;
 		
-		PropertyNameData = (string*)&iter->first;
+		propertyNameData = (string*)&iter->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"){
 				
-				CategoriesListLanguage[ObjectSeekCount] = dataiter->second;
+				categoriesListLanguage[objectSeekCount] = dataiter->second;
 				
 			} else {
 				
-				if (TokenData == false){
-					TokenData = true;
+				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){
-			CategoriesListTokens[ObjectSeekCount] = PropertyTokens;
+		if (propertyTokens.size() > 0){
+			categoriesListTokens[objectSeekCount] = propertyTokens;
 		}
 			
-		CategoriesList[ObjectSeekCount] = iter->second;
+		categoriesList[objectSeekCount] = iter->second;
 		
-		ObjectSeekCount++;
+		objectSeekCount++;
 		
 	}
 	
 	// Process the data from COMMENT.
 	
-	DataReceived = ProcessTextVectors(&ObjectName, &ObjectData, true, "COMMENT");
+	dataReceived = ProcessTextVectors(&objectName, &objectData, true, "COMMENT");
 
-	ObjectSeekCount = 0;
+	objectSeekCount = 0;
 	
-	for(multimap<string,string>::iterator iter = DataReceived.begin(); 
-		iter != DataReceived.end(); 
+	for(multimap<string,string>::iterator iter = dataReceived.begin(); 
+		iter != dataReceived.end(); 
 		++iter){
 		
-		CommentListTokens.push_back("");
-		CommentListAltRep.push_back("");
-		CommentListLanguage.push_back("");
-		CommentList.push_back("");
+		commentListTokens.push_back("");
+		commentListAltRep.push_back("");
+		commentListLanguage.push_back("");
+		commentList.push_back("");
 			
-		bool TokenData = false;
-		string PropertyTokens;
+		bool tokenData = false;
+		string propertyTokens;
 		
-		PropertyNameData = (string*)&iter->first;
+		propertyNameData = (string*)&iter->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 == "ALTREP"){
 				
-				CommentListAltRep[ObjectSeekCount] = dataiter->second;
+				commentListAltRep[objectSeekCount] = dataiter->second;
 				
 			} else if (dataiter->first == "LANGUAGE"){
 				
-				CommentListLanguage[ObjectSeekCount] = dataiter->second;
+				commentListLanguage[objectSeekCount] = dataiter->second;
 				
 			} else {
 				
-				if (TokenData == false){
-					TokenData = true;
+				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){
-			CommentListTokens[ObjectSeekCount] = PropertyTokens;
+		if (propertyTokens.size() > 0){
+			commentListTokens[objectSeekCount] = PropertyTokens;
 		}
 			
-		CommentList[ObjectSeekCount] = iter->second;
+		commentList[objectSeekCount] = iter->second;
 		
-		ObjectSeekCount++;
+		objectSeekCount++;
 		
 	}
 
 	// Process the data from CONTACT.
 	
-	DataReceived = ProcessTextVectors(&ObjectName, &ObjectData, true, "CONTACT");
+	dataReceived = ProcessTextVectors(&objectName, &objectData, true, "CONTACT");
 
-	ObjectSeekCount = 0;
+	objectSeekCount = 0;
 	
-	for(multimap<string,string>::iterator iter = DataReceived.begin(); 
-		iter != DataReceived.end(); 
+	for(multimap<string,string>::iterator iter = dataReceived.begin(); 
+		iter != dataReceived.end(); 
 		++iter){
 		
-		ContactListTokens.push_back("");
-		ContactListAltRep.push_back("");
-		ContactListLanguage.push_back("");
-		ContactList.push_back("");
+		contactListTokens.push_back("");
+		contactListAltRep.push_back("");
+		contactListLanguage.push_back("");
+		contactList.push_back("");
 			
-		bool TokenData = false;
-		string PropertyTokens;
+		bool tokenData = false;
+		string propertyTokens;
 		
-		PropertyNameData = (string*)&iter->first;
+		propertyNameData = (string*)&iter->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 == "ALTREP"){
 				
-				ContactListAltRep[ObjectSeekCount] = dataiter->second;
+				contactListAltRep[objectSeekCount] = dataiter->second;
 				
 			} else if (dataiter->first == "LANGUAGE"){
 				
-				ContactListLanguage[ObjectSeekCount] = dataiter->second;
+				contactListLanguage[objectSeekCount] = dataiter->second;
 				
 			} else {
 				
-				if (TokenData == false){
-					TokenData = true;
+				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){
-			ContactListTokens[ObjectSeekCount] = PropertyTokens;
+		if (propertyTokens.size() > 0){
+			contactListTokens[objectSeekCount] = propertyTokens;
 		}
 			
-		ContactList[ObjectSeekCount] = iter->second;
+		contactList[objectSeekCount] = iter->second;
 		
-		ObjectSeekCount++;
+		objectSeekCount++;
 		
 	}
 	
 	// Process the data from EXDATE.
 	
-	DataReceived = ProcessTextVectors(&ObjectName, &ObjectData, true, "EXDATE");
+	dataReceived = ProcessTextVectors(&objectName, &objectData, true, "EXDATE");
 
-	ObjectSeekCount = 0;
+	objectSeekCount = 0;
 	
-	for(multimap<string,string>::iterator iter = DataReceived.begin(); 
-		iter != DataReceived.end(); 
+	for(multimap<string,string>::iterator iter = dataReceived.begin(); 
+		iter != dataReceived.end(); 
 		++iter){
 		
-		ExcludeDateDataTokens.push_back("");
-		ExcludeDateDataValue.push_back("");
-		ExcludeDateDataTimeZoneParam.push_back("");
-		ExcludeDateData.push_back("");
+		excludeDateDataTokens.push_back("");
+		excludeDateDataValue.push_back("");
+		excludeDateDataTimeZoneParam.push_back("");
+		excludeDateData.push_back("");
 			
-		bool TokenData = false;
-		string PropertyTokens;
+		bool tokenData = false;
+		string propertyTokens;
 		
-		PropertyNameData = (string*)&iter->first;
+		propertyNameData = (string*)&iter->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"){
 				
-				ExcludeDateDataValue[ObjectSeekCount] = dataiter->second;
+				excludeDateDataValue[objectSeekCount] = dataiter->second;
 				
 			} else if (dataiter->first == "TZID"){
 				
-				ExcludeDateDataTimeZoneParam[ObjectSeekCount] = dataiter->second;
+				excludeDateDataTimeZoneParam[objectSeekCount] = dataiter->second;
 				
 			} else {
 				
-				if (TokenData == false){
-					TokenData = true;
+				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){
-			ExcludeDateDataTokens[ObjectSeekCount] = PropertyTokens;
+		if (propertyTokens.size() > 0){
+			excludeDateDataTokens[ObjectSeekCount] = propertyTokens;
 		}
 			
-		ExcludeDateData[ObjectSeekCount] = iter->second;
+		excludeDateData[objectSeekCount] = iter->second;
 		
-		ObjectSeekCount++;
+		objectSeekCount++;
 		
 	}
 
 	// Process the data from REQUEST-STATUS.
 	
-	DataReceived = ProcessTextVectors(&ObjectName, &ObjectData, true, "REQUEST-STATUS");
+	dataReceived = ProcessTextVectors(&objectName, &objectData, true, "REQUEST-STATUS");
 
-	ObjectSeekCount = 0;
+	objectSeekCount = 0;
 	
-	for(multimap<string,string>::iterator iter = DataReceived.begin(); 
-		iter != DataReceived.end(); 
+	for(multimap<string,string>::iterator iter = dataReceived.begin(); 
+		iter != dataReceived.end(); 
 		++iter){
 		
-		RequestStatusTokens.push_back("");
-		RequestStatusLanguage.push_back("");
-		RequestStatusData.push_back("");
+		requestStatusTokens.push_back("");
+		requestStatusLanguage.push_back("");
+		requestStatusData.push_back("");
 			
-		bool TokenData = false;
-		string PropertyTokens;
+		bool tokenData = false;
+		string propertyTokens;
 		
-		PropertyNameData = (string*)&iter->first;
+		propertyNameData = (string*)&iter->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"){
 				
-				RequestStatusLanguage[ObjectSeekCount] = dataiter->second;
+				requestStatusLanguage[objectSeekCount] = dataiter->second;
 				
 			} else {
 				
-				if (TokenData == false){
-					TokenData = true;
+				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){
-			RequestStatusTokens[ObjectSeekCount] = PropertyTokens;
+		if (propertyTokens.size() > 0){
+			requestStatusTokens[objectSeekCount] = propertyTokens;
 		}
 			
-		RequestStatusData[ObjectSeekCount] = iter->second;
+		requestStatusData[objectSeekCount] = iter->second;
 		
-		ObjectSeekCount++;
+		objectSeekCount++;
 		
 	}
 	
 	// Process the data from RELATED-TO.
 	
-	DataReceived = ProcessTextVectors(&ObjectName, &ObjectData, true, "RELATED-TO");
+	dataReceived = ProcessTextVectors(&objectName, &objectData, true, "RELATED-TO");
 
-	ObjectSeekCount = 0;
+	objectSeekCount = 0;
 	
-	for(multimap<string,string>::iterator iter = DataReceived.begin(); 
-		iter != DataReceived.end(); 
+	for(multimap<string,string>::iterator iter = dataReceived.begin(); 
+		iter != dataReceived.end(); 
 		++iter){
 		
-		RelatedToDataTokens.push_back("");
-		RelatedToDataRelationType.push_back("");
-		RelatedToData.push_back("");
+		relatedToDataTokens.push_back("");
+		relatedToDataRelationType.push_back("");
+		relatedToData.push_back("");
 			
-		bool TokenData = false;
-		string PropertyTokens;
+		bool tokenData = false;
+		string propertyTokens;
 		
-		PropertyNameData = (string*)&iter->first;
+		propertyNameData = (string*)&iter->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 == "RELTYPE"){
 				
-				RelatedToDataRelationType[ObjectSeekCount] = dataiter->second;
+				relatedToDataRelationType[objectSeekCount] = dataiter->second;
 				
 			} else {
 				
-				if (TokenData == false){
-					TokenData = true;
+				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){
-			RelatedToDataTokens[ObjectSeekCount] = PropertyTokens;
+		if (propertyTokens.size() > 0){
+			relatedToDataTokens[objectSeekCount] = propertyTokens;
 		}
 			
-		RelatedToData[ObjectSeekCount] = iter->second;
+		relatedToData[objectSeekCount] = iter->second;
 		
-		ObjectSeekCount++;
+		objectSeekCount++;
 		
 	}
 	
 	// Process the data from RESOURCES.
 	
-	DataReceived = ProcessTextVectors(&ObjectName, &ObjectData, true, "RESOURCES");
+	dataReceived = ProcessTextVectors(&objectName, &objectData, true, "RESOURCES");
 
-	ObjectSeekCount = 0;
+	objectSeekCount = 0;
 	
-	for(multimap<string,string>::iterator iter = DataReceived.begin(); 
-		iter != DataReceived.end(); 
+	for(multimap<string,string>::iterator iter = dataReceived.begin(); 
+		iter != dataReceived.end(); 
 		++iter){
 		
-		ResourcesDataTokens.push_back("");
-		ResourcesDataAltRep.push_back("");
-		ResourcesDataLanguage.push_back("");
-		ResourcesData.push_back("");
+		resourcesDataTokens.push_back("");
+		resourcesDataAltRep.push_back("");
+		resourcesDataLanguage.push_back("");
+		resourcesData.push_back("");
 			
-		bool TokenData = false;
-		string PropertyTokens;
+		bool tokenData = false;
+		string propertyTokens;
 		
-		PropertyNameData = (string*)&iter->first;
+		propertyNameData = (string*)&iter->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 == "ALTREP"){
 				
-				ResourcesDataAltRep[ObjectSeekCount] = dataiter->second;
+				resourcesDataAltRep[objectSeekCount] = dataiter->second;
 				
 			} else if (dataiter->first == "LANGUAGE"){
 				
-				ResourcesDataLanguage[ObjectSeekCount] = dataiter->second;
+				resourcesDataLanguage[objectSeekCount] = dataiter->second;
 				
 			} else {
 				
-				if (TokenData == false){
-					TokenData = true;
+				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){
-			ResourcesDataTokens[ObjectSeekCount] = PropertyTokens;
+		if (propertyTokens.size() > 0){
+			resourcesDataTokens[objectSeekCount] = PropertyTokens;
 		}
 			
-		ResourcesData[ObjectSeekCount] = iter->second;
+		resourcesData[objectSeekCount] = iter->second;
 		
-		ObjectSeekCount++;
+		objectSeekCount++;
 		
 	}
 	
 	// Process the data from RDATE.
 	
-	DataReceived = ProcessTextVectors(&ObjectName, &ObjectData, true, "RDATE");
+	dataReceived = ProcessTextVectors(&objectName, &objectData, true, "RDATE");
 
-	ObjectSeekCount = 0;
+	objectSeekCount = 0;
 	
-	for(multimap<string,string>::iterator iter = DataReceived.begin(); 
-		iter != DataReceived.end(); 
+	for(multimap<string,string>::iterator iter = dataReceived.begin(); 
+		iter != dataReceived.end(); 
 		++iter){
 		
-		RecurranceDateDataTokens.push_back("");
-		RecurranceDateDataValue.push_back("");
-		RecurranceDateDataTimeZoneParam.push_back("");
-		RecurranceDateData.push_back("");
+		recurranceDateDataTokens.push_back("");
+		recurranceDateDataValue.push_back("");
+		recurranceDateDataTimeZoneParam.push_back("");
+		recurranceDateData.push_back("");
 			
-		bool TokenData = false;
-		string PropertyTokens;
+		bool tokenData = false;
+		string propertyTokens;
 		
-		PropertyNameData = (string*)&iter->first;
+		propertyNameData = (string*)&iter->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"){
 				
-				RecurranceDateDataValue[ObjectSeekCount] = dataiter->second;
+				recurranceDateDataValue[objectSeekCount] = dataiter->second;
 				
 			} else if (dataiter->first == "TZID"){
 				
-				RecurranceDateDataTimeZoneParam[ObjectSeekCount] = dataiter->second;
+				recurranceDateDataTimeZoneParam[objectSeekCount] = dataiter->second;
 				
 			} else {
 				
-				if (TokenData == false){
-					TokenData = true;
+				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){
-			RecurranceDateDataTokens[ObjectSeekCount] = PropertyTokens;
+		if (propertyTokens.size() > 0){
+			recurranceDateDataTokens[objectSeekCount] = propertyTokens;
 		}
 			
-		RecurranceDateData[ObjectSeekCount] = iter->second;
+		recurranceDateData[objectSeekCount] = iter->second;
 		
-		ObjectSeekCount++;
+		objectSeekCount++;
 		
 	}
 
 	// Process VALARM section.
 	
-	int SeekCount = 0;
-	int AlarmObjectCount = 0;
+	int seekCount = 0;
+	int alarmObjectCount = 0;
 	
-	bool AlarmActionFound = false;
+	bool alarmActionFound = false;
 	
-	for (vector<vector<string>>::iterator iter = EventAlarmName.begin();
-		iter != EventAlarmName.end(); iter++){
+	for (vector<vector<string>>::iterator iter = eventAlarmName.begin();
+		iter != eventAlarmName.end(); iter++){
 			
-		CalendarAlarmDataStruct NewAlarmData;
+		CalendarAlarmDataStruct newAlarmData;
 			
 		// Process the data from ACTION.
 	
-		bool AlarmActionFound = false;
-		bool AlarmTriggerFound = false;
-		bool AlarmDurationFound = false;
-		bool AlarmDescriptionFound = false;
-		bool AlarmSummaryFound = false;
+		bool alarmActionFound = false;
+		bool alarmTriggerFound = false;
+		bool alarmDurationFound = false;
+		bool alarmDescriptionFound = false;
+		bool alarmSummaryFound = false;
 			
-		DataReceived = ProcessTextVectors(&EventAlarmName[SeekCount], 
-				&EventAlarmData[SeekCount], false, "ACTION");
+		dataReceived = ProcessTextVectors(&eventAlarmName[seekCount], 
+				&eventAlarmData[seekCount], false, "ACTION");
 	
-		if (DataReceived.begin() != DataReceived.end()){
+		if (dataReceived.begin() != dataReceived.end()){
 	
 			try {
-				NewAlarmData.AlarmActionTokens = DataReceived.begin()->first.substr(7);
+				newAlarmData.alarmActionTokens = dataReceived.begin()->first.substr(7);
 			}
 		
 			catch(const out_of_range &oor){
 				// Do nothing as there is no data.
 			}
 		
-			NewAlarmData.AlarmAction = DataReceived.begin()->second;
-			AlarmActionFound = true;
+			newAlarmData.alarmAction = dataReceived.begin()->second;
+			alarmActionFound = true;
 		
 		}
 		
 		// Check if a value was set for AlarmAction, otherwise
 		// process the next VALARM section.
 		
-		if (NewAlarmData.AlarmAction.size() < 1){
+		if (newAlarmData.alarmAction.size() < 1){
 			
-			SeekCount++;
+			seekCount++;
 			continue;
 			
 		}
@@ -1504,453 +1504,453 @@ void CalendarTaskObject::ProcessData(){
 		// Check if AlarmAction is DISPLAY, AUDIO or EMAIL.
 		// Process the next VALARM section if not.
 		
-		if (NewAlarmData.AlarmAction == "AUDIO"){
+		if (newAlarmData.alarmAction == "AUDIO"){
 			
-			NewAlarmData.AlarmType = CALENDARALARM_AUDIO;
+			newAlarmData.alarmType = CALENDARALARM_AUDIO;
 			
-		} else if (NewAlarmData.AlarmAction == "DISPLAY"){
+		} else if (newAlarmData.alarmAction == "DISPLAY"){
 			
-			NewAlarmData.AlarmType = CALENDARALARM_DISPLAY;
+			newAlarmData.alarmType = CALENDARALARM_DISPLAY;
 			
-		} else if (NewAlarmData.AlarmAction == "EMAIL"){
+		} else if (newAlarmData.alarmAction == "EMAIL"){
 			
-			NewAlarmData.AlarmType = CALENDARALARM_EMAIL;
+			newAlarmData.alarmType = CALENDARALARM_EMAIL;
 			
 		} else {
 		
-			SeekCount++;
+			seekCount++;
 			continue;
 			
 		}
 		
 		// Process the data from TRIGGER.
 		
-		DataReceived = ProcessTextVectors(&EventAlarmName[SeekCount], &EventAlarmData[SeekCount], false, "TRIGGER");
+		dataReceived = ProcessTextVectors(&eventAlarmName[seekCount], &eventAlarmData[seekCount], false, "TRIGGER");
 	
-		if (DataReceived.begin() != DataReceived.end()){
+		if (dataReceived.begin() != dataReceived.end()){
 	
-			bool TokenData = false;
-			string PropertyTokens;
+			bool tokenData = false;
+			string propertyTokens;
 		
-			PropertyNameData = (string*)&DataReceived.begin()->first;
+			propertyNameData = (string*)&dataReceived.begin()->first;
 		
-			PropertyData = SplitValues(*PropertyNameData);
+			propertyData = SplitValues(*propertyNameData);
 		
-			for(map<string,string>::iterator iter = PropertyData.begin();
-				iter != PropertyData.end(); iter++){
+			for(map<string,string>::iterator iter = propertyData.begin();
+				iter != propertyData.end(); iter++){
 			
 				if (iter->first == "VALUE"){
 				
-					NewAlarmData.TriggerValue = iter->second;
+					newAlarmData.triggerValue = iter->second;
 				
 				} else if (iter->first == "RELATED"){
 				
-					NewAlarmData.TriggerRelated = iter->second;
+					newAlarmData.triggerRelated = iter->second;
 				
 				} else {
 				
-					if (TokenData == false){
-						TokenData = true;
+					if (tokenData == false){
+						tokenData = true;
 					} else {
-						PropertyTokens += ";";
+						propertyTokens += ";";
 					}
 				
-					PropertyTokens += iter->first;
-					PropertyTokens += "=";
-					PropertyTokens += iter->second;
+					propertyTokens += iter->first;
+					propertyTokens += "=";
+					propertyTokens += iter->second;
 				
 				}
 				
 			}
 		
-			if (PropertyTokens.size() > 0){
-				NewAlarmData.TriggerTokens = PropertyTokens;
+			if (propertyTokens.size() > 0){
+				newAlarmData.triggerTokens = propertyTokens;
 			}
 		
-			NewAlarmData.TriggerData = DataReceived.begin()->second;
-			AlarmTriggerFound = true;
+			newAlarmData.triggerData = dataReceived.begin()->second;
+			alarmTriggerFound = true;
 		
 		}
 		
 		// Process the data from DESCRIPTION.
 		
-		DataReceived = ProcessTextVectors(&EventAlarmName[SeekCount], &EventAlarmData[SeekCount], false, "DESCRIPTION");
+		dataReceived = ProcessTextVectors(&eventAlarmName[seekCount], &eventAlarmData[seekCount], false, "DESCRIPTION");
 	
-		if (DataReceived.begin() != DataReceived.end() &&
-			(NewAlarmData.AlarmType == CALENDARALARM_DISPLAY ||
-			NewAlarmData.AlarmType == CALENDARALARM_EMAIL)){
+		if (dataReceived.begin() != dataReceived.end() &&
+			(newAlarmData.alarmType == CALENDARALARM_DISPLAY ||
+			newAlarmData.alarmType == CALENDARALARM_EMAIL)){
 	
-			bool TokenData = false;
-			string PropertyTokens;
+			bool tokenData = false;
+			string propertyTokens;
 		
-			PropertyNameData = (string*)&DataReceived.begin()->first;
+			propertyameData = (string*)&dataReceived.begin()->first;
 		
-			PropertyData = SplitValues(*PropertyNameData);
+			propertyData = SplitValues(*propertyNameData);
 		
-			for(map<string,string>::iterator iter = PropertyData.begin();
-				iter != PropertyData.end(); iter++){
+			for(map<string,string>::iterator iter = propertyData.begin();
+				iter != propertyData.end(); iter++){
 			
 				if (iter->first == "ALTREP"){
 				
-					NewAlarmData.DescriptionAltRep = iter->second;
+					newAlarmData.descriptionAltRep = iter->second;
 				
 				} else if (iter->first == "LANGUAGE"){
 				
-					NewAlarmData.DescriptionLanguage = iter->second;
+					newAlarmData.descriptionLanguage = iter->second;
 				
 				} else {
 				
-					if (TokenData == false){
-						TokenData = true;
+					if (tokenData == false){
+						tokenData = true;
 					} else {
-						PropertyTokens += ";";
+						propertyTokens += ";";
 					}
 				
-					PropertyTokens += iter->first;
-					PropertyTokens += "=";
-					PropertyTokens += iter->second;
+					propertyTokens += iter->first;
+					propertyTokens += "=";
+					propertyTokens += iter->second;
 				
 				}
 				
 			}
 		
-			if (PropertyTokens.size() > 0){
-				NewAlarmData.DescriptionTokens = PropertyTokens;
+			if (propertyTokens.size() > 0){
+				newAlarmData.descriptionTokens = propertyTokens;
 			}
 		
-			NewAlarmData.DescriptionData = DataReceived.begin()->second;
-			AlarmDescriptionFound = true;
+			newAlarmData.descriptionData = dataReceived.begin()->second;
+			alarmDescriptionFound = true;
 		
 		}
 		
 		// Process data from SUMMARY.
 		
-		DataReceived = ProcessTextVectors(&EventAlarmName[SeekCount], &EventAlarmData[SeekCount], false, "SUMMARY");
+		dataReceived = ProcessTextVectors(&eventAlarmName[seekCount], &eventAlarmData[seekCount], false, "SUMMARY");
 	
-		if (DataReceived.begin() != DataReceived.end() &&
-			NewAlarmData.AlarmType == CALENDARALARM_EMAIL){
+		if (dataReceived.begin() != dataReceived.end() &&
+			newAlarmData.alarmType == CALENDARALARM_EMAIL){
 	
-			bool TokenData = false;
-			string PropertyTokens;
+			bool tokenData = false;
+			string propertyTokens;
 		
-			PropertyNameData = (string*)&DataReceived.begin()->first;
+			propertyNameData = (string*)&dataReceived.begin()->first;
 		
-			PropertyData = SplitValues(*PropertyNameData);
+			propertyData = SplitValues(*propertyNameData);
 		
-			for(map<string,string>::iterator iter = PropertyData.begin();
-				iter != PropertyData.end(); iter++){
+			for(map<string,string>::iterator iter = propertyData.begin();
+				iter != propertyData.end(); iter++){
 			
 				if (iter->first == "ALTREP"){
 				
-					NewAlarmData.SummaryAltRep = iter->second;
+					newAlarmData.summaryAltRep = iter->second;
 				
 				} else if (iter->first == "LANGUAGE"){
 				
-					NewAlarmData.SummaryLanguage = iter->second;
+					newAlarmData.summaryLanguage = iter->second;
 				
 				} else {
 				
-					if (TokenData == false){
-						TokenData = true;
+					if (tokenData == false){
+						tokenData = true;
 					} else {
-						PropertyTokens += ";";
+						propertyTokens += ";";
 					}
 				
-					PropertyTokens += iter->first;
-					PropertyTokens += "=";
-					PropertyTokens += iter->second;
+					propertyTokens += iter->first;
+					propertyTokens += "=";
+					propertyTokens += iter->second;
 				
 				}
 				
 			}
 		
-			if (PropertyTokens.size() > 0){
-				NewAlarmData.SummaryTokens = PropertyTokens;
+			if (propertyTokens.size() > 0){
+				newAlarmData.summaryTokens = propertyTokens;
 			}
 		
-			NewAlarmData.SummaryData = DataReceived.begin()->second;
-			AlarmSummaryFound = true;
+			newAlarmData.summaryData = dataReceived.begin()->second;
+			alarmSummaryFound = true;
 		
 		}
 		
 		// Process data from DURATION.
 		
-		DataReceived = ProcessTextVectors(&EventAlarmName[SeekCount], &EventAlarmData[SeekCount], false, "DURATION");
+		dataReceived = ProcessTextVectors(&eventAlarmName[seekCount], &eventAlarmData[seekCount], false, "DURATION");
 		
-		if (DataReceived.begin() != DataReceived.end()){
+		if (dataReceived.begin() != dataReceived.end()){
 	
 			try {
-				NewAlarmData.DurationTokens = DataReceived.begin()->first.substr(9);
+				newAlarmData.durationTokens = dataReceived.begin()->first.substr(9);
 			}
 		
 			catch(const out_of_range &oor){
 				// Do nothing as there is no data.
 			}		
 		
-			NewAlarmData.DurationData = DataReceived.begin()->second;
-			AlarmDurationFound = true;
+			newAlarmData.durationData = dataReceived.begin()->second;
+			alarmDurationFound = true;
 		
 		}
 		
 		// Process data from REPEAT.
 		
-		DataReceived = ProcessTextVectors(&EventAlarmName[SeekCount], &EventAlarmData[SeekCount], false, "REPEAT");
+		dataReceived = ProcessTextVectors(&eventAlarmName[seekCount], &eventAlarmData[seekCount], false, "REPEAT");
 		
-		if (DataReceived.begin() != DataReceived.end() && AlarmDurationFound == true){
+		if (dataReceived.begin() != dataReceived.end() && alarmDurationFound == true){
 	
 			try {
-				NewAlarmData.RepeatTokens = DataReceived.begin()->first.substr(7);
+				newAlarmData.repeatTokens = dataReceived.begin()->first.substr(7);
 			}
 		
 			catch(const out_of_range &oor){
 				// Do nothing as there is no data.
 			}		
 		
-			NewAlarmData.RepeatData = DataReceived.begin()->second;
+			newAlarmData.repeatData = dataReceived.begin()->second;
 		
 		} else {
 			
-			NewAlarmData.DurationData.clear();
-			NewAlarmData.DurationTokens.clear();
+			newAlarmData.durationData.clear();
+			newAlarmData.durationTokens.clear();
 			
 		}
 		
 		// Process data from ATTENDEE.
 		
-		DataReceived = ProcessTextVectors(&EventAlarmName[SeekCount], &EventAlarmData[SeekCount], true, "ATTENDEE");
+		dataReceived = ProcessTextVectors(&eventAlarmName[seekCount], &eventAlarmData[seekCount], true, "ATTENDEE");
 	
-		ObjectSeekCount = 0;
+		objectSeekCount = 0;
 	
-		for(multimap<string,string>::iterator iter = DataReceived.begin(); 
-			iter != DataReceived.end(); 
+		for(multimap<string,string>::iterator iter = dataReceived.begin(); 
+			iter != dataReceived.end(); 
 			++iter){
+		
+			newAlarmData.attendeeListMember.push_back("");
+			newAlarmData.attendeeListDelegatedFrom.push_back("");
+			newAlarmData.attendeeListDelegatedTo.push_back("");
+			newAlarmData.attendeeListRole.push_back("");
+			newAlarmData.attendeeListRSVP.push_back("");
+			newAlarmData.attendeeListDirectoryEntry.push_back("");
+			newAlarmData.attendeeListSentBy.push_back("");
+			newAlarmData.attendeeListCommonName.push_back("");
+			newAlarmData.attendeeListCalendarUserType.push_back("");
+			newAlarmData.attendeeListParticipationStatus.push_back("");
+			newAlarmData.attendeeListLanguage.push_back("");
+			newAlarmData.attendeeListTokens.push_back("");
+			newAlarmData.attendeeList.push_back("");
 			
-			NewAlarmData.AttendeeListMember.push_back("");
-			NewAlarmData.AttendeeListDelegatedFrom.push_back("");
-			NewAlarmData.AttendeeListDelegatedTo.push_back("");
-			NewAlarmData.AttendeeListRole.push_back("");
-			NewAlarmData.AttendeeListRSVP.push_back("");
-			NewAlarmData.AttendeeListDirectoryEntry.push_back("");
-			NewAlarmData.AttendeeListSentBy.push_back("");
-			NewAlarmData.AttendeeListCommonName.push_back("");
-			NewAlarmData.AttendeeListCalendarUserType.push_back("");
-			NewAlarmData.AttendeeListParticipationStatus.push_back("");
-			NewAlarmData.AttendeeListLanguage.push_back("");
-			NewAlarmData.AttendeeListTokens.push_back("");
-			NewAlarmData.AttendeeList.push_back("");
-			
-			bool TokenData = false;
-			string PropertyTokens;
+			bool tokenData = false;
+			string propertyTokens;
 		
-			PropertyNameData = (string*)&iter->first;
+			propertyNameData = (string*)&iter->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 == "CUTYPE"){
 				
-					NewAlarmData.AttendeeListCalendarUserType[ObjectSeekCount] = dataiter->second;
+					newAlarmData.attendeeListCalendarUserType[objectSeekCount] = dataiter->second;
 				
 				} else if (dataiter->first == "MEMBER"){
 				
-					NewAlarmData.AttendeeListMember[ObjectSeekCount] = dataiter->second;
+					newAlarmData.attendeeListMember[objectSeekCount] = dataiter->second;
 				
 				} else if (dataiter->first == "ROLE"){
 				
-					NewAlarmData.AttendeeListRole[ObjectSeekCount] = dataiter->second;
+					newAlarmData.attendeeListRole[objectSeekCount] = dataiter->second;
 				
 				} else if (dataiter->first == "PARTSTAT"){
 				
-					NewAlarmData.AttendeeListParticipationStatus[ObjectSeekCount] = dataiter->second;
+					newAlarmData.attendeeListParticipationStatus[objectSeekCount] = dataiter->second;
 				
 				} else if (dataiter->first == "RSVP"){
 				
-					NewAlarmData.AttendeeListRSVP[ObjectSeekCount] = dataiter->second;
+					newAlarmData.attendeeListRSVP[objectSeekCount] = dataiter->second;
 				
 				} else if (dataiter->first == "DELEGATED-TO"){
 				
-					NewAlarmData.AttendeeListDelegatedTo[ObjectSeekCount] = dataiter->second;
+					newAlarmData.attendeeListDelegatedTo[objectSeekCount] = dataiter->second;
 				
 				} else if (dataiter->first == "DELEGATED-FROM"){
 				
-					NewAlarmData.AttendeeListDelegatedFrom[ObjectSeekCount] = dataiter->second;
+					newAlarmData.attendeeListDelegatedFrom[objectSeekCount] = dataiter->second;
 				
 				} else if (dataiter->first == "SENT-BY"){
 				
-					NewAlarmData.AttendeeListSentBy[ObjectSeekCount] = dataiter->second;
+					newAlarmData.attendeeListSentBy[objectSeekCount] = dataiter->second;
 				
 				} else if (dataiter->first == "CN"){
 				
-					NewAlarmData.AttendeeListCommonName[ObjectSeekCount] = dataiter->second;
+					newAlarmData.attendeeListCommonName[objectSeekCount] = dataiter->second;
 				
 				} else if (dataiter->first == "DIR"){
 				
-					NewAlarmData.AttendeeListDirectoryEntry[ObjectSeekCount] = dataiter->second;
+					newAlarmData.attendeeListDirectoryEntry[objectSeekCount] = dataiter->second;
 				
 				} else if (dataiter->first == "LANGUAGE"){
 				
-					NewAlarmData.AttendeeListLanguage[ObjectSeekCount] = dataiter->second;
+					newAlarmData.attendeeListLanguage[objectSeekCount] = dataiter->second;
 				
 				} else {
 				
-					if (TokenData == false){
-						TokenData = true;
+					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){
-				NewAlarmData.AttendeeListTokens[ObjectSeekCount] = PropertyTokens;
+			if (propertyTokens.size() > 0){
+				newAlarmData.attendeeListTokens[objectSeekCount] = propertyTokens;
 			}
 			
-			NewAlarmData.AttendeeList[ObjectSeekCount] = iter->second;
+			newAlarmData.attendeeList[objectSeekCount] = iter->second;
 		
-			ObjectSeekCount++;
+			objectSeekCount++;
 		
 		}
 		
 		// Process data from ATTACH.
 		
-		DataReceived = ProcessTextVectors(&EventAlarmName[SeekCount], &EventAlarmData[SeekCount], true, "ATTACH");
+		dataReceived = ProcessTextVectors(&eventAlarmName[seekCount], &eventAlarmData[seekCount], true, "ATTACH");
 	
-		ObjectSeekCount = 0;
+		objectSeekCount = 0;
 		
-		for(multimap<string,string>::iterator iter = DataReceived.begin(); 
-			iter != DataReceived.end();
+		for(multimap<string,string>::iterator iter = dataReceived.begin(); 
+			iter != dataReceived.end();
 			++iter){
 		
-			NewAlarmData.AttachListEncoding.push_back("");
-			NewAlarmData.AttachListValue.push_back("");
-			NewAlarmData.AttachListFormatType.push_back("");
-			NewAlarmData.AttachListTokens.push_back("");
-			NewAlarmData.AttachList.push_back("");
+			newAlarmData.attachListEncoding.push_back("");
+			newAlarmData.attachListValue.push_back("");
+			newAlarmData.attachListFormatType.push_back("");
+			newAlarmData.attachListTokens.push_back("");
+			newAlarmData.attachList.push_back("");
 			
-			bool TokenData = false;
-			string PropertyTokens;
+			bool tokenData = false;
+			string propertyTokens;
 		
-			PropertyNameData = (string*)&iter->first;
+			propertyNameData = (string*)&iter->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 == "ENCODING"){
 				
-					NewAlarmData.AttachListEncoding[ObjectSeekCount] = dataiter->second;
+					newAlarmData.attachListEncoding[objectSeekCount] = dataiter->second;
 				
 				} else if (dataiter->first == "VALUE"){
 				
-					NewAlarmData.AttachListValue[ObjectSeekCount] = dataiter->second;
+					newAlarmData.attachListValue[objectSeekCount] = dataiter->second;
 				
 				} else if (dataiter->first == "FMTTYPE"){
 				
-					NewAlarmData.AttachListFormatType[ObjectSeekCount] = dataiter->second;
+					newAlarmData.attachListFormatType[objectSeekCount] = dataiter->second;
 				
 				} else {
 				
-					if (TokenData == false){
-						TokenData = true;
+					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){
-				NewAlarmData.AttachListTokens[ObjectSeekCount] = PropertyTokens;
+			if (propertyTokens.size() > 0){
+				newAlarmData.attachListTokens[objectSeekCount] = propertyTokens;
 			}
 			
-			NewAlarmData.AttachList[ObjectSeekCount] = iter->second;
+			newAlarmData.attachList[objectSeekCount] = iter->second;
 		
-			ObjectSeekCount++;
+			objectSeekCount++;
 		
 		}
 		
 		// Process data from X-*
 		
-		AlarmObjectCount = 0;
+		alarmObjectCount = 0;
 		
-		for(vector<string>::iterator xtokeniter = EventAlarmName[SeekCount].begin(); 
-			xtokeniter != EventAlarmName[SeekCount].end(); ++xtokeniter){
+		for(vector<string>::iterator xtokeniter = eventAlarmName[seekCount].begin(); 
+			xtokeniter != eventAlarmName[seekCount].end(); ++xtokeniter){
 			
-			bool TokenData = false;
-			string PropertyTokens;
+			bool tokenData = false;
+			string propertyTokens;
 		
 			if (xtokeniter->substr(0,2) == "X-" &&
 				xtokeniter->size() > 2){
 			
-				NewAlarmData.XTokensData.push_back(EventAlarmData[SeekCount][AlarmObjectCount]);
-				NewAlarmData.XTokensDataTokens.push_back(EventAlarmName[SeekCount][AlarmObjectCount]);
+				newAlarmData.xTokensData.push_back(eventAlarmData[seekCount][alarmObjectCount]);
+				newAlarmData.xTokensDataTokens.push_back(EventAlarmName[seekCount][alarmObjectCount]);
 				
 			}
 		
-			AlarmObjectCount++;
+			alarmObjectCount++;
 		
 		}
 		
-		if (NewAlarmData.AlarmType == CALENDARALARM_AUDIO &&
-			AlarmActionFound == true &&
-			AlarmTriggerFound == true){
+		if (newAlarmData.alarmType == CALENDARALARM_AUDIO &&
+			alarmActionFound == true &&
+			alarmTriggerFound == true){
 		
-			CalendarAlarmData.push_back(NewAlarmData);
+			calendarAlarmData.push_back(newAlarmData);
 			
-		} else if (NewAlarmData.AlarmType == CALENDARALARM_DISPLAY &&
-			AlarmActionFound == true &&
-			AlarmTriggerFound == true &&
-			AlarmDescriptionFound == true){
+		} else if (newAlarmData.alarmType == CALENDARALARM_DISPLAY &&
+			alarmActionFound == true &&
+			alarmTriggerFound == true &&
+			alarmDescriptionFound == true){
 
-			CalendarAlarmData.push_back(NewAlarmData);
+			calendarAlarmData.push_back(newAlarmData);
 				
-		} else if (NewAlarmData.AlarmType == CALENDARALARM_EMAIL &&
-			AlarmActionFound == true &&
-			AlarmTriggerFound == true &&
-			AlarmDescriptionFound == true &&
-			AlarmSummaryFound == true){
+		} else if (newAlarmData.alarmType == CALENDARALARM_EMAIL &&
+			alarmActionFound == true &&
+			alarmTriggerFound == true &&
+			alarmDescriptionFound == true &&
+			alarmSummaryFound == true){
 		
-			CalendarAlarmData.push_back(NewAlarmData);
+			calendarAlarmData.push_back(newAlarmData);
 				
 		}
 			
-		SeekCount++;
+		seekCount++;
 			
 	}
-	
-	ObjectSeekCount = 0;
+
+	objectSeekCount = 0;
 	
 	// Process data from X-*
 	
-	for(vector<string>::iterator iter = ObjectName.begin(); 
-		iter != ObjectName.end(); ++iter){
+	for(vector<string>::iterator iter = objectName.begin(); 
+		iter != objectName.end(); ++iter){
 			
-		bool TokenData = false;
-		string PropertyTokens;
+		bool tokenData = false;
+		string propertyTokens;
 		
 		if (iter->substr(0,2) == "X-" &&
 			iter->size() > 2){
 			
-			XTokensData.push_back(ObjectData[ObjectSeekCount]);
-			XTokensDataTokens.push_back(ObjectName[ObjectSeekCount]);
+			xTokensData.push_back(objectData[objectSeekCount]);
+			xTokensDataTokens.push_back(objectName[objectSeekCount]);
 				
 		}
 		
-		ObjectSeekCount++;
+		objectSeekCount++;
 		
 	}