ALL: Sync with ScummVM - rev. 2586ca2345

This commit is contained in:
Bastien Bouclet committed 2018-07-31 21:09:37 +02:00
1 parent ff56446d6a
commit 53759fe53a
214 files changed
+17297 -12700

No files matched your search

+5 -5
View File
@@ -74,7 +74,7 @@ bool XMLParser::loadStream(SeekableReadStream *stream) {
void XMLParser::close() {
delete _stream;
_stream = 0;
_stream = nullptr;
}
bool XMLParser::parserError(const String &errStr) {
@@ -299,13 +299,13 @@ bool XMLParser::closeKey() {
}
bool XMLParser::parse() {
if (_stream == 0)
if (_stream == nullptr)
return false;
// Make sure we are at the start of the stream.
_stream->seek(0, SEEK_SET);
if (_XMLkeys == 0)
if (_XMLkeys == nullptr)
buildLayout();
while (!_activeKey.empty())
@@ -373,12 +373,12 @@ bool XMLParser::parse() {
break;
}
} else {
ParserNode *node = allocNode(); //new ParserNode;
ParserNode *node = allocNode(); // new ParserNode;
node->name = _token;
node->ignore = false;
node->header = activeHeader;
node->depth = _activeKey.size();
node->layout = 0;
node->layout = nullptr;
_activeKey.push(node);
}