#6502: Remove libxml2 property sheet, minor tweaks to Node file pair.

codereader · Mar 8, 2024 · 6f34491 · 6f34491
1 parent 0674a6c
commit 6f34491
Show file tree

Hide file tree

Showing 13 changed files with 5 additions and 67 deletions.
diff --git a/libs/xmlutil/Node.cpp b/libs/xmlutil/Node.cpp
@@ -28,7 +28,7 @@ NodeList Node::getChildren() const
     std::lock_guard lock(_owner->getLock());
 
     NodeList retval;
-    for (pugi::xml_node_iterator i = _xmlNode.begin(); i != _xmlNode.end(); ++i) {
+    for (auto i = _xmlNode.begin(); i != _xmlNode.end(); ++i) {
         retval.emplace_back(_owner, *i);
     }
     return retval;
@@ -53,7 +53,7 @@ NodeList Node::getNamedChildren(const std::string& name) const
 
     // Iterate throught the list of children, adding each child node to the return list if
     // it matches the requested name
-    for (pugi::xml_node_iterator i = _xmlNode.begin(); i != _xmlNode.end(); ++i) {
+    for (auto i = _xmlNode.begin(); i != _xmlNode.end(); ++i) {
         if (i->name() == name) {
             retval.emplace_back(_owner, *i);
         }

diff --git a/libs/xmlutil/Node.h b/libs/xmlutil/Node.h
@@ -17,14 +17,14 @@ class Document;
 
 /* Node
  *
- * A representation of an XML node. This class wraps an xmlNodePtr as used
- * by libxml2, and provides certain methods to access properties of the node.
+ * A representation of an XML node. This class wraps a pugixml node
+ * and provides certain methods to access properties of the node.
  */
 class Node
 {
     const Document* _owner = nullptr;
 
-    // The contained xmlNodePtr. This points to part of a wider xmlDoc
+    // The contained pugi::xml_node. This points to part of a wider document
     // structure which is not owned by this Node object.
     pugi::xml_node _xmlNode;
 

diff --git a/tools/msvc/DarkRadiant.vcxproj b/tools/msvc/DarkRadiant.vcxproj
@@ -53,7 +53,6 @@
     <Import Project="properties\DarkRadiant Base Release Win32.props" />
     <Import Project="properties\DarkRadiant Main Executable.props" />
     <Import Project="properties\wxWidgets.props" />
-    <Import Project="properties\libxml2.props" />
     <Import Project="properties\GLEW.props" />
     <Import Project="properties\ftgl.props" />
     <Import Project="properties\zlib.props" />
@@ -63,7 +62,6 @@
     <Import Project="properties\DarkRadiant Base Debug Win32.props" />
     <Import Project="properties\DarkRadiant Main Executable.props" />
     <Import Project="properties\wxWidgets.props" />
-    <Import Project="properties\libxml2.props" />
     <Import Project="properties\GLEW.props" />
     <Import Project="properties\ftgl.props" />
     <Import Project="properties\zlib.props" />
@@ -73,7 +71,6 @@
     <Import Project="properties\DarkRadiant Base Release x64.props" />
     <Import Project="properties\DarkRadiant Main Executable.props" />
     <Import Project="properties\wxWidgets.props" />
-    <Import Project="properties\libxml2.props" />
     <Import Project="properties\GLEW.props" />
     <Import Project="properties\ftgl.props" />
     <Import Project="properties\zlib.props" />
@@ -83,7 +80,6 @@
     <Import Project="properties\DarkRadiant Base Debug x64.props" />
     <Import Project="properties\DarkRadiant Main Executable.props" />
     <Import Project="properties\wxWidgets.props" />
-    <Import Project="properties\libxml2.props" />
     <Import Project="properties\GLEW.props" />
     <Import Project="properties\ftgl.props" />
     <Import Project="properties\zlib.props" />

diff --git a/tools/msvc/DarkRadiantCore.vcxproj b/tools/msvc/DarkRadiantCore.vcxproj
@@ -1200,7 +1200,6 @@
     <Import Project="properties\DarkRadiant Base Debug Win32.props" />
     <Import Project="properties\DarkRadiant Module DLL.props" />
     <Import Project="properties\DarkRadiant Core Library.props" />
-    <Import Project="properties\libxml2.props" />
     <Import Project="properties\GLEW.props" />
     <Import Project="properties\ftgl.props" />
     <Import Project="properties\zlib.props" />
@@ -1212,7 +1211,6 @@
     <Import Project="properties\DarkRadiant Base Release Win32.props" />
     <Import Project="properties\DarkRadiant Module DLL.props" />
     <Import Project="properties\DarkRadiant Core Library.props" />
-    <Import Project="properties\libxml2.props" />
     <Import Project="properties\GLEW.props" />
     <Import Project="properties\ftgl.props" />
     <Import Project="properties\zlib.props" />
@@ -1224,7 +1222,6 @@
     <Import Project="properties\DarkRadiant Base Debug x64.props" />
     <Import Project="properties\DarkRadiant Module DLL.props" />
     <Import Project="properties\DarkRadiant Core Library.props" />
-    <Import Project="properties\libxml2.props" />
     <Import Project="properties\GLEW.props" />
     <Import Project="properties\ftgl.props" />
     <Import Project="properties\zlib.props" />
@@ -1236,7 +1233,6 @@
     <Import Project="properties\DarkRadiant Base Release x64.props" />
     <Import Project="properties\DarkRadiant Module DLL.props" />
     <Import Project="properties\DarkRadiant Core Library.props" />
-    <Import Project="properties\libxml2.props" />
     <Import Project="properties\GLEW.props" />
     <Import Project="properties\ftgl.props" />
     <Import Project="properties\zlib.props" />

diff --git a/tools/msvc/Tests/Tests.vcxproj b/tools/msvc/Tests/Tests.vcxproj
@@ -34,25 +34,21 @@
     <Import Project="..\properties\DarkRadiant Base Debug x64.props" />
     <Import Project="..\properties\Tests.props" />
     <Import Project="..\properties\GLEW.props" />
-    <Import Project="..\properties\libxml2.props" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <Import Project="..\properties\DarkRadiant Base Debug Win32.props" />
     <Import Project="..\properties\Tests.props" />
     <Import Project="..\properties\GLEW.props" />
-    <Import Project="..\properties\libxml2.props" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <Import Project="..\properties\DarkRadiant Base Release Win32.props" />
     <Import Project="..\properties\Tests.props" />
     <Import Project="..\properties\GLEW.props" />
-    <Import Project="..\properties\libxml2.props" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <Import Project="..\properties\DarkRadiant Base Release x64.props" />
     <Import Project="..\properties\Tests.props" />
     <Import Project="..\properties\GLEW.props" />
-    <Import Project="..\properties\libxml2.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />

diff --git a/tools/msvc/dm.conversation.vcxproj b/tools/msvc/dm.conversation.vcxproj
@@ -54,31 +54,27 @@
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="properties\DarkRadiant Base Release Win32.props" />
     <Import Project="properties\DarkRadiant Plugin DLL.props" />
-    <Import Project="properties\libxml2.props" />
     <Import Project="properties\GLEW.props" />
     <Import Project="properties\wxWidgets.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="properties\DarkRadiant Base Debug Win32.props" />
     <Import Project="properties\DarkRadiant Plugin DLL.props" />
-    <Import Project="properties\libxml2.props" />
     <Import Project="properties\GLEW.props" />
     <Import Project="properties\wxWidgets.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="properties\DarkRadiant Base Release x64.props" />
     <Import Project="properties\DarkRadiant Plugin DLL.props" />
-    <Import Project="properties\libxml2.props" />
     <Import Project="properties\GLEW.props" />
     <Import Project="properties\wxWidgets.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="properties\DarkRadiant Base Debug x64.props" />
     <Import Project="properties\DarkRadiant Plugin DLL.props" />
-    <Import Project="properties\libxml2.props" />
     <Import Project="properties\GLEW.props" />
     <Import Project="properties\wxWidgets.props" />
   </ImportGroup>

diff --git a/tools/msvc/dm.difficulty.vcxproj b/tools/msvc/dm.difficulty.vcxproj
@@ -54,31 +54,27 @@
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="properties\DarkRadiant Base Release Win32.props" />
     <Import Project="properties\DarkRadiant Plugin DLL.props" />
-    <Import Project="properties\libxml2.props" />
     <Import Project="properties\GLEW.props" />
     <Import Project="properties\wxWidgets.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="properties\DarkRadiant Base Debug Win32.props" />
     <Import Project="properties\DarkRadiant Plugin DLL.props" />
-    <Import Project="properties\libxml2.props" />
     <Import Project="properties\GLEW.props" />
     <Import Project="properties\wxWidgets.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="properties\DarkRadiant Base Release x64.props" />
     <Import Project="properties\DarkRadiant Plugin DLL.props" />
-    <Import Project="properties\libxml2.props" />
     <Import Project="properties\GLEW.props" />
     <Import Project="properties\wxWidgets.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="properties\DarkRadiant Base Debug x64.props" />
     <Import Project="properties\DarkRadiant Plugin DLL.props" />
-    <Import Project="properties\libxml2.props" />
     <Import Project="properties\GLEW.props" />
     <Import Project="properties\wxWidgets.props" />
   </ImportGroup>

diff --git a/tools/msvc/dm.gui.vcxproj b/tools/msvc/dm.gui.vcxproj
@@ -55,31 +55,27 @@
     <Import Project="properties\DarkRadiant Base Release Win32.props" />
     <Import Project="properties\DarkRadiant Plugin DLL.props" />
     <Import Project="properties\GLEW.props" />
-    <Import Project="properties\libxml2.props" />
     <Import Project="properties\wxWidgets.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="properties\DarkRadiant Base Debug Win32.props" />
     <Import Project="properties\DarkRadiant Plugin DLL.props" />
     <Import Project="properties\GLEW.props" />
-    <Import Project="properties\libxml2.props" />
     <Import Project="properties\wxWidgets.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="properties\DarkRadiant Base Release x64.props" />
     <Import Project="properties\DarkRadiant Plugin DLL.props" />
     <Import Project="properties\GLEW.props" />
-    <Import Project="properties\libxml2.props" />
     <Import Project="properties\wxWidgets.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="properties\DarkRadiant Base Debug x64.props" />
     <Import Project="properties\DarkRadiant Plugin DLL.props" />
     <Import Project="properties\GLEW.props" />
-    <Import Project="properties\libxml2.props" />
     <Import Project="properties\wxWidgets.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />

diff --git a/tools/msvc/dm.objectives.vcxproj b/tools/msvc/dm.objectives.vcxproj
@@ -54,31 +54,27 @@
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="properties\DarkRadiant Base Release Win32.props" />
     <Import Project="properties\DarkRadiant Plugin DLL.props" />
-    <Import Project="properties\libxml2.props" />
     <Import Project="properties\GLEW.props" />
     <Import Project="properties\wxWidgets.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="properties\DarkRadiant Base Debug Win32.props" />
     <Import Project="properties\DarkRadiant Plugin DLL.props" />
-    <Import Project="properties\libxml2.props" />
     <Import Project="properties\GLEW.props" />
     <Import Project="properties\wxWidgets.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="properties\DarkRadiant Base Release x64.props" />
     <Import Project="properties\DarkRadiant Plugin DLL.props" />
-    <Import Project="properties\libxml2.props" />
     <Import Project="properties\GLEW.props" />
     <Import Project="properties\wxWidgets.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="properties\DarkRadiant Base Debug x64.props" />
     <Import Project="properties\DarkRadiant Plugin DLL.props" />
-    <Import Project="properties\libxml2.props" />
     <Import Project="properties\GLEW.props" />
     <Import Project="properties\wxWidgets.props" />
   </ImportGroup>

diff --git a/tools/msvc/dm.stimresponse.vcxproj b/tools/msvc/dm.stimresponse.vcxproj
@@ -55,31 +55,27 @@
     <Import Project="properties\DarkRadiant Base Release Win32.props" />
     <Import Project="properties\DarkRadiant Plugin DLL.props" />
     <Import Project="properties\GLEW.props" />
-    <Import Project="properties\libxml2.props" />
     <Import Project="properties\wxWidgets.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="properties\DarkRadiant Base Debug Win32.props" />
     <Import Project="properties\DarkRadiant Plugin DLL.props" />
     <Import Project="properties\GLEW.props" />
-    <Import Project="properties\libxml2.props" />
     <Import Project="properties\wxWidgets.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="properties\DarkRadiant Base Release x64.props" />
     <Import Project="properties\DarkRadiant Plugin DLL.props" />
     <Import Project="properties\GLEW.props" />
-    <Import Project="properties\libxml2.props" />
     <Import Project="properties\wxWidgets.props" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="properties\DarkRadiant Base Debug x64.props" />
     <Import Project="properties\DarkRadiant Plugin DLL.props" />
     <Import Project="properties\GLEW.props" />
-    <Import Project="properties\libxml2.props" />
     <Import Project="properties\wxWidgets.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />

diff --git a/tools/msvc/properties/libxml2.props b/tools/msvc/properties/libxml2.props
diff --git a/tools/msvc/vcs.vcxproj b/tools/msvc/vcs.vcxproj
@@ -63,7 +63,6 @@
     <Import Project="properties\DarkRadiant Plugin DLL.props" />
     <Import Project="properties\libgit2.props" />
     <Import Project="properties\wxWidgets.props" />
-    <Import Project="properties\libxml2.props" />
     <Import Project="properties\zlib.props" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -72,7 +71,6 @@
     <Import Project="properties\DarkRadiant Plugin DLL.props" />
     <Import Project="properties\libgit2.props" />
     <Import Project="properties\wxWidgets.props" />
-    <Import Project="properties\libxml2.props" />
     <Import Project="properties\zlib.props" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -81,7 +79,6 @@
     <Import Project="properties\DarkRadiant Plugin DLL.props" />
     <Import Project="properties\libgit2.props" />
     <Import Project="properties\wxWidgets.props" />
-    <Import Project="properties\libxml2.props" />
     <Import Project="properties\zlib.props" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -90,7 +87,6 @@
     <Import Project="properties\DarkRadiant Plugin DLL.props" />
     <Import Project="properties\libgit2.props" />
     <Import Project="properties\wxWidgets.props" />
-    <Import Project="properties\libxml2.props" />
     <Import Project="properties\zlib.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />