[Libreoffice-commits] core.git: shell/inc shell/source

Noel Grandin (via logerrit) logerrit at kemper.freedesktop.org
Thu Mar 12 16:45:39 UTC 2020


 shell/inc/xml_parser.hxx                   |    2 +-
 shell/source/tools/lngconvex/cmdline.hxx   |    4 ++--
 shell/source/tools/lngconvex/lngconvex.cxx |    2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit cebb74468478a2902d522b38bbedb4a2b536b392
Author:     Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Thu Mar 12 16:22:02 2020 +0200
Commit:     Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Thu Mar 12 17:44:58 2020 +0100

    Revert "loplugin:constfields in shell"
    
    This reverts commit ec7e3609917092ee00667c78ff40cd4c2f0adec1.
    
    Change-Id: I11aa028f6562f97b0d251d6b326e9aecb45d03de
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90415
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/shell/inc/xml_parser.hxx b/shell/inc/xml_parser.hxx
index b9f12a42f64c..aea4240b5c3e 100644
--- a/shell/inc/xml_parser.hxx
+++ b/shell/inc/xml_parser.hxx
@@ -97,7 +97,7 @@ private:
 
 private:
     i_xml_parser_event_handler* document_handler_;
-    XML_Parser const xml_parser_;
+    XML_Parser xml_parser_;
 
 private:
     xml_parser(const xml_parser&) = delete;
diff --git a/shell/source/tools/lngconvex/cmdline.hxx b/shell/source/tools/lngconvex/cmdline.hxx
index facc9518af8f..f36c6be46f58 100644
--- a/shell/source/tools/lngconvex/cmdline.hxx
+++ b/shell/source/tools/lngconvex/cmdline.hxx
@@ -69,8 +69,8 @@ private:
     static bool is_arg_name(const std::string& Argument);
 
 private:
-    size_t const      m_argc;
-    char** const      m_argv;
+    size_t      m_argc;
+    char**      m_argv;
 
 // prevent copy and assignment
 private:
diff --git a/shell/source/tools/lngconvex/lngconvex.cxx b/shell/source/tools/lngconvex/lngconvex.cxx
index 0fe8d2364441..8711b1ca15e2 100644
--- a/shell/source/tools/lngconvex/lngconvex.cxx
+++ b/shell/source/tools/lngconvex/lngconvex.cxx
@@ -143,7 +143,7 @@ public:
     }
 private:
     std::ios& m_IoStrm;
-    std::ios::iostate const m_OldIos;
+    std::ios::iostate m_OldIos;
 };
 
 class iso_lang_identifier


More information about the Libreoffice-commits mailing list