X-Git-Url: http://Server1/repobrowser/?p=xestiacalendar%2F.git;a=blobdiff_plain;f=source%2Fobjects%2FCalDAV%2FCalDAV-XMLProcessing.cpp;h=042750d2688a9e0c5a5d4acdbf3dd9cf475d7757;hp=0018ebf6484bde2e8e73dd4b08c750350ac6ea6f;hb=9bb29a2ad6d50014c8bb9b54cb40c8efb1ec75e9;hpb=66ebed13414439cd56161faa2abcff7744ab4588

diff --git a/source/objects/CalDAV/CalDAV-XMLProcessing.cpp b/source/objects/CalDAV/CalDAV-XMLProcessing.cpp
index 0018ebf..042750d 100644
--- a/source/objects/CalDAV/CalDAV-XMLProcessing.cpp
+++ b/source/objects/CalDAV/CalDAV-XMLProcessing.cpp
@@ -22,287 +22,287 @@ using namespace std;
  
 string CalDAV::ProcessXMLUserPrincipal(){
 
-	string UserPrincipalURI;
+	string userPrincipalURI;
 	
 	xmlDocPtr xmlCalDAVDoc;
-	xmlCalDAVDoc = xmlReadMemory(ServerData.c_str(), (int)ServerData.size(), "noname.xml", NULL, 0);
+	xmlCalDAVDoc = xmlReadMemory(serverData.c_str(), (int)serverData.size(), "noname.xml", NULL, 0);
 
-	xmlNodePtr NodeSeek;
-	bool NodeFound = false;
+	xmlNodePtr nodeSeek;
+	bool nodeFound = false;
 	
 	// Start with the first node, look for multistatus.
 	
-	for (NodeSeek = xmlCalDAVDoc->children;
-		NodeSeek != NULL;
-		NodeSeek = NodeSeek->next)
+	for (nodeSeek = xmlCalDAVDoc->children;
+		nodeSeek != NULL;
+		nodeSeek = nodeSeek->next)
 	{
 	
-		if (!xmlStrcmp(NodeSeek->name, (const xmlChar *)"multistatus") ||
-			!xmlStrcmp(NodeSeek->name, (const xmlChar *)"d:multistatus") ||
-			!xmlStrcmp(NodeSeek->name, (const xmlChar *)"D:multistatus")
+		if (!xmlStrcmp(nodeSeek->name, (const xmlChar *)"multistatus") ||
+			!xmlStrcmp(nodeSeek->name, (const xmlChar *)"d:multistatus") ||
+			!xmlStrcmp(nodeSeek->name, (const xmlChar *)"D:multistatus")
 		){
 			
-			NodeFound = true;
+			nodeFound = true;
 			break;
 			
 		}
 		
 	}
 	
-	if (NodeFound == false){
+	if (nodeFound == false){
 	
-		return UserPrincipalURI;
+		return userPrincipalURI;
 
 	}
 	
 	// Look for response.
 
-	if (NodeFound == false){ return UserPrincipalURI; } else { NodeFound = false; }
-	NodeFound = MatchXMLNameTransverse(&NodeSeek, "response");
+	if (nodeFound == false){ return userPrincipalURI; } else { nodeFound = false; }
+	nodeFound = MatchXMLNameTransverse(&nodeSeek, "response");
 
 	// Look for propstat.
 	
-	if (NodeFound == false){ return UserPrincipalURI; } else { NodeFound = false; }
-	NodeFound = MatchXMLNameTransverse(&NodeSeek, "propstat");
+	if (nodeFound == false){ return userPrincipalURI; } else { nodeFound = false; }
+	nodeFound = MatchXMLNameTransverse(&nodeSeek, "propstat");
 
 	// Look for prop.
 	
-	if (NodeFound == false){ return UserPrincipalURI; } else { NodeFound = false; }
-	NodeFound = MatchXMLNameTransverse(&NodeSeek, "prop");
+	if (nodeFound == false){ return userPrincipalURI; } else { nodeFound = false; }
+	nodeFound = MatchXMLNameTransverse(&nodeSeek, "prop");
 	
 	// Look for current-user-principal.
 	
-	if (NodeFound == false){ return UserPrincipalURI; } else { NodeFound = false; }
-	NodeFound = MatchXMLNameTransverse(&NodeSeek, "current-user-principal");
+	if (nodeFound == false){ return userPrincipalURI; } else { nodeFound = false; }
+	nodeFound = MatchXMLNameTransverse(&nodeSeek, "current-user-principal");
 	
 	// Look for href.	
 	
-	if (NodeFound == false){ return UserPrincipalURI; } else { NodeFound = false; }
-	NodeFound = MatchXMLNameTransverse(&NodeSeek, "href");
+	if (nodeFound == false){ return userPrincipalURI; } else { nodeFound = false; }
+	nodeFound = MatchXMLNameTransverse(&nodeSeek, "href");
 
 	// Get the data from href.
 	
-	UserPrincipalURI = FetchXMLData(&NodeSeek);
+	userPrincipalURI = FetchXMLData(&nodeSeek);
 	
 	xmlFreeDoc(xmlCalDAVDoc);
 	
-	return UserPrincipalURI;
+	return userPrincipalURI;
 	
 }
 
 string CalDAV::ProcessXMLCalendarHome(){
 
-	string CalendarHomeURI;
+	string calendarHomeURI;
 	
 	xmlDocPtr xmlCalDAVDoc;
-	xmlCalDAVDoc = xmlReadMemory(ServerData.c_str(), (int)ServerData.size(), "noname.xml", NULL, 0);
+	xmlCalDAVDoc = xmlReadMemory(serverData.c_str(), (int)serverData.size(), "noname.xml", NULL, 0);
 
-	xmlNodePtr NodeSeek;
-	bool NodeFound = false;
+	xmlNodePtr nodeSeek;
+	bool nodeFound = false;
 	
 	// Start with the first node, look for multistatus.
 	
-	for (NodeSeek = xmlCalDAVDoc->children;
-		NodeSeek != NULL;
-		NodeSeek = NodeSeek->next)
+	for (nodeSeek = xmlCalDAVDoc->children;
+		nodeSeek != NULL;
+		nodeSeek = nodeSeek->next)
 	{
 	
-		if (!xmlStrcmp(NodeSeek->name, (const xmlChar *)"multistatus") ||
-			!xmlStrcmp(NodeSeek->name, (const xmlChar *)"d:multistatus") ||
-			!xmlStrcmp(NodeSeek->name, (const xmlChar *)"D:multistatus")
+		if (!xmlStrcmp(nodeSeek->name, (const xmlChar *)"multistatus") ||
+			!xmlStrcmp(nodeSeek->name, (const xmlChar *)"d:multistatus") ||
+			!xmlStrcmp(nodeSeek->name, (const xmlChar *)"D:multistatus")
 		){
 			
-			NodeFound = true;
+			nodeFound = true;
 			break;
 			
 		}
 		
 	}
 	
-	if (NodeFound == false){
+	if (nodeFound == false){
 	
-		return CalendarHomeURI;
+		return calendarHomeURI;
 
 	}
 	
 	// Look for response.
 
-	if (NodeFound == false){ return CalendarHomeURI; } else { NodeFound = false; }
-	NodeFound = MatchXMLNameTransverse(&NodeSeek, "response");
+	if (nodeFound == false){ return calendarHomeURI; } else { nodeFound = false; }
+	nodeFound = MatchXMLNameTransverse(&nodeSeek, "response");
 
 	// Look for propstat.
 	
-	if (NodeFound == false){ return CalendarHomeURI; } else { NodeFound = false; }
-	NodeFound = MatchXMLNameTransverse(&NodeSeek, "propstat");
+	if (nodeFound == false){ return calendarHomeURI; } else { nodeFound = false; }
+	nodeFound = MatchXMLNameTransverse(&nodeSeek, "propstat");
 
 	// Look for prop.
 	
-	if (NodeFound == false){ return CalendarHomeURI; } else { NodeFound = false; }
-	NodeFound = MatchXMLNameTransverse(&NodeSeek, "prop");
+	if (nodeFound == false){ return calendarHomeURI; } else { nodeFound = false; }
+	nodeFound = MatchXMLNameTransverse(&nodeSeek, "prop");
 	
 	// Look for calendar-home-set.
 	
-	if (NodeFound == false){ return CalendarHomeURI; } else { NodeFound = false; }
-	NodeFound = MatchXMLNameTransverse(&NodeSeek, "calendar-home-set");
+	if (nodeFound == false){ return calendarHomeURI; } else { nodeFound = false; }
+	nodeFound = MatchXMLNameTransverse(&nodeSeek, "calendar-home-set");
 	
 	// Look for href.	
 	
-	if (NodeFound == false){ return CalendarHomeURI; } else { NodeFound = false; }
-	NodeFound = MatchXMLNameTransverse(&NodeSeek, "href");
+	if (nodeFound == false){ return calendarHomeURI; } else { nodeFound = false; }
+	nodeFound = MatchXMLNameTransverse(&nodeSeek, "href");
 
 	// Get the data from href.
 	
-	CalendarHomeURI = FetchXMLData(&NodeSeek);
+	CalendarHomeURI = FetchXMLData(&nodeSeek);
 	
 	xmlFreeDoc(xmlCalDAVDoc);
 	
-	return CalendarHomeURI;
+	return calendarHomeURI;
 	
 }
 
 CalDAVCalendarList CalDAV::ProcessXMLCalendarList(){
 	
-	CalDAVCalendarList CalendarList;
+	CalDAVCalendarList calendarList;
 	
 	xmlDocPtr xmlCalDAVDoc;
-	xmlCalDAVDoc = xmlReadMemory(ServerData.c_str(), (int)ServerData.size(), "noname.xml", NULL, 0);
+	xmlCalDAVDoc = xmlReadMemory(serverData.c_str(), (int)serverData.size(), "noname.xml", NULL, 0);
 
-	xmlNodePtr NodeSeek = NULL;
-	xmlNodePtr NodeResponse = NULL;
-	xmlNodePtr NodeMatch = NULL;
-	xmlNodePtr NodeData = NULL;
-	bool NodeFound = false;
-	int ResponseCount = 0;
+	xmlNodePtr nodeSeek = NULL;
+	xmlNodePtr nodeResponse = NULL;
+	xmlNodePtr nodeMatch = NULL;
+	xmlNodePtr nodeData = NULL;
+	bool nodeFound = false;
+	int responseCount = 0;
 	
 	// Start with the first node, look for multistatus.
 	
-	for (NodeSeek = xmlCalDAVDoc->children;
-		NodeSeek != NULL;
-		NodeSeek = NodeSeek->next)
+	for (nodeSeek = xmlCalDAVDoc->children;
+		nodeSeek != NULL;
+		nodeSeek = NodeSeek->next)
 	{
 	
-		if (!xmlStrcmp(NodeSeek->name, (const xmlChar *)"multistatus") ||
-			!xmlStrcmp(NodeSeek->name, (const xmlChar *)"d:multistatus") ||
-			!xmlStrcmp(NodeSeek->name, (const xmlChar *)"D:multistatus")
+		if (!xmlStrcmp(nodeSeek->name, (const xmlChar *)"multistatus") ||
+			!xmlStrcmp(nodeSeek->name, (const xmlChar *)"d:multistatus") ||
+			!xmlStrcmp(nodeSeek->name, (const xmlChar *)"D:multistatus")
 		){
 		
-			NodeResponse = NodeSeek->children;	
-			NodeFound = true;
+			nodeResponse = nodeSeek->children;	
+			nodeFound = true;
 			break;
 			
 		}
 		
 	}
 	
-	if (NodeFound == false){
+	if (nodeFound == false){
 	
-		return CalendarList;
+		return calendarList;
 
 	}
 	
-	for (NodeResponse = NodeSeek->children;
-		NodeResponse != nullptr;
-		NodeResponse = NodeResponse->next)
+	for (nodeResponse = nodeSeek->children;
+		nodeResponse != nullptr;
+		nodeResponse = nodeResponse->next)
 	{
 	
 		// Go through each of the responses and find the calendars.
 
-		NodeMatch = xmlCopyNode(NodeResponse, 1);
+		nodeMatch = xmlCopyNode(nodeResponse, 1);
 		
-		if (MatchXMLName(&NodeMatch, "response")){
+		if (MatchXMLName(&nodeMatch, "response")){
 
-			NodeData = xmlCopyNode(NodeMatch, 1);
+			nodeData = xmlCopyNode(nodeMatch, 1);
 			
 			// Check the resource type is a calendar.
 			
-			if (!MatchXMLNameTransverse(&NodeData, "propstat")){ continue; }
-			if (!MatchXMLNameTransverse(&NodeData, "prop")){ continue; }
-			if (!MatchXMLNameTransverse(&NodeData, "resourcetype")){ continue; }			
-			if (!MatchXMLNameTransverse(&NodeData, "calendar")){ continue; }
+			if (!MatchXMLNameTransverse(&nodeData, "propstat")){ continue; }
+			if (!MatchXMLNameTransverse(&nodeData, "prop")){ continue; }
+			if (!MatchXMLNameTransverse(&nodeData, "resourcetype")){ continue; }			
+			if (!MatchXMLNameTransverse(&nodeData, "calendar")){ continue; }
 			
 			// Get the HREF.
 			
-			NodeData = xmlCopyNode(NodeMatch, 1);
+			nodeData = xmlCopyNode(nodeMatch, 1);
 			
-			if (!MatchXMLNameTransverse(&NodeData, "href")){ continue; }
+			if (!MatchXMLNameTransverse(&nodeData, "href")){ continue; }
 						
-			string HREFAddress = FetchXMLData(&NodeData);
+			string hrefAddress = FetchXMLData(&nodeData);
 			
 			// Get the calendar name.
 
-			NodeData = xmlCopyNode(NodeMatch, 1);
+			nodeData = xmlCopyNode(nodeMatch, 1);
 			
-			if (!MatchXMLNameTransverse(&NodeData, "propstat")){ continue; }
-			if (!MatchXMLNameTransverse(&NodeData, "prop")){ continue; }
-			if (!MatchXMLNameTransverse(&NodeData, "displayname")){ continue; }
+			if (!MatchXMLNameTransverse(&nodeData, "propstat")){ continue; }
+			if (!MatchXMLNameTransverse(&nodeData, "prop")){ continue; }
+			if (!MatchXMLNameTransverse(&nodeData, "displayname")){ continue; }
 			
-			string CalendarName = FetchXMLData(&NodeData);
+			string calendarName = FetchXMLData(&nodeData);
 			
 			// Get the calendar description.
 			
-			NodeData = xmlCopyNode(NodeMatch, 1);
+			nodeData = xmlCopyNode(nodeMatch, 1);
 			
-			string CalendarDescription = "";
+			string calendarDescription = "";
 			
-			if (!MatchXMLNameTransverse(&NodeData, "propstat")){ continue; }
-			if (!MatchXMLNameTransverse(&NodeData, "prop")){ continue; }
-			if (MatchXMLNameTransverse(&NodeData, "calendar-description")){ 
+			if (!MatchXMLNameTransverse(&nodeData, "propstat")){ continue; }
+			if (!MatchXMLNameTransverse(&nodeData, "prop")){ continue; }
+			if (MatchXMLNameTransverse(&nodeData, "calendar-description")){ 
 			
-				CalendarDescription = FetchXMLData(&NodeData);
+				calendarDescription = FetchXMLData(&nodeData);
 				
 			}
 			
 			// Get the calendar colour.
 			
-			NodeData = xmlCopyNode(NodeMatch, 1);
+			nodeData = xmlCopyNode(nodeMatch, 1);
 
-			Colour CalendarColour;
-			bool ColourResult = false;
+			Colour calendarColour;
+			bool colourResult = false;
 			
-			if (!MatchXMLNameTransverse(&NodeData, "propstat")){ continue; }
-			if (!MatchXMLNameTransverse(&NodeData, "prop")){ continue; }
-			if (MatchXMLNameTransverse(&NodeData, "calendar-color")){ 
+			if (!MatchXMLNameTransverse(&nodeData, "propstat")){ continue; }
+			if (!MatchXMLNameTransverse(&nodeData, "prop")){ continue; }
+			if (MatchXMLNameTransverse(&nodeData, "calendar-color")){ 
 			
-				string CalendarColourString = "";
-				string CalendarColourHexValue = "";
-				int ColourNumber;
-				bool KeepRunning = true;
+				string calendarColourString = "";
+				string calendarColourHexValue = "";
+				int colourNumber;
+				bool keepRunning = true;
 				
-				CalendarColourString = FetchXMLData(&NodeData);
+				calendarColourString = FetchXMLData(&nodeData);
 				
-				while(KeepRunning == true){
+				while(keepRunning == true){
 				
-					if (CalendarColourString.substr(0,1) == "#" && CalendarColourString.length() == 9){
+					if (calendarColourString.substr(0,1) == "#" && calendarColourString.length() == 9){
 						
 						// Get the red colour.
 						
-						CalendarColourHexValue = CalendarColourString.substr(1,2);
-						if (!HexToInt(&CalendarColourHexValue, &ColourNumber)){ break; }
-						CalendarColour.red = ColourNumber;
+						calendarColourHexValue = calendarColourString.substr(1,2);
+						if (!HexToInt(&calendarColourHexValue, &colourNumber)){ break; }
+						calendarColour.red = colourNumber;
 						
 						// Get the green colour.
 
-						CalendarColourHexValue = CalendarColourString.substr(3,2);
-						if (!HexToInt(&CalendarColourHexValue, &ColourNumber)){ break; }
-						CalendarColour.green = ColourNumber;
+						calendarColourHexValue = calendarColourString.substr(3,2);
+						if (!HexToInt(&calendarColourHexValue, &colourNumber)){ break; }
+						calendarColour.green = colourNumber;
 						
 						// Get the blue colour.
 						
-						CalendarColourHexValue = CalendarColourString.substr(5,2);
-						if (!HexToInt(&CalendarColourHexValue, &ColourNumber)){ break; };
-						CalendarColour.blue = ColourNumber;
+						calendarColourHexValue = calendarColourString.substr(5,2);
+						if (!HexToInt(&calendarColourHexValue, &colourNumber)){ break; };
+						calendarColour.blue = colourNumber;
 						
 						// Get the alpha.
 
-						CalendarColourHexValue = CalendarColourString.substr(7,2);
-						if (!HexToInt(&CalendarColourHexValue, &ColourNumber)){ break; };
-						CalendarColour.alpha = ColourNumber;
+						calendarColourHexValue = calendarColourString.substr(7,2);
+						if (!HexToInt(&calendarColourHexValue, &colourNumber)){ break; };
+						calendarColour.alpha = colourNumber;
 						
-						ColourResult = true;
+						colourResult = true;
 						
 					} else {
 
-						ColourResult = false;
+						colourResult = false;
 					
 					}
 					
@@ -312,72 +312,72 @@ CalDAVCalendarList CalDAV::ProcessXMLCalendarList(){
 				
 			}
 			
-			if (ColourResult == false){
+			if (colourResult == false){
 					
-					CalendarColour.red = 0;
-					CalendarColour.blue = 0;
-					CalendarColour.green = 0;
-					CalendarColour.alpha = 0;
+					calendarColour.red = 0;
+					calendarColour.blue = 0;
+					calendarColour.green = 0;
+					calendarColour.alpha = 0;
 					
 			}
 			
 			// Get the calendar order.
 
-			NodeData = xmlCopyNode(NodeMatch, 1);
+			nodeData = xmlCopyNode(nodeMatch, 1);
 			
-			int CalendarOrder = 0;
+			int calendarOrder = 0;
 			
-			if (!MatchXMLNameTransverse(&NodeData, "propstat")){ continue; }
-			if (!MatchXMLNameTransverse(&NodeData, "prop")){ continue; }
-			if (MatchXMLNameTransverse(&NodeData, "calendar-order")){
+			if (!MatchXMLNameTransverse(&nodeData, "propstat")){ continue; }
+			if (!MatchXMLNameTransverse(&nodeData, "prop")){ continue; }
+			if (MatchXMLNameTransverse(&nodeData, "calendar-order")){
 				
-				string CalendarOrderString = FetchXMLData(&NodeData);
-				if (!HexToInt(&CalendarOrderString, &CalendarOrder)){
-					CalendarOrder = 0;
+				string calendarOrderString = FetchXMLData(&nodeData);
+				if (!HexToInt(&calendarOrderString, &calendarOrder)){
+					calendarOrder = 0;
 				}
 				
 			}
 			
 			// Get the calendar tag.
 			
-			NodeData = xmlCopyNode(NodeMatch, 1);
+			nodeData = xmlCopyNode(nodeMatch, 1);
 			
-			string CalendarTag = "";
+			string calendarTag = "";
 			
-			if (!MatchXMLNameTransverse(&NodeData, "propstat")){ continue; }
-			if (!MatchXMLNameTransverse(&NodeData, "prop")){ continue; }
-			if (MatchXMLNameTransverse(&NodeData, "getctag")){ 
+			if (!MatchXMLNameTransverse(&nodeData, "propstat")){ continue; }
+			if (!MatchXMLNameTransverse(&nodeData, "prop")){ continue; }
+			if (MatchXMLNameTransverse(&nodeData, "getctag")){ 
 				
-				CalendarTag = FetchXMLData(&NodeData);
+				calendarTag = FetchXMLData(&nodeData);
 				
 			}
 			
 			// Get the calendar tag URL.
 			
-			NodeData = xmlCopyNode(NodeMatch, 1);
+			nodeData = xmlCopyNode(nodeMatch, 1);
 			
-			string CalendarTagURL = "";
+			string calendarTagURL = "";
 			
-			if (!MatchXMLNameTransverse(&NodeData, "propstat")){ continue; }
-			if (!MatchXMLNameTransverse(&NodeData, "prop")){ continue; }
-			if (MatchXMLNameTransverse(&NodeData, "sync-token")){ 
+			if (!MatchXMLNameTransverse(&nodeData, "propstat")){ continue; }
+			if (!MatchXMLNameTransverse(&nodeData, "prop")){ continue; }
+			if (MatchXMLNameTransverse(&nodeData, "sync-token")){ 
 				
-				CalendarTagURL = FetchXMLData(&NodeData);
+				calendarTagURL = FetchXMLData(&nodeData);
 				
 			}
 			
 			// Insert the calendar information into the
 			// list if all the information is there.
 			
-			CalendarList.Name.insert(make_pair(ResponseCount, CalendarName));
-			CalendarList.Description.insert(make_pair(ResponseCount, CalendarDescription));
-			CalendarList.HREF.insert(make_pair(ResponseCount, HREFAddress));
-			CalendarList.CalColour.insert(make_pair(ResponseCount, CalendarColour));
-			CalendarList.Order.insert(make_pair(ResponseCount, CalendarOrder));
-			CalendarList.Tag.insert(make_pair(ResponseCount, CalendarTag));
-			CalendarList.TagURL.insert(make_pair(ResponseCount, CalendarTagURL));
+			calendarList.name.insert(make_pair(responseCount, calendarName));
+			calendarList.description.insert(make_pair(responseCount, calendarDescription));
+			calendarList.href.insert(make_pair(responseCount, hrefAddress));
+			calendarList.calColour.insert(make_pair(responseCount, calendarColour));
+			calendarList.order.insert(make_pair(responseCount, calendarOrder));
+			calendarList.tag.insert(make_pair(responseCount, calendarTag));
+			calendarList.tagURL.insert(make_pair(responseCount, calendarTagURL));
 			
-			ResponseCount++;
+			responseCount++;
 			
 		}
 		
@@ -385,186 +385,186 @@ CalDAVCalendarList CalDAV::ProcessXMLCalendarList(){
 	
 	xmlFreeDoc(xmlCalDAVDoc);
 	
-	return CalendarList;
+	return calendarList;
 	
 }
 
 string CalDAV::ProcessXMLEntryETag(){
 	
-	string EntryETag;
+	string entryETag;
 	
 	xmlDocPtr xmlCalDAVDoc;
-	xmlCalDAVDoc = xmlReadMemory(ServerData.c_str(), (int)ServerData.size(), "noname.xml", NULL, 0);
+	xmlCalDAVDoc = xmlReadMemory(serverData.c_str(), (int)serverData.size(), "noname.xml", NULL, 0);
 
-	xmlNodePtr NodeSeek;
-	bool NodeFound = false;
+	xmlNodePtr nodeSeek;
+	bool nodeFound = false;
 	
 	// Start with the first node, look for multistatus.
 	
-	for (NodeSeek = xmlCalDAVDoc->children;
-		NodeSeek != NULL;
-		NodeSeek = NodeSeek->next)
+	for (nodeSeek = xmlCalDAVDoc->children;
+		nodeSeek != NULL;
+		nodeSeek = nodeSeek->next)
 	{
 	
-		if (!xmlStrcmp(NodeSeek->name, (const xmlChar *)"multistatus") ||
-			!xmlStrcmp(NodeSeek->name, (const xmlChar *)"d:multistatus") ||
-			!xmlStrcmp(NodeSeek->name, (const xmlChar *)"D:multistatus")
+		if (!xmlStrcmp(nodeSeek->name, (const xmlChar *)"multistatus") ||
+			!xmlStrcmp(nodeSeek->name, (const xmlChar *)"d:multistatus") ||
+			!xmlStrcmp(nodeSeek->name, (const xmlChar *)"D:multistatus")
 		){
 			
-			NodeFound = true;
+			nodeFound = true;
 			break;
 			
 		}
 		
 	}
 	
-	if (NodeFound == false){
+	if (nodeFound == false){
 	
-		return EntryETag;
+		return entryETag;
 
 	}
 	
 	// Look for response.
 	
-	if (NodeFound == false){ return EntryETag; } else { NodeFound = false; }
-	NodeFound = MatchXMLNameTransverse(&NodeSeek, "response");
+	if (nodeFound == false){ return entryETag; } else { nodeFound = false; }
+	nodeFound = MatchXMLNameTransverse(&nodeSeek, "response");
 
 	// Look for propstat.
 	
-	if (NodeFound == false){ return EntryETag; } else { NodeFound = false; }
-	NodeFound = MatchXMLNameTransverse(&NodeSeek, "propstat");
+	if (nodeFound == false){ return entryETag; } else { nodeFound = false; }
+	nodeFound = MatchXMLNameTransverse(&nodeSeek, "propstat");
 
 	// Look for prop.
 	
-	if (NodeFound == false){ return EntryETag; } else { NodeFound = false; }
-	NodeFound = MatchXMLNameTransverse(&NodeSeek, "prop");
+	if (nodeFound == false){ return entryETag; } else { nodeFound = false; }
+	nodeFound = MatchXMLNameTransverse(&nodeSeek, "prop");
 	
 	// Look for calendar-home-set.
 	
-	if (NodeFound == false){ return EntryETag; } else { NodeFound = false; }
-	NodeFound = MatchXMLNameTransverse(&NodeSeek, "getetag");
+	if (nodeFound == false){ return entryETag; } else { nodeFound = false; }
+	nodeFound = MatchXMLNameTransverse(&nodeSeek, "getetag");
 
 	// Get the data from href.
 	
-	EntryETag = FetchXMLData(&NodeSeek);	
+	entryETag = FetchXMLData(&nodeSeek);	
 	
 	xmlFreeDoc(xmlCalDAVDoc);	
 	
 	// Check if the entity tag contains quote marks
 	// at the start and end and remove them (if needed).
 	
-	if (EntryETag.substr(0,1) == "\"" && 
-		EntryETag.substr(EntryETag.size()-1, 1) == "\"" && EntryETag.size() > 2){
+	if (entryETag.substr(0,1) == "\"" && 
+		entryETag.substr(entryETag.size()-1, 1) == "\"" && entryETag.size() > 2){
 		
-		EntryETag.erase(EntryETag.begin());
-		EntryETag.erase(EntryETag.end()-1);
+		entryETag.erase(entryETag.begin());
+		entryETag.erase(entryETag.end()-1);
 			
 	}
 	
-	return EntryETag;
+	return entryETag;
 	
 }
 
 CalDAVEntryList CalDAV::ProcessXMLEntryList(){
 
-	CalDAVEntryList EntryList;
+	CalDAVEntryList entryList;
 	
 	xmlDocPtr xmlCalDAVDoc;
-	xmlCalDAVDoc = xmlReadMemory(ServerData.c_str(), (int)ServerData.size(), "noname.xml", NULL, 0);
+	xmlCalDAVDoc = xmlReadMemory(serverData.c_str(), (int)serverData.size(), "noname.xml", NULL, 0);
 
-	xmlNodePtr NodeSeek = NULL;
-	xmlNodePtr NodeResponse = NULL;
-	xmlNodePtr NodeMatch = NULL;
-	xmlNodePtr NodeData = NULL;
-	bool NodeFound = false;
-	int ResponseCount = 0;
+	xmlNodePtr nodeSeek = NULL;
+	xmlNodePtr nodeResponse = NULL;
+	xmlNodePtr nodeMatch = NULL;
+	xmlNodePtr nodeData = NULL;
+	bool nodeFound = false;
+	int responseCount = 0;
 	
 	// Start with the first node, look for multistatus.
 	
-	for (NodeSeek = xmlCalDAVDoc->children;
-		NodeSeek != NULL;
-		NodeSeek = NodeSeek->next)
+	for (nodeSeek = xmlCalDAVDoc->children;
+		nodeSeek != NULL;
+		nodeSeek = NodeSeek->next)
 	{
 	
-		if (!xmlStrcmp(NodeSeek->name, (const xmlChar *)"multistatus") ||
-			!xmlStrcmp(NodeSeek->name, (const xmlChar *)"d:multistatus") ||
-			!xmlStrcmp(NodeSeek->name, (const xmlChar *)"D:multistatus")
+		if (!xmlStrcmp(nodeSeek->name, (const xmlChar *)"multistatus") ||
+			!xmlStrcmp(nodeSeek->name, (const xmlChar *)"d:multistatus") ||
+			!xmlStrcmp(nodeSeek->name, (const xmlChar *)"D:multistatus")
 		){
 		
-			NodeResponse = NodeSeek->children;	
-			NodeFound = true;
+			nodeResponse = nodeSeek->children;	
+			nodeFound = true;
 			break;
 			
 		}
 		
 	}
 	
-	if (NodeFound == false){
+	if (nodeFound == false){
 	
-		return EntryList;
+		return entryList;
 
 	}
 	
-	for (NodeResponse = NodeSeek->children;
-		NodeResponse != nullptr;
-		NodeResponse = NodeResponse->next)
+	for (nodeResponse = nodeSeek->children;
+		nodeResponse != nullptr;
+		nodeResponse = nodeResponse->next)
 	{
 	
 		// Go through each of the responses and find the calendars.
 
-		NodeMatch = xmlCopyNode(NodeResponse, 1);
+		nodeMatch = xmlCopyNode(nodeResponse, 1);
 		
-		if (MatchXMLName(&NodeMatch, "response")){
+		if (MatchXMLName(&nodeMatch, "response")){
 
-			NodeData = xmlCopyNode(NodeMatch, 1);
+			nodeData = xmlCopyNode(nodeMatch, 1);
 			
 			// Get the HREF.
 			
-			NodeData = xmlCopyNode(NodeMatch, 1);
+			nodeData = xmlCopyNode(nodeMatch, 1);
 			
-			if (!MatchXMLNameTransverse(&NodeData, "href")){ continue; }
+			if (!MatchXMLNameTransverse(&nodeData, "href")){ continue; }
 						
-			string HREFAddress = FetchXMLData(&NodeData);
+			string hrefAddress = FetchXMLData(&nodeData);
 			
 			// Get the calendar data.
 			
-			NodeData = xmlCopyNode(NodeMatch, 1);
+			nodeData = xmlCopyNode(nodeMatch, 1);
 			
-			string EntryDescription = "";
+			string entryDescription = "";
 			
-			if (!MatchXMLNameTransverse(&NodeData, "propstat")){ continue; }
-			if (!MatchXMLNameTransverse(&NodeData, "prop")){ continue; }
-			if (MatchXMLNameTransverse(&NodeData, "calendar-data")){ 
+			if (!MatchXMLNameTransverse(&nodeData, "propstat")){ continue; }
+			if (!MatchXMLNameTransverse(&nodeData, "prop")){ continue; }
+			if (MatchXMLNameTransverse(&nodeData, "calendar-data")){ 
 			
 				// Note: libxml2 will strip the CDATA part at the start and
 				// end of each calendar-data section.
 				
-				EntryDescription = FetchXMLData(&NodeData);
+				entryDescription = FetchXMLData(&nodeData);
 				
 			}
 			
 			// Get the entry entity tag.
 			
-			NodeData = xmlCopyNode(NodeMatch, 1);
+			nodeData = xmlCopyNode(nodeMatch, 1);
 			
-			string EntryEntityTag = "";
+			string entryEntityTag = "";
 			
-			if (!MatchXMLNameTransverse(&NodeData, "propstat")){ continue; }
-			if (!MatchXMLNameTransverse(&NodeData, "prop")){ continue; }
-			if (MatchXMLNameTransverse(&NodeData, "getetag")){ 
+			if (!MatchXMLNameTransverse(&nodeData, "propstat")){ continue; }
+			if (!MatchXMLNameTransverse(&nodeData, "prop")){ continue; }
+			if (MatchXMLNameTransverse(&nodeData, "getetag")){ 
 				
-				EntryEntityTag = FetchXMLData(&NodeData);
+				entryEntityTag = FetchXMLData(&nodeData);
 				
 			}
 			
 			// Insert the calendar information into the
 			// list if all the information is there.
 			
-			EntryList.HREF.insert(make_pair(ResponseCount, HREFAddress));
-			EntryList.Data.insert(make_pair(ResponseCount, EntryDescription));
-			EntryList.Tag.insert(make_pair(ResponseCount, EntryEntityTag));
+			entryList.href.insert(make_pair(responseCount, hrefAddress));
+			entryList.data.insert(make_pair(responseCount, entryDescription));
+			entryList.tag.insert(make_pair(responseCount, entryEntityTag));
 			
-			ResponseCount++;
+			responseCount++;
 			
 		}
 		
@@ -572,93 +572,93 @@ CalDAVEntryList CalDAV::ProcessXMLEntryList(){
 	
 	xmlFreeDoc(xmlCalDAVDoc);
 	
-	return EntryList;
+	return entryList;
 	
 }
 
 CalDAVEntryList CalDAV::ProcessXMLSyncTokenList(){
 
-	CalDAVEntryList EntryList;
+	CalDAVEntryList entryList;
 	
 	xmlDocPtr xmlCalDAVDoc;
-	xmlCalDAVDoc = xmlReadMemory(ServerData.c_str(), (int)ServerData.size(), "noname.xml", NULL, 0);
+	xmlCalDAVDoc = xmlReadMemory(serverData.c_str(), (int)serverData.size(), "noname.xml", NULL, 0);
 
-	xmlNodePtr NodeSeek = NULL;
-	xmlNodePtr NodeResponse = NULL;
-	xmlNodePtr NodeMatch = NULL;
-	xmlNodePtr NodeData = NULL;
-	bool NodeFound = false;
-	int ResponseCount = 0;
+	xmlNodePtr nodeSeek = NULL;
+	xmlNodePtr nodeResponse = NULL;
+	xmlNodePtr nodeMatch = NULL;
+	xmlNodePtr nodeData = NULL;
+	bool nodeFound = false;
+	int responseCount = 0;
 	
 	// Start with the first node, look for multistatus.
 	
-	for (NodeSeek = xmlCalDAVDoc->children;
-		NodeSeek != NULL;
-		NodeSeek = NodeSeek->next)
+	for (nodeSeek = xmlCalDAVDoc->children;
+		nodeSeek != NULL;
+		nodeSeek = nodeSeek->next)
 	{
 	
-		if (!xmlStrcmp(NodeSeek->name, (const xmlChar *)"multistatus") ||
-			!xmlStrcmp(NodeSeek->name, (const xmlChar *)"d:multistatus") ||
-			!xmlStrcmp(NodeSeek->name, (const xmlChar *)"D:multistatus")
+		if (!xmlStrcmp(nodeSeek->name, (const xmlChar *)"multistatus") ||
+			!xmlStrcmp(nodeSeek->name, (const xmlChar *)"d:multistatus") ||
+			!xmlStrcmp(nodeSeek->name, (const xmlChar *)"D:multistatus")
 		){
 		
-			NodeResponse = NodeSeek->children;	
-			NodeFound = true;
+			nodeResponse = nodeSeek->children;	
+			nodeFound = true;
 			break;
 			
 		}
 		
 	}
 	
-	if (NodeFound == false){
+	if (nodeFound == false){
 	
-		return EntryList;
+		return entryList;
 
 	}
 	
-	for (NodeResponse = NodeSeek->children;
-		NodeResponse != nullptr;
-		NodeResponse = NodeResponse->next)
+	for (nodeResponse = nodeSeek->children;
+		nodeResponse != nullptr;
+		nodeResponse = nodeResponse->next)
 	{
 	
 		// Go through each of the responses and find the calendars.
 
-		NodeMatch = xmlCopyNode(NodeResponse, 1);
+		nodeMatch = xmlCopyNode(nodeResponse, 1);
 		
-		if (MatchXMLName(&NodeMatch, "response")){
+		if (MatchXMLName(&nodeMatch, "response")){
 
-			NodeData = xmlCopyNode(NodeMatch, 1);
+			nodeData = xmlCopyNode(nodeMatch, 1);
 			
 			// Get the HREF.
 			
-			NodeData = xmlCopyNode(NodeMatch, 1);
+			nodeData = xmlCopyNode(nodeMatch, 1);
 			
-			if (!MatchXMLNameTransverse(&NodeData, "href")){ continue; }
+			if (!MatchXMLNameTransverse(&nodeData, "href")){ continue; }
 						
-			string HREFAddress = FetchXMLData(&NodeData);
+			string hrefAddress = FetchXMLData(&nodeData);
 			
 			// Get the entry entity tag.
 			
-			NodeData = xmlCopyNode(NodeMatch, 1);
+			nodeData = xmlCopyNode(nodeMatch, 1);
 			
-			string EntryEntityTag = "";
+			string entryEntityTag = "";
 			
-			if (!MatchXMLNameTransverse(&NodeData, "propstat")){ continue; }
-			if (!MatchXMLNameTransverse(&NodeData, "prop")){ continue; }
-			if (MatchXMLNameTransverse(&NodeData, "getetag")){ 
+			if (!MatchXMLNameTransverse(&nodeData, "propstat")){ continue; }
+			if (!MatchXMLNameTransverse(&nodeData, "prop")){ continue; }
+			if (MatchXMLNameTransverse(&nodeData, "getetag")){ 
 				
-				EntryEntityTag = FetchXMLData(&NodeData);
+				entryEntityTag = FetchXMLData(&nodeData);
 				
 			}
 			
 			// Insert the calendar information into the
 			// list if all the information is there.
 			
-			EntryList.HREF.insert(make_pair(ResponseCount, HREFAddress));
-			EntryList.Data.insert(make_pair(ResponseCount, ""));
-			EntryList.Tag.insert(make_pair(ResponseCount, EntryEntityTag));
+			entryList.href.insert(make_pair(responseCount, hrefAddress));
+			entryList.data.insert(make_pair(responseCount, ""));
+			entryList.tag.insert(make_pair(responseCount, entryEntityTag));
 			
-			ResponseCount++;
+			responseCount++;
 			
 		}
 		
@@ -666,23 +666,23 @@ CalDAVEntryList CalDAV::ProcessXMLSyncTokenList(){
 	
 	xmlFreeDoc(xmlCalDAVDoc);
 	
-	return EntryList;
+	return entryList;
 	
 }
 
-bool CalDAV::MatchXMLNameTransverse(xmlNodePtr *NodePtr, string NodeName){
+bool CalDAV::MatchXMLNameTransverse(xmlNodePtr *nodePtr, string nodeName){
 
-	string NodeNameSmallD = "d:" + NodeName;
-	string NodeNameLargeD = "D:" + NodeName;
+	string nodeNameSmallD = "d:" + nodeName;
+	string nodeNameLargeD = "D:" + nodeName;
 	
-	for ((*NodePtr) = (*NodePtr)->children;
-		(*NodePtr) != NULL;
-		(*NodePtr) = (*NodePtr)->next)
+	for ((*nodePtr) = (*nodePtr)->children;
+		(*nodePtr) != NULL;
+		(*nodePtr) = (*nodePtr)->next)
 	{
 	
-		if (!xmlStrcmp((*NodePtr)->name, (const xmlChar *)NodeName.c_str()) ||
-			!xmlStrcmp((*NodePtr)->name, (const xmlChar *)NodeNameSmallD.c_str()) ||
-			!xmlStrcmp((*NodePtr)->name, (const xmlChar *)NodeNameLargeD.c_str())
+		if (!xmlStrcmp((*nodePtr)->name, (const xmlChar *)nodeName.c_str()) ||
+			!xmlStrcmp((*nodePtr)->name, (const xmlChar *)nodeNameSmallD.c_str()) ||
+			!xmlStrcmp((*nodePtr)->name, (const xmlChar *)nodeNameLargeD.c_str())
 		){
 			
 			return true;
@@ -695,22 +695,22 @@ bool CalDAV::MatchXMLNameTransverse(xmlNodePtr *NodePtr, string NodeName){
 	
 }
 
-bool CalDAV::MatchXMLName(xmlNodePtr *NodePtrOriginal, string NodeName){
+bool CalDAV::MatchXMLName(xmlNodePtr *nodePtrOriginal, string nodeName){
 
-	if (NodePtrOriginal == nullptr){
+	if (nodePtrOriginal == nullptr){
 		
 		return false;
 		
 	}
 	
-	string NodeNameSmallD = "d:" + NodeName;
-	string NodeNameLargeD = "D:" + NodeName;
+	string nodeNameSmallD = "d:" + NodeName;
+	string nodeNameLargeD = "D:" + NodeName;
 	
-	xmlNodePtr *NodePtr = NodePtrOriginal;
+	xmlNodePtr *nodePtr = nodePtrOriginal;
 	
-	if (!xmlStrcmp((*NodePtr)->name, (const xmlChar *)NodeName.c_str()) ||
-		!xmlStrcmp((*NodePtr)->name, (const xmlChar *)NodeNameSmallD.c_str()) ||
-		!xmlStrcmp((*NodePtr)->name, (const xmlChar *)NodeNameLargeD.c_str())
+	if (!xmlStrcmp((*nodePtr)->name, (const xmlChar *)nodeName.c_str()) ||
+		!xmlStrcmp((*nodePtr)->name, (const xmlChar *)nodeNameSmallD.c_str()) ||
+		!xmlStrcmp((*nodePtr)->name, (const xmlChar *)nodeNameLargeD.c_str())
 	){
 			
 		return true;
@@ -725,14 +725,14 @@ bool CalDAV::MatchXMLName(xmlNodePtr *NodePtrOriginal, string NodeName){
 	
 }
 
-string CalDAV::FetchXMLData(xmlNodePtr *NodePtr){
+string CalDAV::FetchXMLData(xmlNodePtr *nodePtr){
 
-	for ((*NodePtr) = (*NodePtr)->children;
-		(*NodePtr) != NULL;
-		(*NodePtr) = (*NodePtr)->next)
+	for ((*nodePtr) = (*nodePtr)->children;
+		(*nodePtr) != NULL;
+		(*nodePtr) = (*nodePtr)->next)
 	{
 								
-		return (const char*)(*NodePtr)->content;
+		return (const char*)(*nodePtr)->content;
 			
 	}