Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make wxXmlResource::ReportError() wxXmlNode parameter const.

Browse Source 
This function (and the related DoReportError()) doesn't need to modify its
"context" argument so take a const-pointer in it.

See #11431.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66058 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2010-11-07 14:00:43 +00:00
parent 62d3301bf9
commit 1f6ea93556
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/wx/xrc/xmlres.h
View File

@@ -293,10 +293,10 @@ public:
protected: protected:
// reports input error at position 'context' // reports input error at position 'context'
void ReportError(wxXmlNode *context, const wxString& message); void ReportError(const wxXmlNode *context, const wxString& message);
// override this in derived class to customize errors reporting // override this in derived class to customize errors reporting
virtual void DoReportError(const wxString& xrcFile, wxXmlNode *position, virtual void DoReportError(const wxString& xrcFile, const wxXmlNode *position,
const wxString& message); const wxString& message);
// Scans the resources list for unloaded files and loads them. Also reloads // Scans the resources list for unloaded files and loads them. Also reloads

4
interface/wx/xrc/xmlres.h
View File

@@ -388,7 +388,7 @@ protected:
@see wxXmlResourceHandler::ReportError(), DoReportError() @see wxXmlResourceHandler::ReportError(), DoReportError()
*/ */
void ReportError(wxXmlNode *context, const wxString& message); void ReportError(const wxXmlNode *context, const wxString& message);
/** /**
Implementation of XRC resources errors reporting. Implementation of XRC resources errors reporting.
@@ -416,7 +416,7 @@ protected:
@see ReportError() @see ReportError()
*/ */
virtual void DoReportError(const wxString& xrcFile, wxXmlNode *position, virtual void DoReportError(const wxString& xrcFile, const wxXmlNode *position,
const wxString& message); const wxString& message);
}; };

6
src/xrc/xmlres.cpp
View File

@@ -90,7 +90,7 @@ const char *ATTR_INPUT_FILENAME = "__wx:filename";
// helper to get filename corresponding to an XML node // helper to get filename corresponding to an XML node
wxString wxString
GetFileNameFromNode(wxXmlNode *node, const wxXmlResourceDataRecords& files) GetFileNameFromNode(const wxXmlNode *node, const wxXmlResourceDataRecords& files)
{ {
// this loop does two things: it looks for ATTR_INPUT_FILENAME among // this loop does two things: it looks for ATTR_INPUT_FILENAME among
// parents and if it isn't used, it finds the root of the XML tree 'node' // parents and if it isn't used, it finds the root of the XML tree 'node'
@@ -1944,7 +1944,7 @@ void wxXmlResourceHandler::ReportParamError(const wxString& param,
m_resource->ReportError(GetParamNode(param), message); m_resource->ReportError(GetParamNode(param), message);
} }
void wxXmlResource::ReportError(wxXmlNode *context, const wxString& message) void wxXmlResource::ReportError(const wxXmlNode *context, const wxString& message)
{ {
if ( !context ) if ( !context )
{ {
@@ -1960,7 +1960,7 @@ void wxXmlResource::ReportError(wxXmlNode *context, const wxString& message)
DoReportError(filename, context, message); DoReportError(filename, context, message);
} }
void wxXmlResource::DoReportError(const wxString& xrcFile, wxXmlNode *position, void wxXmlResource::DoReportError(const wxString& xrcFile, const wxXmlNode *position,
const wxString& message) const wxString& message)
{ {
const int line = position ? position->GetLineNumber() : -1; const int line = position ? position->GetLineNumber() : -1;