Renamed MatchXMLName to MatchXMLNameTransverse in the CalDAV object

diff --git a/source/objects/CalDAV/CalDAV-XMLProcessing.cpp b/source/objects/CalDAV/CalDAV-XMLProcessing.cpp
index 1884533..d29f058 100644 (file)
--- a/source/objects/CalDAV/CalDAV-XMLProcessing.cpp
+++ b/source/objects/CalDAV/CalDAV-XMLProcessing.cpp
@@ -52,27 +52,27 @@ string CalDAV::ProcessXMLUserPrincipal(){
        // Look for response.
 
        if (NodeFound == false){ return UserPrincipalURI; } else { NodeFound = false; }
-       NodeFound = MatchXMLName(&NodeSeek, "response");
+       NodeFound = MatchXMLNameTransverse(&NodeSeek, "response");
 
        // Look for propstat.
        
        if (NodeFound == false){ return UserPrincipalURI; } else { NodeFound = false; }
-       NodeFound = MatchXMLName(&NodeSeek, "propstat");
+       NodeFound = MatchXMLNameTransverse(&NodeSeek, "propstat");
 
        // Look for prop.
        
        if (NodeFound == false){ return UserPrincipalURI; } else { NodeFound = false; }
-       NodeFound = MatchXMLName(&NodeSeek, "prop");
+       NodeFound = MatchXMLNameTransverse(&NodeSeek, "prop");
        
        // Look for current-user-principal.
        
        if (NodeFound == false){ return UserPrincipalURI; } else { NodeFound = false; }
-       NodeFound = MatchXMLName(&NodeSeek, "current-user-principal");
+       NodeFound = MatchXMLNameTransverse(&NodeSeek, "current-user-principal");
        
        // Look for href.       
        
        if (NodeFound == false){ return UserPrincipalURI; } else { NodeFound = false; }
-       NodeFound = MatchXMLName(&NodeSeek, "href");
+       NodeFound = MatchXMLNameTransverse(&NodeSeek, "href");
 
        // Get the data from href.
        
@@ -116,27 +116,27 @@ string CalDAV::ProcessXMLCalendarHome(){
        // Look for response.
 
        if (NodeFound == false){ return CalendarHomeURI; } else { NodeFound = false; }
-       NodeFound = MatchXMLName(&NodeSeek, "response");
+       NodeFound = MatchXMLNameTransverse(&NodeSeek, "response");
 
        // Look for propstat.
        
        if (NodeFound == false){ return CalendarHomeURI; } else { NodeFound = false; }
-       NodeFound = MatchXMLName(&NodeSeek, "propstat");
+       NodeFound = MatchXMLNameTransverse(&NodeSeek, "propstat");
 
        // Look for prop.
        
        if (NodeFound == false){ return CalendarHomeURI; } else { NodeFound = false; }
-       NodeFound = MatchXMLName(&NodeSeek, "prop");
+       NodeFound = MatchXMLNameTransverse(&NodeSeek, "prop");
        
        // Look for calendar-home-set.
        
        if (NodeFound == false){ return CalendarHomeURI; } else { NodeFound = false; }
-       NodeFound = MatchXMLName(&NodeSeek, "calendar-home-set");
+       NodeFound = MatchXMLNameTransverse(&NodeSeek, "calendar-home-set");
        
        // Look for href.       
        
        if (NodeFound == false){ return CalendarHomeURI; } else { NodeFound = false; }
-       NodeFound = MatchXMLName(&NodeSeek, "href");
+       NodeFound = MatchXMLNameTransverse(&NodeSeek, "href");
 
        // Get the data from href.
        
@@ -148,7 +148,7 @@ string CalDAV::ProcessXMLCalendarHome(){
        
 }
 
-bool CalDAV::MatchXMLName(xmlNodePtr *NodePtr, string NodeName){
+bool CalDAV::MatchXMLNameTransverse(xmlNodePtr *NodePtr, string NodeName){
 
        string NodeNameSmallD = "d:" + NodeName;
        string NodeNameLargeD = "D:" + NodeName;

diff --git a/source/objects/CalDAV/CalDAV.h b/source/objects/CalDAV/CalDAV.h
index fd7095a..a10c468 100644 (file)
--- a/source/objects/CalDAV/CalDAV.h
+++ b/source/objects/CalDAV/CalDAV.h
@@ -111,7 +111,7 @@ class CalDAV{
        private:
                string ProcessXMLUserPrincipal();
                string ProcessXMLCalendarHome();
-               bool MatchXMLName(xmlNodePtr *NodePtr, string NodeName);
+               bool MatchXMLNameTransverse(xmlNodePtr *NodePtr, string NodeName);
                string FetchXMLData(xmlNodePtr *NodePtr);
        
                CalDAVConnectionData ConnectionData;