[Libreoffice-commits] core.git: Branch 'distro/lhm/libreoffice-5-2+backports' - vcl/unx

[Libreoffice Gerrit user]

 vcl/unx/gtk3_kde5/kde5_filepicker_ipc.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 948136680a92b9bc20691eebe4ce2f4cd7424844
Author:     Thorsten Behrens <Thorsten.Behrens at CIB.de>
AuthorDate: Tue Oct 30 11:22:13 2018 +0100
Commit:     Thorsten Behrens <Thorsten.Behrens at CIB.de>
CommitDate: Tue Oct 30 11:22:13 2018 +0100

    kde5: fix -Werror=shadow
    
    Change-Id: I923a6c9df797653cb2cc421cc8a0a9f4d37889b6

diff --git a/vcl/unx/gtk3_kde5/kde5_filepicker_ipc.cxx b/vcl/unx/gtk3_kde5/kde5_filepicker_ipc.cxx
index 803e5bedd853..261fe001795d 100644
--- a/vcl/unx/gtk3_kde5/kde5_filepicker_ipc.cxx
+++ b/vcl/unx/gtk3_kde5/kde5_filepicker_ipc.cxx
@@ -195,8 +195,8 @@ void readCommands(FilePickerIpc* ipc)
     }
 }
 
-FilePickerIpc::FilePickerIpc(KDE5FilePicker* filePicker, QObject* parent)
-    : QObject(parent)
+FilePickerIpc::FilePickerIpc(KDE5FilePicker* filePicker, QObject* _parent)
+    : QObject(_parent)
     , m_filePicker(filePicker)
 {
     // required to be able to pass those via signal/slot