C++11のauto, nullptrを導入。

[tpi/lychee.git] / src / common / library / xmldoc.cpp

diff --git a/src/common/library/xmldoc.cpp b/src/common/library/xmldoc.cpp
index b365a2a..be28286 100644 (file)
--- a/src/common/library/xmldoc.cpp
+++ b/src/common/library/xmldoc.cpp
@@ -46,16 +46,16 @@ wxXmlNode * myGetFirstLib(wxXmlDocument * xmlDoc, int nLibIndex)
 {\r
        if (! xmlDoc->IsOk())\r
        {\r
-               return NULL;\r
+               return nullptr;\r
        }\r
        wxXmlNode * n = xmlDoc->GetRoot()->GetChildren();\r
-       return (n == NULL || myIsLib(n)) ? (nLibIndex <= 0 ? n : myGetNextLib(n, nLibIndex - 1)) : myGetNextLib(n, nLibIndex);\r
+       return (n == nullptr || myIsLib(n)) ? (nLibIndex <= 0 ? n : myGetNextLib(n, nLibIndex - 1)) : myGetNextLib(n, nLibIndex);\r
 }\r
 \r
 wxXmlNode * myGetNextLib(wxXmlNode * n, int nLibIndex)\r
 {\r
        n = n->GetNext();\r
-       return (n == NULL || myIsLib(n)) ? (nLibIndex <= 0 ? n : myGetNextLib(n, nLibIndex - 1)) : myGetNextLib(n, nLibIndex);\r
+       return (n == nullptr || myIsLib(n)) ? (nLibIndex <= 0 ? n : myGetNextLib(n, nLibIndex - 1)) : myGetNextLib(n, nLibIndex);\r
 }\r
 \r
 wxULongLong_t myGetAttributeInt(wxXmlNode * n, const wxString & szValue, wxULongLong_t nDefaultValue, int nBase)\r