29 files changed, 9 insertions, 9 deletions
diff --git a/vcl/inc/qt5/Qt5AccessibleEventListener.hxx b/vcl/inc/qt5/QtAccessibleEventListener.hxx
index 5c66d816fc2a..a73f6d31f2f8 100644
--- a/vcl/inc/qt5/Qt5AccessibleEventListener.hxx
+++ b/vcl/inc/qt5/QtAccessibleEventListener.hxx
@@ -13,7 +13,7 @@
 #include <com/sun/star/accessibility/XAccessibleEventListener.hpp>
 #include <com/sun/star/lang/EventObject.hpp>
 
-#include "Qt5AccessibleWidget.hxx"
+#include "QtAccessibleWidget.hxx"
 
 #include <cppuhelper/implbase.hxx>
 
diff --git a/vcl/inc/qt5/Qt5AccessibleWidget.hxx b/vcl/inc/qt5/QtAccessibleWidget.hxx
index 102b5658fb28..102b5658fb28 100644
--- a/vcl/inc/qt5/Qt5AccessibleWidget.hxx
+++ b/vcl/inc/qt5/QtAccessibleWidget.hxx
diff --git a/vcl/inc/qt5/Qt5Bitmap.hxx b/vcl/inc/qt5/QtBitmap.hxx
index a15deab29460..a15deab29460 100644
--- a/vcl/inc/qt5/Qt5Bitmap.hxx
+++ b/vcl/inc/qt5/QtBitmap.hxx
diff --git a/vcl/inc/qt5/Qt5Clipboard.hxx b/vcl/inc/qt5/QtClipboard.hxx
index 69c2f7a27d9e..69c2f7a27d9e 100644
--- a/vcl/inc/qt5/Qt5Clipboard.hxx
+++ b/vcl/inc/qt5/QtClipboard.hxx
diff --git a/vcl/inc/qt5/Qt5Data.hxx b/vcl/inc/qt5/QtData.hxx
index ef8ee8f6f8f1..ef8ee8f6f8f1 100644
--- a/vcl/inc/qt5/Qt5Data.hxx
+++ b/vcl/inc/qt5/QtData.hxx
diff --git a/vcl/inc/qt5/Qt5DragAndDrop.hxx b/vcl/inc/qt5/QtDragAndDrop.hxx
index 0ca1ebfb83aa..0ca1ebfb83aa 100644
--- a/vcl/inc/qt5/Qt5DragAndDrop.hxx
+++ b/vcl/inc/qt5/QtDragAndDrop.hxx
diff --git a/vcl/inc/qt5/Qt5FilePicker.hxx b/vcl/inc/qt5/QtFilePicker.hxx
index ffad1acc6f2f..ffad1acc6f2f 100644
--- a/vcl/inc/qt5/Qt5FilePicker.hxx
+++ b/vcl/inc/qt5/QtFilePicker.hxx
diff --git a/vcl/inc/qt5/Qt5Font.hxx b/vcl/inc/qt5/QtFont.hxx
index 8c9d83c595c0..f2b250f33d18 100644
--- a/vcl/inc/qt5/Qt5Font.hxx
+++ b/vcl/inc/qt5/QtFont.hxx
@@ -25,7 +25,7 @@
 
 #include <QtGui/QFont>
 
