[Libreoffice-commits] core.git: Branch 'libreoffice-6-3' - vcl/qt5

[Michael Weghorn (via logerrit)]

 vcl/qt5/Qt5SvpSurface.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 1a0cd8777a6d368ea1b03620cc8df6725d74ff72
Author:     Michael Weghorn <m.weghorn at posteo.de>
AuthorDate: Wed Jun 12 17:07:56 2019 +0200
Commit:     Michael Weghorn <m.weghorn at posteo.de>
CommitDate: Thu Jun 13 07:30:21 2019 +0200

    qt5: Make it compile with '-Werror=shadow'
    
    This fixes the following issue for the GCC build with '-Werror=shadow'
    in place which does not show up in the default build setup since
    compiler flag '-Wno-shadow' is currently being set in
    'RepositoryExternal.mk' for qt5 and kde5.
    (This will be dropped in a follow-up commit.)
    
        .../libreoffice/vcl/qt5/Qt5SvpSurface.cxx: In constructor ‘cairo::Qt5SvpSurface::Qt5SvpSurface(const CairoSurfaceSharedPtr&)’:
        .../libreoffice/vcl/qt5/Qt5SvpSurface.cxx:24:69: error: declaration of ‘m_pSurface’ shadows a member of ‘cairo::Qt5SvpSurface’ [-Werror=shadow]
         Qt5SvpSurface::Qt5SvpSurface(const CairoSurfaceSharedPtr& m_pSurface)
                                                                             ^
        In file included from .../libreoffice/vcl/qt5/Qt5SvpSurface.cxx:12:
        .../libreoffice/vcl/inc/qt5/Qt5SvpSurface.hxx:27:27: note: shadowed declaration is here
             CairoSurfaceSharedPtr m_pSurface;
                                   ^~~~~~~~~~
        cc1plus: all warnings being treated as errors
    
    Change-Id: I501657447e02675f7c6b1c9aaca670ba81715590
    Reviewed-on: https://gerrit.libreoffice.org/73891
    Tested-by: Jenkins
    Reviewed-by: Michael Weghorn <m.weghorn at posteo.de>
    (cherry picked from commit cc237438f6d1c7ee3a391b51402aaa71cd347b6b)
    Reviewed-on: https://gerrit.libreoffice.org/73916

diff --git a/vcl/qt5/Qt5SvpSurface.cxx b/vcl/qt5/Qt5SvpSurface.cxx
index 62fa263c3a3c..00f6004bd2a0 100644
--- a/vcl/qt5/Qt5SvpSurface.cxx
+++ b/vcl/qt5/Qt5SvpSurface.cxx
@@ -21,10 +21,10 @@
 
 namespace cairo
 {
-Qt5SvpSurface::Qt5SvpSurface(const CairoSurfaceSharedPtr& m_pSurface)
+Qt5SvpSurface::Qt5SvpSurface(const CairoSurfaceSharedPtr& pSurface)
     : m_pGraphics(nullptr)
     , m_pCairoContext(nullptr)
-    , m_pSurface(m_pSurface)
+    , m_pSurface(pSurface)
 {
 }