Skip to content

Commit b56d7af

Browse files
author
nitrocaster
committed
Rename CXml -> XMLDocument.
1 parent 259afbc commit b56d7af

File tree

3 files changed

+38
-38
lines changed

3 files changed

+38
-38
lines changed

‎src/xrCore/XML/xrXMLParser.cpp

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -4,22 +4,22 @@
44
#include "xrXMLParser.h"
55

66

7-
CXml::CXml()
7+
XMLDocument::XMLDocument()
88
: m_root (NULL),
99
m_pLocalRoot (NULL)
1010
{}
1111

12-
CXml::~CXml()
12+
XMLDocument::~XMLDocument()
1313
{
1414
ClearInternal();
1515
}
1616

17-
void CXml::ClearInternal()
17+
void XMLDocument::ClearInternal()
1818
{
1919
m_Doc.Clear();
2020
}
2121

22-
void ParseFile(LPCSTR path, CMemoryWriter& W, IReader *F, CXml* xml )
22+
void ParseFile(LPCSTR path, CMemoryWriter& W, IReader *F, XMLDocument* xml )
2323
{
2424
string4096 str;
2525

@@ -56,7 +56,7 @@ void ParseFile(LPCSTR path, CMemoryWriter& W, IReader *F, CXml* xml )
5656
}
5757
}
5858

59-
void CXml::Load(LPCSTR path_alias, LPCSTR path, LPCSTR _xml_filename)
59+
void XMLDocument::Load(LPCSTR path_alias, LPCSTR path, LPCSTR _xml_filename)
6060
{
6161
shared_str fn = correct_file_name(path, _xml_filename);
6262

@@ -66,7 +66,7 @@ void CXml::Load(LPCSTR path_alias, LPCSTR path, LPCSTR _xml_filename)
6666
}
6767

6868
//èíèöèàëèçàöèÿ è çàãðóçêà XML ôàéëà
69-
void CXml::Load(LPCSTR path, LPCSTR xml_filename)
69+
void XMLDocument::Load(LPCSTR path, LPCSTR xml_filename)
7070
{
7171
xr_strcpy (m_xml_file_name, xml_filename);
7272
// Load and parse xml file
@@ -90,7 +90,7 @@ void CXml::Load(LPCSTR path, LPCSTR xml_filename)
9090
m_root = m_Doc.FirstChildElement();
9191
}
9292

