X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/43b2d5e7c3b3e3d6b245e279dde73d96e0075911..b8885bb39b61f599b16d059a17ea4d9cae7018e7:/utils/ifacecheck/src/xmlparser.cpp diff --git a/utils/ifacecheck/src/xmlparser.cpp b/utils/ifacecheck/src/xmlparser.cpp index 8f46e23c21..86247d1122 100644 --- a/utils/ifacecheck/src/xmlparser.cpp +++ b/utils/ifacecheck/src/xmlparser.cpp @@ -760,7 +760,7 @@ bool getID(unsigned long *id, const wxString& str) } // utility specialized to parse efficiently the gccXML list of IDs which occur -// in nodes like ones... i.e. numeric values separed by " _" token +// in nodes like ones... i.e. numeric values separated by " _" token bool getMemberIDs(wxClassMemberIdHashMap* map, wxClass* p, const wxString& str) { const wxStringCharType * const start = str.wx_str(); @@ -1280,7 +1280,7 @@ bool wxXmlGccInterface::ParseMethod(const wxXmlNode *p, // NOTE: gccxml is smart enough to mark as virtual those functions // which are declared virtual in base classes but don't have - // the "virtual" keyword explicitely indicated in the derived + // the "virtual" keyword explicitly indicated in the derived // classes... so we don't need any further logic for virtuals m.SetVirtual(p->GetAttribute("virtual") == "1"); @@ -1529,11 +1529,10 @@ bool wxXmlDoxygenInterface::ParseCompoundDefinition(const wxString& filename) membernode->GetAttribute("kind") == "function" && (accessSpec == "public" || accessSpec == "protected")) { - wxMethod m; if (!ParseMethod(membernode, m, header)) { wxLogError("The method '%s' could not be added to class '%s'", - m.GetName(), klass.GetName()); + m.GetName(), klass.GetName()); return false; } @@ -1548,9 +1547,11 @@ bool wxXmlDoxygenInterface::ParseCompoundDefinition(const wxString& filename) absoluteFile = header; else if (header != absoluteFile) { - wxLogError("The method '%s' is documented in a different " - "file from others (which belong to '%s') ?", - header, absoluteFile); + wxLogError("Found inconsistency in the XML file '%s': " + "the method '%s' is documented in the " + "file '%s' but the other methods of the same " + "class are documented in the file '%s'", + filename, m.GetName(), header, absoluteFile); return false; } @@ -1685,7 +1686,7 @@ bool wxXmlDoxygenInterface::ParseMethod(const wxXmlNode* p, wxMethod& m, wxStrin // NOTE: Doxygen is smart enough to mark as virtual those functions // which are declared virtual in base classes but don't have - // the "virtual" keyword explicitely indicated in the derived + // the "virtual" keyword explicitly indicated in the derived // classes... so we don't need any further logic for virtuals m.SetVirtual(p->GetAttribute("virt")=="virtual");