Skip to content

Commit

Permalink
fix bool->pointer convertion(clang reported this as an error instead …
Browse files Browse the repository at this point in the history
…of a warning)
  • Loading branch information
Fsu0413 committed Feb 5, 2017
1 parent 7ee9aec commit 0e00173
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions src/librmessentials/src/rmesongfile.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -146,15 +146,15 @@ RmeSongClientItemStruct *RmeXmlReader::readItem()
while (m_reader.isStartElement()) {
map[m_reader.name().toString()] = m_reader.readElementText();
if (m_reader.hasError())
return false;
return nullptr;

READNEXT(nullptr);
}

if (!m_reader.isEndElement())
return false;
return nullptr;
if (m_reader.name() != QStringLiteral("SongConfig_Client"))
return false;
return nullptr;

RmeSongClientItemStruct *item = new RmeSongClientItemStruct;
item->parseMap(map);
Expand Down Expand Up @@ -187,15 +187,15 @@ RmePapaSongClientItemStruct *RmeXmlReader::readPapaItem()
while (m_reader.isStartElement()) {
map[m_reader.name().toString()] = m_reader.readElementText();
if (m_reader.hasError())
return false;
return nullptr;

READNEXT(nullptr);
}

if (!m_reader.isEndElement())
return false;
return nullptr;
if (m_reader.name() != QStringLiteral("PapaSongConfig_Client_Tab"))
return false;
return nullptr;

RmePapaSongClientItemStruct *item = new RmePapaSongClientItemStruct;
item->parseMap(map);
Expand Down

1 comment on commit 0e00173

@Fsu0413
Copy link
Owner Author

@Fsu0413 Fsu0413 commented on 0e00173 Feb 5, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

But MSVC does not even report a single warning about this, weird.......

Please sign in to comment.