Skip to content

Commit 321ea88

Browse files
authored
Merge pull request #965 from leethomason/v10.0.0
V10.0.0
2 parents c2d3087 + 26985b5 commit 321ea88

File tree

178 files changed

+8389
-7374
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

178 files changed

+8389
-7374
lines changed

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
cmake_minimum_required(VERSION 3.15)
2-
project(tinyxml2 VERSION 9.0.0)
2+
project(tinyxml2 VERSION 10.0.0)
33

44
include(CTest)
55
option(tinyxml2_BUILD_TESTING "Build tests for tinyxml2" "${BUILD_TESTING}")

docs/_example_1.html

Lines changed: 28 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,16 @@
11
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "https://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
2-
<html xmlns="http://www.w3.org/1999/xhtml">
2+
<html xmlns="http://www.w3.org/1999/xhtml" lang="en-US">
33
<head>
44
<meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
5-
<meta http-equiv="X-UA-Compatible" content="IE=9"/>
6-
<meta name="generator" content="Doxygen 1.9.1"/>
5+
<meta http-equiv="X-UA-Compatible" content="IE=11"/>
6+
<meta name="generator" content="Doxygen 1.10.0"/>
77
<meta name="viewport" content="width=device-width, initial-scale=1"/>
88
<title>TinyXML-2: Load an XML File</title>
99
<link href="tabs.css" rel="stylesheet" type="text/css"/>
1010
<script type="text/javascript" src="jquery.js"></script>
1111
<script type="text/javascript" src="dynsections.js"></script>
12+
<script type="text/javascript" src="clipboard.js"></script>
13+
<script type="text/javascript" src="cookie.js"></script>
1214
<link href="search/search.css" rel="stylesheet" type="text/css"/>
1315
<script type="text/javascript" src="search/searchdata.js"></script>
1416
<script type="text/javascript" src="search/search.js"></script>
@@ -19,32 +21,32 @@
1921
<div id="titlearea">
2022
<table cellspacing="0" cellpadding="0">
2123
<tbody>
22-
<tr style="height: 56px;">
23-
<td id="projectalign" style="padding-left: 0.5em;">
24-
<div id="projectname">TinyXML-2
25-
&#160;<span id="projectnumber">9.0.0</span>
24+
<tr id="projectrow">
25+
<td id="projectalign">
26+
<div id="projectname">TinyXML-2<span id="projectnumber">&#160;10.0.0</span>
2627
</div>
2728
</td>
2829
</tr>
2930
</tbody>
3031
</table>
3132
</div>
3233
<!-- end header part -->
33-
<!-- Generated by Doxygen 1.9.1 -->
34+
<!-- Generated by Doxygen 1.10.0 -->
3435
<script type="text/javascript">
35-
/* @license magnet:?xt=urn:btih:cf05388f2679ee054f2beb29a391d25f4e673ac3&amp;dn=gpl-2.0.txt GPL-v2 */
36-
var searchBox = new SearchBox("searchBox", "search",false,'Search','.html');
36+
/* @license magnet:?xt=urn:btih:d3d9a9a6595521f9666a5e94cc830dab83b65699&amp;dn=expat.txt MIT */
37+
var searchBox = new SearchBox("searchBox", "search/",'.html');
3738
/* @license-end */
3839
</script>
3940
<script type="text/javascript" src="menudata.js"></script>
4041
<script type="text/javascript" src="menu.js"></script>
4142
<script type="text/javascript">
42-
/* @license magnet:?xt=urn:btih:cf05388f2679ee054f2beb29a391d25f4e673ac3&amp;dn=gpl-2.0.txt GPL-v2 */
43+
/* @license magnet:?xt=urn:btih:d3d9a9a6595521f9666a5e94cc830dab83b65699&amp;dn=expat.txt MIT */
4344
$(function() {
4445
initMenu('',true,false,'search.php','Search');
45-
$(document).ready(function() { init_search(); });
46+
$(function() { init_search(); });
4647
});
47-
/* @license-end */</script>
48+
/* @license-end */
49+
</script>
4850
<div id="main-nav"></div>
4951
<!-- window showing the filter options -->
5052
<div id="MSearchSelectWindow"
@@ -55,15 +57,21 @@
5557

