Make wxXmlResource::ReportError() wxXmlNode parameter const.

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

diff --git a/include/wx/xrc/xmlres.h b/include/wx/xrc/xmlres.h
index aba488cd0f048d8de54000e4f162b5a23f8694ab..a585bfaa56e40006a222f1798d423b42a5a5a072 100644 (file)
--- a/include/wx/xrc/xmlres.h
+++ b/include/wx/xrc/xmlres.h
@@ -293,10 +293,10 @@ public:
 
 protected:
     // reports input error at position 'context'
 
 protected:
     // 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);
 
     // Scans the resources list for unloaded files and loads them. Also reloads
                                const wxString& message);
 
     // Scans the resources list for unloaded files and loads them. Also reloads

diff --git a/interface/wx/xrc/xmlres.h b/interface/wx/xrc/xmlres.h
index 31672627ac5c92e2c03c514c312774fdb95b71fb..269aa39ec804b7f704e8731c8f25de658acb436e 100644 (file)
--- a/interface/wx/xrc/xmlres.h
+++ b/interface/wx/xrc/xmlres.h
@@ -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);
 };
 

diff --git a/src/xrc/xmlres.cpp b/src/xrc/xmlres.cpp
index 4aeeb37a119b3c70554ecbc0fba57b6291f77793..cc3649c9c3597b82b1a623e70ac50824f92437a4 100644 (file)
--- a/src/xrc/xmlres.cpp
+++ b/src/xrc/xmlres.cpp
@@ -90,7 +90,7 @@ const char *ATTR_INPUT_FILENAME = "__wx:filename";
 
 // helper to get filename corresponding to an XML node
 wxString
 
 // helper to get filename corresponding to an XML node
 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
     // parents and if it isn't used, it finds the root of the XML tree 'node'
 {
     // 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'


@@ -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 int line = position ? position->GetLineNumber() : -1;
                                   const wxString& message)
 {
     const int line = position ? position->GetLineNumber() : -1;