[Libreoffice-commits] core.git: vcl/qt5 vcl/unx

[Michael Weghorn (via logerrit)]

 vcl/qt5/Qt5Graphics_Controls.cxx |    4 ++--
 vcl/qt5/Qt5SvpVirtualDevice.hxx  |    2 +-
 vcl/unx/kf5/KF5FilePicker.cxx    |    2 +-
 vcl/unx/kf5/KF5SalFrame.hxx      |    4 ++--
 vcl/unx/kf5/KF5SalInstance.hxx   |    2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

New commits:
commit 8728f287cd490411edc419bf39511a87e98af565
Author:     Michael Weghorn <m.weghorn at posteo.de>
AuthorDate: Mon Sep 27 16:47:10 2021 +0200
Commit:     Michael Weghorn <m.weghorn at posteo.de>
CommitDate: Wed Sep 29 12:59:37 2021 +0200

    qt5/kf5: Drop 'qt5/' prefix from includes
    
    'vcl/inc/qt5' is in the include path for the qt5 and kf5
    VCL plugins, so there's no need for this (and it's not
    used in the other places, either).
    
    Change-Id: I1de3afd4399869e318dba2e7786711e65ef83c62
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/122803
    Tested-by: Jenkins
    Reviewed-by: Michael Weghorn <m.weghorn at posteo.de>

diff --git a/vcl/qt5/Qt5Graphics_Controls.cxx b/vcl/qt5/Qt5Graphics_Controls.cxx
index 5082e9340b2d..b7ab8d38ccc1 100644
--- a/vcl/qt5/Qt5Graphics_Controls.cxx
+++ b/vcl/qt5/Qt5Graphics_Controls.cxx
@@ -24,8 +24,8 @@
 #include <QtWidgets/QFrame>
 #include <QtWidgets/QLabel>
 
-#include <qt5/Qt5Tools.hxx>
-#include <qt5/Qt5GraphicsBase.hxx>
+#include <Qt5Tools.hxx>
+#include <Qt5GraphicsBase.hxx>
 #include <vcl/decoview.hxx>
 
 /**
diff --git a/vcl/qt5/Qt5SvpVirtualDevice.hxx b/vcl/qt5/Qt5SvpVirtualDevice.hxx
index f961d4ccfed2..3b76a6f5200a 100644
--- a/vcl/qt5/Qt5SvpVirtualDevice.hxx
+++ b/vcl/qt5/Qt5SvpVirtualDevice.hxx
@@ -20,7 +20,7 @@
 #pragma once
 
 #include <headless/svpvd.hxx>
-#include <qt5/Qt5SvpGraphics.hxx>
+#include <Qt5SvpGraphics.hxx>
 
 class VCL_DLLPUBLIC Qt5SvpVirtualDevice : public SvpSalVirtualDevice
 {
diff --git a/vcl/unx/kf5/KF5FilePicker.cxx b/vcl/unx/kf5/KF5FilePicker.cxx
index 20e64007bd96..c02ac7bc516b 100644
--- a/vcl/unx/kf5/KF5FilePicker.cxx
+++ b/vcl/unx/kf5/KF5FilePicker.cxx
@@ -24,7 +24,7 @@
 #include <cppuhelper/supportsservice.hxx>
 #include <osl/mutex.hxx>
 
-#include <qt5/Qt5Instance.hxx>
+#include <Qt5Instance.hxx>
 
 #include <QtWidgets/QApplication>
 #include <QtWidgets/QGridLayout>
diff --git a/vcl/unx/kf5/KF5SalFrame.hxx b/vcl/unx/kf5/KF5SalFrame.hxx
index d0fdd91978e6..613630b6c9d2 100644
--- a/vcl/unx/kf5/KF5SalFrame.hxx
+++ b/vcl/unx/kf5/KF5SalFrame.hxx
@@ -21,8 +21,8 @@
 
 #include <memory>
 
-#include <qt5/Qt5Frame.hxx>
-#include <qt5/Qt5SvpGraphics.hxx>
+#include <Qt5Frame.hxx>
+#include <Qt5SvpGraphics.hxx>
 
 class QWidget;
 
diff --git a/vcl/unx/kf5/KF5SalInstance.hxx b/vcl/unx/kf5/KF5SalInstance.hxx
index 635f51ec9bc7..3009baecd3b0 100644
--- a/vcl/unx/kf5/KF5SalInstance.hxx
+++ b/vcl/unx/kf5/KF5SalInstance.hxx
@@ -19,7 +19,7 @@
 
 #pragma once
 
-#include <qt5/Qt5Instance.hxx>
+#include <Qt5Instance.hxx>
 
 class KF5SalInstance final : public Qt5Instance
 {