5658
<!-- iframe showing the search results (closed by default) -->
5759
<div id="MSearchResultsWindow">
58-
<iframe src="javascript:void(0)" frameborder="0"
59-
name="MSearchResults" id="MSearchResults">
60-
</iframe>
60+
<div id="MSearchResults">
61+
<div class="SRPage">
62+
<div id="SRIndex">
63+
<div id="SRResults"></div>
64+
<div class="SRStatus" id="Loading">Loading...</div>
65+
<div class="SRStatus" id="Searching">Searching...</div>
66+
<div class="SRStatus" id="NoMatches">No Matches</div>
67+
</div>
68+
</div>
69+
</div>
6170
</div>
6271

6372
</div><!-- top -->
64-
<div class="PageDoc"><div class="header">
65-
<div class="headertitle">
66-
<div class="title">Load an XML File </div> </div>
73+
<div><div class="header">
74+
<div class="headertitle"><div class="title">Load an XML File</div></div>
6775
</div><!--header-->
6876
<div class="contents">
6977
<div class="textblock"><p> Basic XML file loading. The basic syntax to load an XML file from disk and check for an error. (ErrorID() will return 0 for no error.) </p><div class="fragment"><div class="line"><span class="keywordtype">int</span> example_1()</div>
@@ -77,7 +85,7 @@
7785
</div><!-- PageDoc -->
7886
<!-- start footer part -->
7987
<hr class="footer"/><address class="footer"><small>
80-
Generated on Sat Apr 2 2022 13:12:57 for TinyXML-2 by&#160;<a href="https://www.doxygen.org/index.html"><img class="footer" src="doxygen.svg" width="104" height="31" alt="doxygen"/></a> 1.9.1
88+
Generated on Sat Dec 30 2023 18:02:35 for TinyXML-2 by&#160;<a href="https://www.doxygen.org/index.html"><img class="footer" src="doxygen.svg" width="104" height="31" alt="doxygen"/></a> 1.10.0
8189
</small></address>
8290
</body>
8391
</html>

docs/_example_2.html

Lines changed: 28 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,16 @@
11
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "https://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
2-
<html xmlns="http://www.w3.org/1999/xhtml">
2+
<html xmlns="http://www.w3.org/1999/xhtml" lang="en-US">
33
<head>
44
<meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
5-
<meta http-equiv="X-UA-Compatible" content="IE=9"/>
6-
<meta name="generator" content="Doxygen 1.9.1"/>
5+
<meta http-equiv="X-UA-Compatible" content="IE=11"/>
6+
<meta name="generator" content="Doxygen 1.10.0"/>
77
<meta name="viewport" content="width=device-width, initial-scale=1"/>
88
<title>TinyXML-2: Parse an XML from char buffer</title>
99
<link href="tabs.css" rel="stylesheet" type="text/css"/>
1010
<script type="text/javascript" src="jquery.js"></script>
1111
<script type="text/javascript" src="dynsections.js"></script>
12+
<script type="text/javascript" src="clipboard.js"></script>
13+
<script type="text/javascript" src="cookie.js"></script>
1214
<link href="search/search.css" rel="stylesheet" type="text/css"/>
1315
<script type="text/javascript" src="search/searchdata.js"></script>
1416
<script type="text/javascript" src="search/search.js"></script>
@@ -19,32 +21,32 @@
1921
<div id="titlearea">
2022
<table cellspacing="0" cellpadding="0">
2123
<tbody>
22-
<tr style="height: 56px;">
23-
<td id="projectalign" style="padding-left: 0.5em;">
24-
<div id="projectname">TinyXML-2
25-
&#160;<span id="projectnumber">9.0.0</span>
24+
<tr id="projectrow">
25+
<td id="projectalign">
26+
<div id="projectname">TinyXML-2<span id="projectnumber">&#160;10.0.0</span>
2627
</div>
2728
</td>
2829
</tr>
2930
</tbody>
3031
</table>
3132
</div>
3233
<!-- end header part -->
33-
<!-- Generated by Doxygen 1.9.1 -->
34+
<!-- Generated by Doxygen 1.10.0 -->
3435
<script type="text/javascript">
35-
/* @license magnet:?xt=urn:btih:cf05388f2679ee054f2beb29a391d25f4e673ac3&amp;dn=gpl-2.0.txt GPL-v2 */
36-
var searchBox = new SearchBox("searchBox", "search",false,'Search','.html');
36+
/* @license magnet:?xt=urn:btih:d3d9a9a6595521f9666a5e94cc830dab83b65699&amp;dn=expat.txt MIT */
37+
var searchBox = new SearchBox("searchBox", "search/",'.html');
3738
/* @license-end */
3839
</script>
3940
<script type="text/javascript" src="menudata.js"></script>
4041
<script type="text/javascript" src="menu.js"></script>
4142
<script type="text/javascript">
42-
/* @license magnet:?xt=urn:btih:cf05388f2679ee054f2beb29a391d25f4e673ac3&amp;dn=gpl-2.0.txt GPL-v2 */
43+
/* @license magnet:?xt=urn:btih:d3d9a9a6595521f9666a5e94cc830dab83b65699&amp;dn=expat.txt MIT */
4344
$(function() {
4445
initMenu('',true,false,'search.php','Search');
45-
$(document).ready(function() { init_search(); });
46+
$(function() { init_search(); });
4647
});
47-
/* @license-end */</script>
48+
/* @license-end */
49+
</script>
4850
<div id="main-nav"></div>
4951
<!-- window showing the filter options -->
5052
<div id="MSearchSelectWindow"
@@ -55,15 +57,21 @@
5557

