Skip to content

Commit d10219a

Browse files
mokibitmokibit
committed
Merge branch 'add-test-data' into fix-qch-css
2 parents 149f553 + 0e658a1 commit d10219a

File tree

4 files changed

+308
-4
lines changed

4 files changed

+308
-4
lines changed

‎Makefile‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ qhelpgenerator = qhelpgenerator
2828

2929
#Version
3030

31-
VERSION=20170409
31+
VERSION=20180311
3232

3333
#STANDARD RULES
3434

@@ -126,9 +126,9 @@ release: all
126126
# zip the html output
127127
pushd "output"; \
128128
tar c$(TAR_OPTION)f "../release/html-book-$(VERSION).tar.$(TAR_FORMAT)" "reference" \
129-
"cppreference-doxygen-local.tag.xml" ; \
129+
"cppreference-doxygen-local.tag.xml" "cppreference-doxygen-web.tag.xml" ; \
130130
zip -qr "../release/html-book-$(VERSION).zip" "reference" \
131-
"cppreference-doxygen-local.tag.xml" ; \
131+
"cppreference-doxygen-local.tag.xml" "cppreference-doxygen-web.tag.xml" ; \
132132
popd
133133

134134
# zip qch

‎headers/fstream‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ typedef basic_fstream<wchar_t> wfstream;
101101
template <
102102
class CharT,
103103
class Traits = std::char_traits<CharT>
104-
> class basic_ifstream : public std::basic_ostream<CharT, Traits> {
104+
> class basic_ifstream : public std::basic_istream<CharT, Traits> {
105105
public:
106106
basic_ifstream();
107107
explicit basic_ifstream(const char* filename,

‎tests/transform_data/index-chapters-cpp.xml‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
<!--
2+
Copyright (C) 2018 Povilas Kanapickas <povilas@radix.lt>
3+
4+
This file is part of cppreference-doc
5+
6+
This work is licensed under the Creative Commons Attribution-ShareAlike 3.0
7+
Unported License. To view a copy of this license, visit
8+
http://creativecommons.org/licenses/by-sa/3.0/ or send a letter to Creative
9+
Commons, 444 Castro Street, Suite 900, Mountain View, California, 94041, USA.
10+
11+
Permission is granted to copy, distribute and/or modify this document
12+
under the terms of the GNU Free Documentation License, Version 1.3 or
13+
any later version published by the Free Software Foundation; with no
14+
Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts.
15+
-->
16+
<chapters xmlns="http://www.devhelp.net/book">
17+
<sub name="chapter1" link="chapter1_link" />
18+
<sub name="chapter2" link="chapter2_link">
19+
<sub name="chapter2_1" link="chapter2_1_link"/>
20+
<sub name="chapter2_2" link="chapter2_2_link"/>
21+
<sub name="chapter2_3" link="chapter2_3_link">
22+
<sub name="chapter2_3_1" link="chapter2_3_1_link">
23+
<sub name="chapter2_3_2" link="chapter2_3_2_link">
24+
</sub>
25+
</sub>
26+
<sub name="chapter3" link="chapter2_link"/>
27+
</chapters>

‎tests/transform_data/index-functions-cpp.xml‎

Lines changed: 277 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,277 @@
1+
<?xml version="1.0" encoding="utf-8" ?>
2+
<!--
3+
Copyright (C) 2018 Povilas Kanapickas <povilas@radix.lt>
4+
5+
This file is part of cppreference-doc
6+
7+
This work is licensed under the Creative Commons Attribution-ShareAlike 3.0
8+
Unported License. To view a copy of this license, visit
9+
http://creativecommons.org/licenses/by-sa/3.0/ or send a letter to Creative
10+
Commons, 444 Castro Street, Suite 900, Mountain View, California, 94041, USA.
11+
12+
Permission is granted to copy, distribute and/or modify this document
13+
under the terms of the GNU Free Documentation License, Version 1.3 or
14+
any later version published by the Free Software Foundation; with no
15+
Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts.
16+
-->
17+
18+
<!--
19+
For the documentation of the schema, see the accompanying
20+
index-function.README file
21+
-->
22+
<index>
23+
<const name="my::my_const" link="path/cxx/my_const"/>
24+
<const name="my::my_const_cxx11" link="path/cxx/my_const11" since="c++11"/>
25+
<const name="my::my_const_cxx17" link="path/cxx/my_const17" since="c++17"/>
26+
27+
<function name="my::my_function" link="path/cxx/my_function"/>
28+
<function name="my::my_function_cxx11" link="path/cxx/my_function11" since="c++11"/>
29+
<function name="my::my_function_cxx17" link="path/cxx/my_function17" since="c++17"/>
30+
31+
<!-- enum -->
32+
<enum name="my::my_enum" link="path/cxx/my_enum">
33+
<const name="const_rel_auto"/>
34+
<const name="const_rel" link="const_rel"/>
35+
<const name="const_abs" link="path/cxx/abs_const"/>
36+
<const name="const_same" link="."/>
37+
38+
<const name="const_rel_auto11" since="c++11"/>
39+
<const name="const_rel11" link="const_rel11" since="c++11"/>
40+
<const name="const_abs11" link="path/cxx/abs_const11" since="c++11"/>
41+
<const name="const_same11" link="." since="c++11"/>
42+
43+
<const name="const_rel_auto17" since="c++17"/>
44+
<const name="const_rel17" link="const_rel17" since="c++17"/>
45+
<const name="const_abs17" link="path/cxx/abs_const17" since="c++17"/>
46+
<const name="const_same17" link="." since="c++17"/>
47+
</enum>
48+
49+
<enum name="my::my_enum_cxx11" link="path/cxx/my_enum11" since="c++11">
50+
<const name="const_rel_auto"/>
51+
<const name="const_rel" link="const_rel"/>
52+
<const name="const_abs" link="path/cxx/abs_const"/>
53+
<const name="const_same" link="."/>
54+
</enum>
55+
56+
<enum name="my::my_enum_cxx17" link="path/cxx/my_enum17" since="c++17">
57+
<const name="const_rel_auto"/>
58+
<const name="const_rel" link="const_rel"/>
59+
<const name="const_abs" link="path/cxx/abs_const"/>
60+
<const name="const_same" link="."/>
61+
</enum>
62+
63+
<!-- class -->
64+
<overload name="my::my_overloaded_function" link="path/cxx/my_overloaded_function"/>
65+
<overload name="my::my_overloaded_function_rel" link="path/cxx/my_overloaded_function_rel"/>
66+
<overload name="my::my_overloaded_function_relauto" link="path/cxx/my_overloaded_function_relauto"/>
67+
<overload name="my::my_overloaded_function_abs" link="path/cxx/my_overloaded_function_abs"/>
68+
69+
<overload name="my::my_overloaded_function11" link="path/cxx/my_overloaded_function11"/>
70+
<overload name="my::my_overloaded_function_rel11" link="path/cxx/my_overloaded_function_rel11"/>
71+
<overload name="my::my_overloaded_function_relauto11" link="path/cxx/my_overloaded_function_relauto11"/>
72+
<overload name="my::my_overloaded_function_abs11" link="path/cxx/my_overloaded_function_abs11"/>
73+
74+
<overload name="my::my_overloaded_function17" link="path/cxx/my_overloaded_function17"/>
75+
<overload name="my::my_overloaded_function_rel17" link="path/cxx/my_overloaded_function_rel17"/>
76+
<overload name="my::my_overloaded_function_relauto17" link="path/cxx/my_overloaded_function_relauto17"/>
77+
<overload name="my::my_overloaded_function_abs17" link="path/cxx/my_overloaded_function_abs17"/>
78+
79+
<class name="my::my_specialized_class" link="path/cxx/my_specialized_class"/>
80+
<class name="my::my_specialized_class_rel" link="path/cxx/my_specialized_class_rel"/>
81+
<class name="my::my_specialized_class_relauto" link="path/cxx/my_specialized_class_relauto"/>
82+
<class name="my::my_specialized_class_abs" link="path/cxx/my_specialized_class_abs"/>
83+
84+
<class name="my::my_specialized_class11" link="path/cxx/my_specialized_class11"/>
85+
<class name="my::my_specialized_class_rel11" link="path/cxx/my_specialized_class_rel11"/>
86+
<class name="my::my_specialized_class_relauto11" link="path/cxx/my_specialized_class_relauto11"/>
87+
<class name="my::my_specialized_class_abs11" link="path/cxx/my_specialized_class_abs11"/>
88+
89+
<class name="my::my_specialized_class17" link="path/cxx/my_specialized_class17"/>
90+
<class name="my::my_specialized_class_rel17" link="path/cxx/my_specialized_class_rel17"/>
91+
<class name="my::my_specialized_class_relauto17" link="path/cxx/my_specialized_class_relauto17"/>
92+
<class name="my::my_specialized_class_abs17" link="path/cxx/my_specialized_class_abs17"/>
93+
94+
<class name="my::my_class" link="path/cxx/my_class">
95+
<const name="const_rel_auto"/>
96+
<const name="const_rel" link="const_rel"/>
97+
<const name="const_abs" link="path/cxx/abs_const"/>
98+
<const name="const_same" link="."/>
99+
100+
<const name="const_rel_auto11" since="c++11"/>
101+
<const name="const_rel11" link="const_rel11" since="c++11"/>
102+
<const name="const_abs11" link="path/cxx/abs_const11" since="c++11"/>
103+
<const name="const_same11" link="." since="c++11"/>
104+
105+
<const name="const_rel_auto17" since="c++17"/>
106+
<const name="const_rel17" link="const_rel17" since="c++17"/>
107+
<const name="const_abs17" link="path/cxx/abs_const17" since="c++17"/>
108+
<const name="const_same17" link="." since="c++17"/>
109+
110+
<function name="function_rel_auto"/>
111+
<function name="function_rel" link="function_rel"/>
112+
<function name="function_abs" link="path/cxx/abs_function"/>
113+
<function name="function_same" link="."/>
114+
115+
<function name="function_rel_auto11" since="c++11"/>
116+
<function name="function_rel11" link="function_rel11" since="c++11"/>
117+
<function name="function_abs11" link="path/cxx/abs_function11" since="c++11"/>
118+
<function name="function_same11" link="." since="c++11"/>
119+
120+
<function name="function_rel_auto17" since="c++17"/>
121+
<function name="function_rel17" link="function_rel17" since="c++17"/>
122+
<function name="function_abs17" link="path/cxx/abs_function17" since="c++17"/>
123+
<function name="function_same17" link="." since="c++17"/>
124+
125+
<variable name="variable_rel_auto"/>
126+
<variable name="variable_rel" link="variable_rel"/>
127+
<variable name="variable_abs" link="path/cxx/abs_variable"/>
128+
<variable name="variable_same" link="."/>
129+
130+
<variable name="variable_rel_auto11" since="c++11"/>
131+
<variable name="variable_rel11" link="variable_rel11" since="c++11"/>
132+
<variable name="variable_abs11" link="path/cxx/abs_variable11" since="c++11"/>
133+
<variable name="variable_same11" link="." since="c++11"/>
134+
135+
<variable name="variable_rel_auto17" since="c++17"/>
136+
<variable name="variable_rel17" link="variable_rel17" since="c++17"/>
137+
<variable name="variable_abs17" link="path/cxx/abs_variable17" since="c++17"/>
138+
<variable name="variable_same17" link="." since="c++17"/>
139+
140+
<overload name="my::my_overloaded_function"/>
141+
<overload name="my::my_overloaded_function_rel" link="my_overloaded_function_rel"/>
142+
<overload name="my::my_overloaded_function_relauto" link="."/>
143+
<overload name="my::my_overloaded_function_abs" link="path/cxx/my_overloaded_function_abs"/>
144+
145+
<overload name="my::my_overloaded_function11" since="c++11"/>
146+
<overload name="my::my_overloaded_function_rel11" link="my_overloaded_function_rel11" since="c++11"/>
147+
<overload name="my::my_overloaded_function_relauto11" link="." since="c++11"/>
148+
<overload name="my::my_overloaded_function_abs11" link="path/cxx/my_overloaded_function_abs11" since="c++11"/>
149+
150+
<overload name="my::my_overloaded_function17" since="c++17"/>
151+
<overload name="my::my_overloaded_function_rel17" link="my_overloaded_function_rel17" since="c++17"/>
152+
<overload name="my::my_overloaded_function_relauto17" link="." since="c++17"/>
153+
<overload name="my::my_overloaded_function_abs17" link="path/cxx/my_overloaded_function_abs17" since="c++17"/>
154+
155+
<specialization name="my::my_specialized_class"/>
156+
<specialization name="my::my_specialized_class_rel" link="my_specialized_class_rel"/>
157+
<specialization name="my::my_specialized_class_relauto" link="."/>
158+
<specialization name="my::my_specialized_class_abs" link="path/cxx/my_specialized_class_abs"/>
159+
160+
<specialization name="my::my_specialized_class11" since="c++11"/>
161+
<specialization name="my::my_specialized_class_rel11" link="my_specialized_class_rel11" since="c++11"/>
162+
<specialization name="my::my_specialized_class_relauto11" link="." since="c++11"/>
163+
<specialization name="my::my_specialized_class_abs11" link="path/cxx/my_specialized_class_abs11" since="c++11"/>
164+
165+
<specialization name="my::my_specialized_class17" since="c++17"/>
166+
<specialization name="my::my_specialized_class_rel17" link="my_specialized_class_rel17" since="c++17"/>
167+
<specialization name="my::my_specialized_class_relauto17" link="." since="c++17"/>
168+
<specialization name="my::my_specialized_class_abs17" link="path/cxx/my_specialized_class_abs17" since="c++17"/>
169+
170+
<class names="my::my_child_class" link="path/cxx/my_child_class">
171+
<const name="child_const_rel_auto"/>
172+
<const name="child_const_rel" link="child_const_rel"/>
173+
<const name="child_const_abs" link="path/cxx/abs_child_const"/>
174+
<const name="child_const_same" link="."/>
175+
176+
<const name="child_const_rel_auto11" since="c++11"/>
177+
<const name="child_const_rel11" link="child_const_rel11" since="c++11"/>
178+
<const name="child_const_abs11" link="path/cxx/abs_child_const11" since="c++11"/>
179+
<const name="child_const_same11" link="." since="c++11"/>
180+
181+
<const name="child_const_rel_auto17" since="c++17"/>
182+
<const name="child_const_rel17" link="child_const_rel17" since="c++17"/>
183+
<const name="child_const_abs17" link="path/cxx/abs_child_const17" since="c++17"/>
184+
<const name="child_const_same17" link="." since="c++17"/>
185+
186+
<function name="child_function_rel_auto"/>
187+
<function name="child_function_rel" link="child_function_rel"/>
188+
<function name="child_function_abs" link="path/cxx/abs_child_function"/>
189+
<function name="child_function_same" link="."/>
190+
191+
<function name="child_function_rel_auto11" since="c++11"/>
192+
<function name="child_function_rel11" link="child_function_rel11" since="c++11"/>
193+
<function name="child_function_abs11" link="path/cxx/abs_child_function11" since="c++11"/>
194+
<function name="child_function_same11" link="." since="c++11"/>
195+
196+
<function name="child_function_rel_auto17" since="c++17"/>
197+
<function name="child_function_rel17" link="child_function_rel17" since="c++17"/>
198+
<function name="child_function_abs17" link="path/cxx/abs_child_function17" since="c++17"/>
199+
<function name="child_function_same17" link="." since="c++17"/>
200+
201+
<variable name="child_variable_rel_auto"/>
202+
<variable name="child_variable_rel" link="child_variable_rel"/>
203+
<variable name="child_variable_abs" link="path/cxx/abs_child_variable"/>
204+
<variable name="child_variable_same" link="."/>
205+
206+
<variable name="child_variable_rel_auto11" since="c++11"/>
207+
<variable name="child_variable_rel11" link="child_variable_rel11" since="c++11"/>
208+
<variable name="child_variable_abs11" link="path/cxx/abs_child_variable11" since="c++11"/>
209+
<variable name="child_variable_same11" link="." since="c++11"/>
210+
211+
<variable name="child_variable_rel_auto17" since="c++17"/>
212+
<variable name="child_variable_rel17" link="child_variable_rel17" since="c++17"/>
213+
<variable name="child_variable_abs17" link="path/cxx/abs_child_variable17" since="c++17"/>
214+
<variable name="child_variable_same17" link="." since="c++17"/>
215+
</class>
216+
217+
<enum names="my::my_child_enum" link="path/cxx/my_child_enum">
218+
<const name="const_rel_auto"/>
219+
<const name="const_rel" link="const_rel"/>
220+
<const name="const_abs" link="path/cxx/const_abs"/>
221+
<const name="const_same" link="."/>
222+
223+
<const name="const_rel_auto11" since="c++11"/>
224+
<const name="const_rel11" link="child_const_rel11" since="c++11"/>
225+
<const name="const_abs11" link="path/cxx/child_const_abs11" since="c++11"/>
226+
<const name="const_same11" link="." since="c++11"/>
227+
228+
<const name="const_rel_auto17" since="c++17"/>
229+
<const name="const_rel17" link="child_const_rel17" since="c++17"/>
230+
<const name="const_abs17" link="path/cxx/child_const_abs17" since="c++17"/>
231+
<const name="const_same17" link="." since="c++17"/>
232+
</enum>
233+
</class>
234+
235+
<class name="my::my_class_cxx11" link="path/cxx/my_class11" since="c++11">
236+
<const name="const_rel_auto"/>
237+
<const name="const_rel" link="rel_const"/>
238+
<const name="const_abs" link="path/cxx/abs_const"/>
239+
<const name="const_same" link="."/>
240+
241+
<function name="function_rel_auto"/>
242+
<function name="function_rel" link="function_rel"/>
243+
<function name="function_abs" link="path/cxx/abs_function"/>
244+
<function name="function_same" link="."/>
245+
</class>
246+
247+
<class name="my::my_class_cxx17" link="path/cxx/my_class17" since="c++17">
248+
<const name="const_rel_auto"/>
249+
<const name="const_rel" link="rel_const"/>
250+
<const name="const_abs" link="path/cxx/abs_const"/>
251+
<const name="const_same" link="."/>
252+
253+
<function name="function_rel_auto"/>
254+
<function name="function_rel" link="function_rel"/>
255+
<function name="function_abs" link="path/cxx/abs_function"/>
256+
<function name="function_same" link="."/>
257+
</class>
258+
259+
<class name="my::my_class_inherit" link="path/cxx/my_class_inherit">
260+
<constructor/>
261+
<destructor/>
262+
<inherits name="my::my_class"/>
263+
</class>
264+
265+
<!-- typedef -->
266+
<typedef name="my::my_class_typedef" alias="std::my_class"/>
267+
<typedef name="my::my_class_typedef11" alias="std::my_class" since="c++11"/>
268+
<typedef name="my::my_class_typedef17" alias="std::my_class" since="c++17"/>
269+
270+
<typedef name="my::my_class_inherit_typedef" alias="std::my_class_inherit"/>
271+
<typedef name="my::my_class_inherit_typedef11" alias="std::my_class_inherit" since="c++11"/>
272+
<typedef name="my::my_class_inherit_typedef17" alias="std::my_class_inherit" since="c++17"/>
273+
274+
<typedef name="my::my_enum_typedef" alias="std::my_enum"/>
275+
<typedef name="my::my_enum_typedef11" alias="std::my_enum" since="c++11"/>
276+
<typedef name="my::my_enum_typedef17" alias="std::my_enum" since="c++17"/>
277+
</index>

0 commit comments

Comments
 (0)