-#include "Qt5FontFace.hxx"
+#include "QtFontFace.hxx"
 
 class QtFont final : public QFont, public LogicalFontInstance
 {
diff --git a/vcl/inc/qt5/Qt5FontFace.hxx b/vcl/inc/qt5/QtFontFace.hxx
index 2f15a26e308b..2f15a26e308b 100644
--- a/vcl/inc/qt5/Qt5FontFace.hxx
+++ b/vcl/inc/qt5/QtFontFace.hxx
diff --git a/vcl/inc/qt5/Qt5Frame.hxx b/vcl/inc/qt5/QtFrame.hxx
index 3529c0d67c17..c584c1d750f9 100644
--- a/vcl/inc/qt5/Qt5Frame.hxx
+++ b/vcl/inc/qt5/QtFrame.hxx
@@ -24,7 +24,7 @@
 #include <salframe.hxx>
 #include <vclpluginapi.h>
 
-#include "Qt5Tools.hxx"
+#include "QtTools.hxx"
 
 #include <headless/svpgdi.hxx>
 #include <vcl/svapp.hxx>
diff --git a/vcl/inc/qt5/Qt5Graphics.hxx b/vcl/inc/qt5/QtGraphics.hxx
index bd459082548e..db08f8418844 100644
--- a/vcl/inc/qt5/Qt5Graphics.hxx
+++ b/vcl/inc/qt5/QtGraphics.hxx
@@ -29,7 +29,7 @@
 #include <QtGui/QPainterPath>
 #include <QtGui/QRegion>
 
-#include "Qt5GraphicsBase.hxx"
+#include "QtGraphicsBase.hxx"
 
 class PhysicalFontCollection;
 class QImage;
diff --git a/vcl/inc/qt5/Qt5GraphicsBase.hxx b/vcl/inc/qt5/QtGraphicsBase.hxx
index 73c39fb5ba80..73c39fb5ba80 100644
--- a/vcl/inc/qt5/Qt5GraphicsBase.hxx
+++ b/vcl/inc/qt5/QtGraphicsBase.hxx
diff --git a/vcl/inc/qt5/Qt5Graphics_Controls.hxx b/vcl/inc/qt5/QtGraphics_Controls.hxx
index 17039f9d6038..17039f9d6038 100644
--- a/vcl/inc/qt5/Qt5Graphics_Controls.hxx
+++ b/vcl/inc/qt5/QtGraphics_Controls.hxx
diff --git a/vcl/inc/qt5/Qt5Instance.hxx b/vcl/inc/qt5/QtInstance.hxx
index c895e1e0cd00..8ec1d98b387e 100644
--- a/vcl/inc/qt5/Qt5Instance.hxx
+++ b/vcl/inc/qt5/QtInstance.hxx
@@ -33,7 +33,7 @@
 #include <memory>
 #include <vector>
 
-#include "Qt5FilePicker.hxx"
+#include "QtFilePicker.hxx"
 
 class QtTimer;
 
diff --git a/vcl/inc/qt5/Qt5MainWindow.hxx b/vcl/inc/qt5/QtMainWindow.hxx
index ec5c9058636b..29621310b731 100644
--- a/vcl/inc/qt5/Qt5MainWindow.hxx
+++ b/vcl/inc/qt5/QtMainWindow.hxx
@@ -22,7 +22,7 @@
 #include <QtWidgets/QWidget>
 #include <QtWidgets/QMainWindow>
 
-#include "Qt5Frame.hxx"
+#include "QtFrame.hxx"
 
 class QtMainWindow final : public QMainWindow
 {
diff --git a/vcl/inc/qt5/Qt5Menu.hxx b/vcl/inc/qt5/QtMenu.hxx
index 55275ae6e099..55275ae6e099 100644
--- a/vcl/inc/qt5/Qt5Menu.hxx
+++ b/vcl/inc/qt5/QtMenu.hxx
diff --git a/vcl/inc/qt5/Qt5Object.hxx b/vcl/inc/qt5/QtObject.hxx
index 328946e4388e..328946e4388e 100644
--- a/vcl/inc/qt5/Qt5Object.hxx
+++ b/vcl/inc/qt5/QtObject.hxx
diff --git a/vcl/inc/qt5/Qt5OpenGLContext.hxx b/vcl/inc/qt5/QtOpenGLContext.hxx
index 8036d50777b9..8036d50777b9 100644
--- a/vcl/inc/qt5/Qt5OpenGLContext.hxx
+++ b/vcl/inc/qt5/QtOpenGLContext.hxx
diff --git a/vcl/inc/qt5/Qt5Painter.hxx b/vcl/inc/qt5/QtPainter.hxx
index 803c05ecc071..9702a19bdbe4 100644
--- a/vcl/inc/qt5/Qt5Painter.hxx
+++ b/vcl/inc/qt5/QtPainter.hxx
@@ -23,8 +23,8 @@
 #include <QtGui/QPainter>
 #include <QtWidgets/QWidget>
 
-#include "Qt5Frame.hxx"
-#include "Qt5Graphics.hxx"
+#include "QtFrame.hxx"
+#include "QtGraphics.hxx"
 
 class QtPainter final : public QPainter
 {
diff --git a/vcl/inc/qt5/Qt5Printer.hxx b/vcl/inc/qt5/QtPrinter.hxx
index 5aacfd44ec05..5aacfd44ec05 100644
--- a/vcl/inc/qt5/Qt5Printer.hxx
+++ b/vcl/inc/qt5/QtPrinter.hxx
diff --git a/vcl/inc/qt5/Qt5SvpGraphics.hxx b/vcl/inc/qt5/QtSvpGraphics.hxx
index ffc164c83373..23f3ccc82abd 100644
--- a/vcl/inc/qt5/Qt5SvpGraphics.hxx
+++ b/vcl/inc/qt5/QtSvpGraphics.hxx
@@ -22,7 +22,7 @@
 #include <vclpluginapi.h>
 #include <headless/svpgdi.hxx>
 
-#include "Qt5GraphicsBase.hxx"
+#include "QtGraphicsBase.hxx"
 
 class QtFrame;
 
diff --git a/vcl/inc/qt5/Qt5SvpSurface.hxx b/vcl/inc/qt5/QtSvpSurface.hxx
index 2c2b29cff386..2c2b29cff386 100644
--- a/vcl/inc/qt5/Qt5SvpSurface.hxx
+++ b/vcl/inc/qt5/QtSvpSurface.hxx
diff --git a/vcl/inc/qt5/Qt5System.hxx b/vcl/inc/qt5/QtSystem.hxx
index 6992e381c4c4..6992e381c4c4 100644
--- a/vcl/inc/qt5/Qt5System.hxx
+++ b/vcl/inc/qt5/QtSystem.hxx
diff --git a/vcl/inc/qt5/Qt5Timer.hxx b/vcl/inc/qt5/QtTimer.hxx
index 204b1bfe43ad..204b1bfe43ad 100644
--- a/vcl/inc/qt5/Qt5Timer.hxx
+++ b/vcl/inc/qt5/QtTimer.hxx
diff --git a/vcl/inc/qt5/Qt5Tools.hxx b/vcl/inc/qt5/QtTools.hxx
index 7221a8ce8dc6..7221a8ce8dc6 100644
--- a/vcl/inc/qt5/Qt5Tools.hxx
+++ b/vcl/inc/qt5/QtTools.hxx
diff --git a/vcl/inc/qt5/Qt5Transferable.hxx b/vcl/inc/qt5/QtTransferable.hxx
index 8a4410535359..8a4410535359 100644
--- a/vcl/inc/qt5/Qt5Transferable.hxx
+++ b/vcl/inc/qt5/QtTransferable.hxx
diff --git a/vcl/inc/qt5/Qt5VirtualDevice.hxx b/vcl/inc/qt5/QtVirtualDevice.hxx
index 2481f63d0657..2481f63d0657 100644
--- a/vcl/inc/qt5/Qt5VirtualDevice.hxx
+++ b/vcl/inc/qt5/QtVirtualDevice.hxx
diff --git a/vcl/inc/qt5/Qt5Widget.hxx b/vcl/inc/qt5/QtWidget.hxx
index 801cd290ff88..801cd290ff88 100644
--- a/vcl/inc/qt5/Qt5Widget.hxx
+++ b/vcl/inc/qt5/QtWidget.hxx
diff --git a/vcl/inc/qt5/Qt5XAccessible.hxx b/vcl/inc/qt5/QtXAccessible.hxx
index 4f4285e8065b..4f4285e8065b 100644
--- a/vcl/inc/qt5/Qt5XAccessible.hxx
+++ b/vcl/inc/qt5/QtXAccessible.hxx