5658
<!-- iframe showing the search results (closed by default) -->
5759
<div id="MSearchResultsWindow">
58-
<iframe src="javascript:void(0)" frameborder="0"
59-
name="MSearchResults" id="MSearchResults">
60-
</iframe>
60+
<div id="MSearchResults">
61+
<div class="SRPage">
62+
<div id="SRIndex">
63+
<div id="SRResults"></div>
64+
<div class="SRStatus" id="Loading">Loading...</div>
65+
<div class="SRStatus" id="Searching">Searching...</div>
66+
<div class="SRStatus" id="NoMatches">No Matches</div>
67+
</div>
68+
</div>
69+
</div>
6170
</div>
6271

6372
</div><!-- top -->
64-
<div class="PageDoc"><div class="header">
65-
<div class="headertitle">
66-
<div class="title">Parse an XML from char buffer </div> </div>
73+
<div><div class="header">
74+
<div class="headertitle"><div class="title">Parse an XML from char buffer</div></div>
6775
</div><!--header-->
6876
<div class="contents">
6977
<div class="textblock"><p> Basic XML string parsing. The basic syntax to parse an XML for a char* and check for an error. (ErrorID() will return 0 for no error.) </p><div class="fragment"><div class="line"><span class="keywordtype">int</span> example_2()</div>
@@ -78,7 +86,7 @@
7886
</div><!-- PageDoc -->
7987
<!-- start footer part -->
8088
<hr class="footer"/><address class="footer"><small>
81-
Generated on Sat Apr 2 2022 13:12:57 for TinyXML-2 by&#160;<a href="https://www.doxygen.org/index.html"><img class="footer" src="doxygen.svg" width="104" height="31" alt="doxygen"/></a> 1.9.1
89+
Generated on Sat Dec 30 2023 18:02:35 for TinyXML-2 by&#160;<a href="https://www.doxygen.org/index.html"><img class="footer" src="doxygen.svg" width="104" height="31" alt="doxygen"/></a> 1.10.0
8290
</small></address>
8391
</body>
8492
</html>

docs/_example_3.html