93-
XML_NODE* CXml::NavigateToNode(XML_NODE* start_node, LPCSTR path, int node_index)
93+
XML_NODE* XMLDocument::NavigateToNode(XML_NODE* start_node, LPCSTR path, int node_index)
9494
{
9595
R_ASSERT3 (start_node && path, "NavigateToNode failed in XML file ",m_xml_file_name);
9696
XML_NODE* node = NULL;
@@ -134,12 +134,12 @@ XML_NODE* CXml::NavigateToNode(XML_NODE* start_node, LPCSTR path, int node_inde
134134
return node;
135135
}
136136

137-
XML_NODE* CXml::NavigateToNode(LPCSTR path, int node_index)
137+
XML_NODE* XMLDocument::NavigateToNode(LPCSTR path, int node_index)
138138
{
139139
return NavigateToNode(GetLocalRoot()?GetLocalRoot():GetRoot(), path, node_index);
140140
}
141141

142-
XML_NODE* CXml::NavigateToNodeWithAttribute(LPCSTR tag_name, LPCSTR attrib_name, LPCSTR attrib_value)
142+
XML_NODE* XMLDocument::NavigateToNodeWithAttribute(LPCSTR tag_name, LPCSTR attrib_name, LPCSTR attrib_value)
143143
{
144144

145145
XML_NODE *root = GetLocalRoot() ? GetLocalRoot() : GetRoot();
@@ -157,22 +157,22 @@ XML_NODE* CXml::NavigateToNodeWithAttribute(LPCSTR tag_name, LPCSTR attrib_name,
157157
}
158158

159159

160-
LPCSTR CXml::Read(LPCSTR path, int index, LPCSTR default_str_val)
160+
LPCSTR XMLDocument::Read(LPCSTR path, int index, LPCSTR default_str_val)
161161
{
162162
XML_NODE* node = NavigateToNode(path, index);
163163
LPCSTR result = Read(node, default_str_val);
164164
return result;
165165
}
166166

167-
LPCSTR CXml::Read(XML_NODE* start_node, LPCSTR path, int index, LPCSTR default_str_val)
167+
LPCSTR XMLDocument::Read(XML_NODE* start_node, LPCSTR path, int index, LPCSTR default_str_val)
168168
{
169169
XML_NODE* node = NavigateToNode(start_node, path, index);
170170
LPCSTR result = Read(node, default_str_val);
171171
return result;
172172
}
173173

174174

175-
LPCSTR CXml::Read(XML_NODE* node, LPCSTR default_str_val)
175+
LPCSTR XMLDocument::Read(XML_NODE* node, LPCSTR default_str_val)
176176
{
177177
if(node == NULL)
178178
return default_str_val;
@@ -188,7 +188,7 @@ LPCSTR CXml::Read(XML_NODE* node, LPCSTR default_str_val)
188188
}
189189
}
190190

191-
int CXml::ReadInt(XML_NODE* node, int default_int_val)
191+
int XMLDocument::ReadInt(XML_NODE* node, int default_int_val)
192192
{
193193
LPCSTR result_str = Read(node, NULL );
194194

@@ -198,7 +198,7 @@ int CXml::ReadInt(XML_NODE* node, int default_int_val)
198198
return atoi (result_str);
199199
}
200200

201-
int CXml::ReadInt(LPCSTR path, int index, int default_int_val)
201+
int XMLDocument::ReadInt(LPCSTR path, int index, int default_int_val)
202202
{
203203
LPCSTR result_str = Read(path, index, NULL );
204204
if(result_str==NULL)
@@ -207,7 +207,7 @@ int CXml::ReadInt(LPCSTR path, int index, int default_int_val)
207207
return atoi (result_str);
208208
}
209209

210-
int CXml::ReadInt(XML_NODE* start_node, LPCSTR path, int index, int default_int_val)
210+
int XMLDocument::ReadInt(XML_NODE* start_node, LPCSTR path, int index, int default_int_val)
211211
{
212212
LPCSTR result_str = Read(start_node, path, index, NULL );
213213
if(result_str==NULL)
@@ -216,7 +216,7 @@ int CXml::ReadInt(XML_NODE* start_node, LPCSTR path, int index, int default_int_
216216
return atoi (result_str);
217217
}
218218

219-
float CXml::ReadFlt(LPCSTR path, int index, float default_flt_val)
219+
float XMLDocument::ReadFlt(LPCSTR path, int index, float default_flt_val)
220220
{
221221
LPCSTR result_str = Read(path, index, NULL );
222222
if(result_str==NULL)
@@ -225,7 +225,7 @@ float CXml::ReadFlt(LPCSTR path, int index, float default_flt_val)
225225
return (float)atof (result_str);
226226
}
227227

228-
float CXml::ReadFlt(XML_NODE* start_node, LPCSTR path, int index, float default_flt_val)
228+
float XMLDocument::ReadFlt(XML_NODE* start_node, LPCSTR path, int index, float default_flt_val)
229229
{
230230
LPCSTR result_str = Read(start_node, path, index, NULL );
231231
if(result_str==NULL)
@@ -234,7 +234,7 @@ float CXml::ReadFlt(XML_NODE* start_node, LPCSTR path, int index, float defa
234234
return (float)atof (result_str);
235235
}
236236

237-
float CXml::ReadFlt(XML_NODE* node, float default_flt_val)
237+
float XMLDocument::ReadFlt(XML_NODE* node, float default_flt_val)
238238
{
239239
LPCSTR result_str = Read(node, NULL );
240240

@@ -244,7 +244,7 @@ float CXml::ReadFlt(XML_NODE* node, float default_flt_val)
244244
return (float)atof (result_str);
245245
}
246246

247-
LPCSTR CXml::ReadAttrib(XML_NODE* start_node, LPCSTR path, int index,
247+
LPCSTR XMLDocument::ReadAttrib(XML_NODE* start_node, LPCSTR path, int index,
248248
LPCSTR attrib, LPCSTR default_str_val)
249249
{
250250
XML_NODE* node = NavigateToNode(start_node, path, index);
@@ -254,15 +254,15 @@ LPCSTR CXml::ReadAttrib(XML_NODE* start_node, LPCSTR path, int index,
254254
}
255255

256256

257-
LPCSTR CXml::ReadAttrib(LPCSTR path, int index,
257+
LPCSTR XMLDocument::ReadAttrib(LPCSTR path, int index,
258258
LPCSTR attrib, LPCSTR default_str_val)
259259
{
260260
XML_NODE* node = NavigateToNode(path, index);
261261
LPCSTR result = ReadAttrib(node, attrib, default_str_val);
262262
return result;
263263
}
264264

265-
LPCSTR CXml::ReadAttrib(XML_NODE* node, LPCSTR attrib, LPCSTR default_str_val)
265+
LPCSTR XMLDocument::ReadAttrib(XML_NODE* node, LPCSTR attrib, LPCSTR default_str_val)
266266
{
267267
if(node == NULL)
268268
return default_str_val;
@@ -294,7 +294,7 @@ LPCSTR CXml::ReadAttrib(XML_NODE* node, LPCSTR attrib, LPCSTR default_str_val)
294294
}
295295

296296

297-
int CXml::ReadAttribInt(XML_NODE* node, LPCSTR attrib, int default_int_val)
297+
int XMLDocument::ReadAttribInt(XML_NODE* node, LPCSTR attrib, int default_int_val)
298298
{
299299
LPCSTR result_str = ReadAttrib(node, attrib, NULL);
300300

@@ -304,7 +304,7 @@ int CXml::ReadAttribInt(XML_NODE* node, LPCSTR attrib, int default_int_val)
304304
return atoi (result_str);
305305
}
306306

307-
int CXml::ReadAttribInt(LPCSTR path, int index, LPCSTR attrib, int default_int_val)
307+
int XMLDocument::ReadAttribInt(LPCSTR path, int index, LPCSTR attrib, int default_int_val)
308308
{
309309
LPCSTR result_str = ReadAttrib(path, index, attrib, NULL);
310310

@@ -315,7 +315,7 @@ int CXml::ReadAttribInt(LPCSTR path, int index, LPCSTR attrib, int default_int_v
315315
}
316316

317317

318-
int CXml::ReadAttribInt(XML_NODE* start_node, LPCSTR path, int index, LPCSTR attrib, int default_int_val)
318+
int XMLDocument::ReadAttribInt(XML_NODE* start_node, LPCSTR path, int index, LPCSTR attrib, int default_int_val)
319319
{
320320
LPCSTR result_str = ReadAttrib(start_node, path, index, attrib, NULL);
321321

@@ -324,7 +324,7 @@ int CXml::ReadAttribInt(XML_NODE* start_node, LPCSTR path, int index, LPCSTR att
324324
return atoi (result_str);
325325
}
326326

327-
float CXml::ReadAttribFlt(LPCSTR path, int index, LPCSTR attrib, float default_flt_val)
327+
float XMLDocument::ReadAttribFlt(LPCSTR path, int index, LPCSTR attrib, float default_flt_val)
328328
{
329329
LPCSTR result_str = ReadAttrib(path, index, attrib, NULL);
330330

@@ -334,7 +334,7 @@ float CXml::ReadAttribFlt(LPCSTR path, int index, LPCSTR attrib, float defaul
334334
return (float)atof (result_str);
335335
}
336336

337-
float CXml::ReadAttribFlt(XML_NODE* start_node, LPCSTR path, int index, LPCSTR attrib, float default_flt_val)
337+
float XMLDocument::ReadAttribFlt(XML_NODE* start_node, LPCSTR path, int index, LPCSTR attrib, float default_flt_val)
338338
{
339339
LPCSTR result_str = ReadAttrib(start_node, path, index, attrib, NULL);
340340

@@ -344,7 +344,7 @@ float CXml::ReadAttribFlt(XML_NODE* start_node, LPCSTR path, int index, LPCST
344344
return (float)atof (result_str);
345345
}
346346

347-
float CXml::ReadAttribFlt(XML_NODE* node, LPCSTR attrib, float default_flt_val)
347+
float XMLDocument::ReadAttribFlt(XML_NODE* node, LPCSTR attrib, float default_flt_val)
348348
{
349349
LPCSTR result_str = ReadAttrib(node, attrib, NULL);
350350

@@ -354,7 +354,7 @@ float CXml::ReadAttribFlt(XML_NODE* node, LPCSTR attrib, float default_flt_val
354354
return (float)atof (result_str);
355355
}
356356

357-
int CXml::GetNodesNum(LPCSTR path, int index, LPCSTR tag_name)
357+
int XMLDocument::GetNodesNum(LPCSTR path, int index, LPCSTR tag_name)
358358
{
359359
XML_NODE* node = NULL;
360360

@@ -374,7 +374,7 @@ int CXml::GetNodesNum(LPCSTR path, int index, LPCSTR tag_name)
374374
return GetNodesNum (node, tag_name);
375375
}
376376

377-
int CXml::GetNodesNum(XML_NODE* node, LPCSTR tag_name)
377+
int XMLDocument::GetNodesNum(XML_NODE* node, LPCSTR tag_name)
378378
{
379379
if(node == NULL) return 0;
380380

@@ -400,14 +400,14 @@ int CXml::GetNodesNum(XML_NODE* node, LPCSTR tag_name)
400400
}
401401

402402
//íàõîæäåíèå ýëåìíåòà ïî åãî àòðèáóòó
403-
XML_NODE* CXml::SearchForAttribute(LPCSTR path, int index, LPCSTR tag_name, LPCSTR attrib, LPCSTR attrib_value_pattern)
403+
XML_NODE* XMLDocument::SearchForAttribute(LPCSTR path, int index, LPCSTR tag_name, LPCSTR attrib, LPCSTR attrib_value_pattern)
404404
{
405405
XML_NODE* start_node = NavigateToNode(path, index);
406406
XML_NODE* result = SearchForAttribute(start_node, tag_name, attrib, attrib_value_pattern);
407407
return result;
408408
}
409409

410-
XML_NODE* CXml::SearchForAttribute(XML_NODE* start_node, LPCSTR tag_name, LPCSTR attrib, LPCSTR attrib_value_pattern)
410+
XML_NODE* XMLDocument::SearchForAttribute(XML_NODE* start_node, LPCSTR tag_name, LPCSTR attrib, LPCSTR attrib_value_pattern)
411411
{
412412
while (start_node)
413413
{
@@ -436,7 +436,7 @@ XML_NODE* CXml::SearchForAttribute(XML_NODE* start_node, LPCSTR tag_name, LPCSTR
436436

437437
#ifdef DEBUG // debug & mixed
438438

439-
LPCSTR CXml::CheckUniqueAttrib (XML_NODE* start_node, LPCSTR tag_name, LPCSTR attrib_name)
439+
LPCSTR XMLDocument::CheckUniqueAttrib (XML_NODE* start_node, LPCSTR tag_name, LPCSTR attrib_name)
440440
{
441441
m_AttribValues.clear_not_free ();
442442

‎src/xrCore/XML/xrXMLParser.h

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,13 @@ const LPCSTR UI_PATH = "ui";
1313
typedef TiXmlNode XML_NODE;
1414
typedef TiXmlAttribute XML_ATTRIBUTE;
1515

16-
class XRCORE_API CXml
16+
class XRCORE_API XMLDocument
1717
{
1818
void Load (LPCSTR path_alias, LPCSTR xml_filename);
1919
public:
2020
string_path m_xml_file_name;
21-
CXml ();
22-
virtual ~CXml ();
21+
XMLDocument ();
22+
virtual ~XMLDocument ();
2323
void ClearInternal ();
2424

2525
void Load (LPCSTR path_alias, LPCSTR path, LPCSTR xml_filename);
@@ -89,8 +89,8 @@ class XRCORE_API CXml
8989
public:
9090
virtual shared_str correct_file_name (LPCSTR path, LPCSTR fn) {return fn;}
9191
private:
92-
CXml (const CXml& copy);
93-
void operator= ( const CXml& copy );
92+
XMLDocument (const XMLDocument& copy);
93+
void operator= ( const XMLDocument& copy );
9494

9595
typedef TiXmlElement XML_ELEM;
9696
TiXmlDocument m_Doc;

‎src/xrGame/ui/xrUIXmlParser.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#pragma once
22
#include "xrCore/XML/xrXMLParser.h"
33

4-
class CUIXml : public CXml
4+
class CUIXml : public XMLDocument
55
{
66
int m_dbg_id;
77
public:

0 commit comments

Comments
 (0)