From 4f90d31274ef6a5ac70762ed9567c75bc63b9d3b Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sun, 4 Oct 2020 16:00:34 +0200
Subject: [PATCH] Harmonize wxXmlDoctype ctor parameter names

Make the names more clear and similar to the names of member variables
to which they correspond and also use them consistently in the
documentation.

This reverts the changes to this interface header done in 5925893eed
(Fix various doxygen issues in the documentation, 2019-10-20).
---
 include/wx/xml/xml.h   | 10 ++++++----
 interface/wx/xml/xml.h | 12 ++++++------
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/include/wx/xml/xml.h b/include/wx/xml/xml.h
index a596ae92e4..a816ce22ff 100644
--- a/include/wx/xml/xml.h
+++ b/include/wx/xml/xml.h
@@ -241,10 +241,12 @@ class WXDLLIMPEXP_XML wxXmlDoctype
 {
 public:
     explicit
-    wxXmlDoctype(const wxString& name = wxString(),
-                 const wxString& sysid = wxString(),
-                 const wxString& pubid = wxString())
-                 : m_rootName(name), m_systemId(sysid), m_publicId(pubid)
+    wxXmlDoctype(const wxString& rootName = wxString(),
+                 const wxString& systemId = wxString(),
+                 const wxString& publicId = wxString())
+                 : m_rootName(rootName),
+                   m_systemId(systemId),
+                   m_publicId(publicId)
                  {}
 
     // Default copy ctor and assignment operators are ok.
diff --git a/interface/wx/xml/xml.h b/interface/wx/xml/xml.h
index 0eaad72423..4c58080b75 100644
--- a/interface/wx/xml/xml.h
+++ b/interface/wx/xml/xml.h
@@ -494,16 +494,16 @@ public:
     /**
         Creates and possible initializes the DOCTYPE.
 
-        @param name
+        @param rootName
             The root name.
-        @param sysid
+        @param systemId
             The system identifier.
-        @param pubid
+        @param publicId
             The public identifier.
     */
-    wxXmlDoctype(const wxString& name = wxString(),
-                 const wxString& sysid = wxString(),
-                 const wxString& pubid = wxString());
+    wxXmlDoctype(const wxString& rootName = wxString(),
+                 const wxString& systemId = wxString(),
+                 const wxString& publicId = wxString());
 
     /**
         Removes all the DOCTYPE values.