Lines changed: 28 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,16 @@
11
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "https://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
2-
<html xmlns="http://www.w3.org/1999/xhtml">
2+
<html xmlns="http://www.w3.org/1999/xhtml" lang="en-US">
33
<head>
44
<meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
5-
<meta http-equiv="X-UA-Compatible" content="IE=9"/>
6-
<meta name="generator" content="Doxygen 1.9.1"/>
5+
<meta http-equiv="X-UA-Compatible" content="IE=11"/>
6+
<meta name="generator" content="Doxygen 1.10.0"/>
77
<meta name="viewport" content="width=device-width, initial-scale=1"/>
88
<title>TinyXML-2: Get information out of XML</title>
99
<link href="tabs.css" rel="stylesheet" type="text/css"/>
1010
<script type="text/javascript" src="jquery.js"></script>
1111
<script type="text/javascript" src="dynsections.js"></script>
12+
<script type="text/javascript" src="clipboard.js"></script>
13+
<script type="text/javascript" src="cookie.js"></script>
1214
<link href="search/search.css" rel="stylesheet" type="text/css"/>
1315
<script type="text/javascript" src="search/searchdata.js"></script>
1416
<script type="text/javascript" src="search/search.js"></script>
@@ -19,32 +21,32 @@
1921
<div id="titlearea">
2022
<table cellspacing="0" cellpadding="0">
2123
<tbody>
22-
<tr style="height: 56px;">
23-
<td id="projectalign" style="padding-left: 0.5em;">
24-
<div id="projectname">TinyXML-2
25-
&#160;<span id="projectnumber">9.0.0</span>
24+
<tr id="projectrow">
25+
<td id="projectalign">
26+
<div id="projectname">TinyXML-2<span id="projectnumber">&#160;10.0.0</span>
2627
</div>
2728
</td>
2829
</tr>
2930
</tbody>
3031
</table>
3132
</div>
3233
<!-- end header part -->
33-
<!-- Generated by Doxygen 1.9.1 -->
34+
<!-- Generated by Doxygen 1.10.0 -->
3435
<script type="text/javascript">
35-
/* @license magnet:?xt=urn:btih:cf05388f2679ee054f2beb29a391d25f4e673ac3&amp;dn=gpl-2.0.txt GPL-v2 */
36-
var searchBox = new SearchBox("searchBox", "search",false,'Search','.html');
36+
/* @license magnet:?xt=urn:btih:d3d9a9a6595521f9666a5e94cc830dab83b65699&amp;dn=expat.txt MIT */
37+
var searchBox = new SearchBox("searchBox", "search/",'.html');
3738
/* @license-end */
3839
</script>
3940
<script type="text/javascript" src="menudata.js"></script>
4041
<script type="text/javascript" src="menu.js"></script>
4142
<script type="text/javascript">
42-
/* @license magnet:?xt=urn:btih:cf05388f2679ee054f2beb29a391d25f4e673ac3&amp;dn=gpl-2.0.txt GPL-v2 */
43+
/* @license magnet:?xt=urn:btih:d3d9a9a6595521f9666a5e94cc830dab83b65699&amp;dn=expat.txt MIT */
4344
$(function() {
4445
initMenu('',true,false,'search.php','Search');
45-
$(document).ready(function() { init_search(); });
46+
$(function() { init_search(); });
4647
});
47-
/* @license-end */</script>
48+
/* @license-end */
49+
</script>
4850
<div id="main-nav"></div>
4951
<!-- window showing the filter options -->
5052
<div id="MSearchSelectWindow"
@@ -55,15 +57,21 @@
5557

5658
<!-- iframe showing the search results (closed by default) -->
5759
<div id="MSearchResultsWindow">
58-
<iframe src="javascript:void(0)" frameborder="0"
59-
name="MSearchResults" id="MSearchResults">
60-
</iframe>
60+
<div id="MSearchResults">
61+
<div class="SRPage">
62+
<div id="SRIndex">
63+
<div id="SRResults"></div>
64+
<div class="SRStatus" id="Loading">Loading...</div>
65+
<div class="SRStatus" id="Searching">Searching...</div>
66+
<div class="SRStatus" id="NoMatches">No Matches</div>
67+
</div>
68+
</div>
69+
</div>
6170
</div>
6271

6372
</div><!-- top -->
64-
<div class="PageDoc"><div class="header">
65-
<div class="headertitle">
66-
<div class="title">Get information out of XML </div> </div>
73+
<div><div class="header">
74+
<div class="headertitle"><div class="title">Get information out of XML</div></div>
6775
</div><!--header-->
6876
<div class="contents">
6977
<div class="textblock"><p> In this example, we navigate a simple XML file, and read some interesting text. Note that this example doesn't use error checking; working code should check for null pointers when walking an XML tree, or use XMLHandle.</p>
@@ -115,7 +123,7 @@
115123
</div><!-- PageDoc -->
116124
<!-- start footer part -->
117125
<hr class="footer"/><address class="footer"><small>
118-
Generated on Sat Apr 2 2022 13:12:57 for TinyXML-2 by&#160;<a href="https://www.doxygen.org/index.html"><img class="footer" src="doxygen.svg" width="104" height="31" alt="doxygen"/></a> 1.9.1
126+
Generated on Sat Dec 30 2023 18:02:35 for TinyXML-2 by&#160;<a href="https://www.doxygen.org/index.html"><img class="footer" src="doxygen.svg" width="104" height="31" alt="doxygen"/></a> 1.10.0
119127
</small></address>
120128
</body>
121129
</html>

0 commit comments

Comments
 (0)