diff options
author | Michael Weghorn <m.weghorn@posteo.de> | 2021-09-28 15:55:43 +0200 |
---|---|---|
committer | Michael Weghorn <m.weghorn@posteo.de> | 2021-09-29 13:50:28 +0200 |
commit | b9cd02937b358ae035ed554a28037237a6c8434c (patch) | |
tree | 5dc296220e1af8dfaa5605180194c2426a60f499 /vcl/qt5 | |
parent | dfd3fdfe664e214ca1bba72b96d19b89ff25e7bc (diff) |
qt5: Rename sources + headers according to new class names
This renames the source and header files according to the
new class names without a "5" in them, as mentioned in
Change-Id: Idf422f82ca9dafbb70e9a64de9c8cfc4cc8c0909
(qt5: Remove "5" from class names in qt5 VCL plugin):
> Renaming the headers and source files will be done
> in a separate commit to make tracking git history easier.
Change-Id: If955e77c8ba508d0a2e01e3a9df1be6dc04c4e4e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/122806
Tested-by: Jenkins
Reviewed-by: Michael Weghorn <m.weghorn@posteo.de>
Diffstat (limited to 'vcl/qt5')
-rw-r--r-- | vcl/qt5/QtAccessibleEventListener.cxx (renamed from vcl/qt5/Qt5AccessibleEventListener.cxx) | 2 | ||||
-rw-r--r-- | vcl/qt5/QtAccessibleWidget.cxx (renamed from vcl/qt5/Qt5AccessibleWidget.cxx) | 14 | ||||
-rw-r--r-- | vcl/qt5/QtBitmap.cxx (renamed from vcl/qt5/Qt5Bitmap.cxx) | 6 | ||||
-rw-r--r-- | vcl/qt5/QtClipboard.cxx (renamed from vcl/qt5/Qt5Clipboard.cxx) | 10 | ||||
-rw-r--r-- | vcl/qt5/QtData.cxx (renamed from vcl/qt5/Qt5Data.cxx) | 2 | ||||
-rw-r--r-- | vcl/qt5/QtDragAndDrop.cxx (renamed from vcl/qt5/Qt5DragAndDrop.cxx) | 8 | ||||
-rw-r--r-- | vcl/qt5/QtFilePicker.cxx (renamed from vcl/qt5/Qt5FilePicker.cxx) | 12 | ||||
-rw-r--r-- | vcl/qt5/QtFont.cxx (renamed from vcl/qt5/Qt5Font.cxx) | 4 | ||||
-rw-r--r-- | vcl/qt5/QtFontFace.cxx (renamed from vcl/qt5/Qt5FontFace.cxx) | 6 | ||||
-rw-r--r-- | vcl/qt5/QtFrame.cxx (renamed from vcl/qt5/Qt5Frame.cxx) | 28 | ||||
-rw-r--r-- | vcl/qt5/QtGraphics.cxx (renamed from vcl/qt5/Qt5Graphics.cxx) | 12 | ||||
-rw-r--r-- | vcl/qt5/QtGraphics_Controls.cxx (renamed from vcl/qt5/Qt5Graphics_Controls.cxx) | 6 | ||||
-rw-r--r-- | vcl/qt5/QtGraphics_GDI.cxx (renamed from vcl/qt5/Qt5Graphics_GDI.cxx) | 6 | ||||
-rw-r--r-- | vcl/qt5/QtGraphics_Text.cxx (renamed from vcl/qt5/Qt5Graphics_Text.cxx) | 8 | ||||
-rw-r--r-- | vcl/qt5/QtInstance.cxx (renamed from vcl/qt5/Qt5Instance.cxx) | 30 | ||||
-rw-r--r-- | vcl/qt5/QtInstance_Print.cxx (renamed from vcl/qt5/Qt5Instance_Print.cxx) | 4 | ||||
-rw-r--r-- | vcl/qt5/QtMainWindow.cxx (renamed from vcl/qt5/Qt5MainWindow.cxx) | 6 | ||||
-rw-r--r-- | vcl/qt5/QtMenu.cxx (renamed from vcl/qt5/Qt5Menu.cxx) | 10 | ||||
-rw-r--r-- | vcl/qt5/QtObject.cxx (renamed from vcl/qt5/Qt5Object.cxx) | 8 | ||||
-rw-r--r-- | vcl/qt5/QtOpenGLContext.cxx (renamed from vcl/qt5/Qt5OpenGLContext.cxx) | 4 | ||||
-rw-r--r-- | vcl/qt5/QtPainter.cxx (renamed from vcl/qt5/Qt5Painter.cxx) | 2 | ||||
-rw-r--r-- | vcl/qt5/QtPrinter.cxx (renamed from vcl/qt5/Qt5Printer.cxx) | 2 | ||||
-rw-r--r-- | vcl/qt5/QtSvpGraphics.cxx (renamed from vcl/qt5/Qt5SvpGraphics.cxx) | 12 | ||||
-rw-r--r-- | vcl/qt5/QtSvpSurface.cxx (renamed from vcl/qt5/Qt5SvpSurface.cxx) | 4 | ||||
-rw-r--r-- | vcl/qt5/QtSvpVirtualDevice.hxx (renamed from vcl/qt5/Qt5SvpVirtualDevice.hxx) | 2 | ||||
-rw-r--r-- | vcl/qt5/QtSystem.cxx (renamed from vcl/qt5/Qt5System.cxx) | 4 | ||||
-rw-r--r-- | vcl/qt5/QtTimer.cxx (renamed from vcl/qt5/Qt5Timer.cxx) | 4 | ||||
-rw-r--r-- | vcl/qt5/QtTools.cxx (renamed from vcl/qt5/Qt5Tools.cxx) | 2 | ||||
-rw-r--r-- | vcl/qt5/QtTransferable.cxx (renamed from vcl/qt5/Qt5Transferable.cxx) | 6 | ||||
-rw-r--r-- | vcl/qt5/QtVirtualDevice.cxx (renamed from vcl/qt5/Qt5VirtualDevice.cxx) | 6 | ||||
-rw-r--r-- | vcl/qt5/QtWidget.cxx (renamed from vcl/qt5/Qt5Widget.cxx) | 18 | ||||
-rw-r--r-- | vcl/qt5/QtXAccessible.cxx (renamed from vcl/qt5/Qt5XAccessible.cxx) | 10 |
32 files changed, 129 insertions, 129 deletions
diff --git a/vcl/qt5/Qt5AccessibleEventListener.cxx b/vcl/qt5/QtAccessibleEventListener.cxx index 6f0e3bf827f8..fa8c540024c4 100644 --- a/vcl/qt5/Qt5AccessibleEventListener.cxx +++ b/vcl/qt5/QtAccessibleEventListener.cxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <Qt5AccessibleEventListener.hxx> +#include <QtAccessibleEventListener.hxx> #include <sal/log.hxx> diff --git a/vcl/qt5/Qt5AccessibleWidget.cxx b/vcl/qt5/QtAccessibleWidget.cxx index 5dcb30b2da6e..9f5b6ced8808 100644 --- a/vcl/qt5/Qt5AccessibleWidget.cxx +++ b/vcl/qt5/QtAccessibleWidget.cxx @@ -17,16 +17,16 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <Qt5AccessibleWidget.hxx> -#include <Qt5AccessibleWidget.moc> +#include <QtAccessibleWidget.hxx> +#include <QtAccessibleWidget.moc> #include <QtGui/QAccessibleInterface> -#include <Qt5AccessibleEventListener.hxx> -#include <Qt5Frame.hxx> -#include <Qt5Tools.hxx> -#include <Qt5Widget.hxx> -#include <Qt5XAccessible.hxx> +#include <QtAccessibleEventListener.hxx> +#include <QtFrame.hxx> +#include <QtTools.hxx> +#include <QtWidget.hxx> +#include <QtXAccessible.hxx> #include <com/sun/star/accessibility/AccessibleRelationType.hpp> #include <com/sun/star/accessibility/AccessibleRole.hpp> diff --git a/vcl/qt5/Qt5Bitmap.cxx b/vcl/qt5/QtBitmap.cxx index 951046612e46..0a9fb2b7812f 100644 --- a/vcl/qt5/Qt5Bitmap.cxx +++ b/vcl/qt5/QtBitmap.cxx @@ -17,9 +17,9 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <Qt5Bitmap.hxx> -#include <Qt5Tools.hxx> -#include <Qt5Graphics.hxx> +#include <QtBitmap.hxx> +#include <QtTools.hxx> +#include <QtGraphics.hxx> #include <QtGui/QImage> #include <QtCore/QVector> diff --git a/vcl/qt5/Qt5Clipboard.cxx b/vcl/qt5/QtClipboard.cxx index 6ab93258bf09..f21e9d02aa50 100644 --- a/vcl/qt5/Qt5Clipboard.cxx +++ b/vcl/qt5/QtClipboard.cxx @@ -8,17 +8,17 @@ * */ -#include <Qt5Clipboard.hxx> -#include <Qt5Clipboard.moc> +#include <QtClipboard.hxx> +#include <QtClipboard.moc> #include <cppuhelper/supportsservice.hxx> #include <sal/log.hxx> #include <QtWidgets/QApplication> -#include <Qt5Instance.hxx> -#include <Qt5Transferable.hxx> -#include <Qt5Tools.hxx> +#include <QtInstance.hxx> +#include <QtTransferable.hxx> +#include <QtTools.hxx> #include <cassert> #include <map> diff --git a/vcl/qt5/Qt5Data.cxx b/vcl/qt5/QtData.cxx index 0b4c9dad8b00..dc435fdbd358 100644 --- a/vcl/qt5/Qt5Data.cxx +++ b/vcl/qt5/QtData.cxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <Qt5Data.hxx> +#include <QtData.hxx> #include <QtGui/QBitmap> #include <QtGui/QCursor> diff --git a/vcl/qt5/Qt5DragAndDrop.cxx b/vcl/qt5/QtDragAndDrop.cxx index 184cf07a6c5e..e05993718753 100644 --- a/vcl/qt5/Qt5DragAndDrop.cxx +++ b/vcl/qt5/QtDragAndDrop.cxx @@ -14,10 +14,10 @@ #include <cppuhelper/supportsservice.hxx> #include <sal/log.hxx> -#include <Qt5DragAndDrop.hxx> -#include <Qt5Frame.hxx> -#include <Qt5Transferable.hxx> -#include <Qt5Widget.hxx> +#include <QtDragAndDrop.hxx> +#include <QtFrame.hxx> +#include <QtTransferable.hxx> +#include <QtWidget.hxx> #include <QtGui/QDrag> diff --git a/vcl/qt5/Qt5FilePicker.cxx b/vcl/qt5/QtFilePicker.cxx index e2f733ca4fca..eda2579c1c58 100644 --- a/vcl/qt5/Qt5FilePicker.cxx +++ b/vcl/qt5/QtFilePicker.cxx @@ -17,13 +17,13 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <Qt5FilePicker.hxx> -#include <Qt5FilePicker.moc> +#include <QtFilePicker.hxx> +#include <QtFilePicker.moc> -#include <Qt5Frame.hxx> -#include <Qt5Tools.hxx> -#include <Qt5Widget.hxx> -#include <Qt5Instance.hxx> +#include <QtFrame.hxx> +#include <QtTools.hxx> +#include <QtWidget.hxx> +#include <QtInstance.hxx> #include <com/sun/star/awt/SystemDependentXWindow.hpp> #include <com/sun/star/awt/XSystemDependentWindowPeer.hpp> diff --git a/vcl/qt5/Qt5Font.cxx b/vcl/qt5/QtFont.cxx index a230ea1560e7..8079576f156f 100644 --- a/vcl/qt5/Qt5Font.cxx +++ b/vcl/qt5/QtFont.cxx @@ -19,8 +19,8 @@ #include <sal/config.h> -#include <Qt5Font.hxx> -#include <Qt5Tools.hxx> +#include <QtFont.hxx> +#include <QtTools.hxx> #include <QtGui/QFont> #include <QtGui/QRawFont> diff --git a/vcl/qt5/Qt5FontFace.cxx b/vcl/qt5/QtFontFace.cxx index b690c6abcf4f..0eb51bf850b6 100644 --- a/vcl/qt5/Qt5FontFace.cxx +++ b/vcl/qt5/QtFontFace.cxx @@ -21,9 +21,9 @@ #include <unotools/fontdefs.hxx> -#include <Qt5FontFace.hxx> -#include <Qt5Font.hxx> -#include <Qt5Tools.hxx> +#include <QtFontFace.hxx> +#include <QtFont.hxx> +#include <QtTools.hxx> #include <sft.hxx> #include <impfontcharmap.hxx> diff --git a/vcl/qt5/Qt5Frame.cxx b/vcl/qt5/QtFrame.cxx index 7f1bf041ae20..23a051e75862 100644 --- a/vcl/qt5/Qt5Frame.cxx +++ b/vcl/qt5/QtFrame.cxx @@ -17,20 +17,20 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <Qt5Frame.hxx> -#include <Qt5Frame.moc> - -#include <Qt5Data.hxx> -#include <Qt5DragAndDrop.hxx> -#include <Qt5Graphics.hxx> -#include <Qt5Instance.hxx> -#include <Qt5MainWindow.hxx> -#include <Qt5Menu.hxx> -#include <Qt5SvpGraphics.hxx> -#include <Qt5System.hxx> -#include <Qt5Tools.hxx> -#include <Qt5Transferable.hxx> -#include <Qt5Widget.hxx> +#include <QtFrame.hxx> +#include <QtFrame.moc> + +#include <QtData.hxx> +#include <QtDragAndDrop.hxx> +#include <QtGraphics.hxx> +#include <QtInstance.hxx> +#include <QtMainWindow.hxx> +#include <QtMenu.hxx> +#include <QtSvpGraphics.hxx> +#include <QtSystem.hxx> +#include <QtTools.hxx> +#include <QtTransferable.hxx> +#include <QtWidget.hxx> #include <QtCore/QMimeData> #include <QtCore/QPoint> diff --git a/vcl/qt5/Qt5Graphics.cxx b/vcl/qt5/QtGraphics.cxx index 1e6197c4fa5d..d809556ce219 100644 --- a/vcl/qt5/Qt5Graphics.cxx +++ b/vcl/qt5/QtGraphics.cxx @@ -17,13 +17,13 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <Qt5Graphics.hxx> +#include <QtGraphics.hxx> -#include <Qt5Data.hxx> -#include <Qt5Font.hxx> -#include <Qt5Frame.hxx> -#include <Qt5Graphics_Controls.hxx> -#include <Qt5Painter.hxx> +#include <QtData.hxx> +#include <QtFont.hxx> +#include <QtFrame.hxx> +#include <QtGraphics_Controls.hxx> +#include <QtPainter.hxx> #include <QtGui/QImage> #include <QtGui/QPainter> diff --git a/vcl/qt5/Qt5Graphics_Controls.cxx b/vcl/qt5/QtGraphics_Controls.cxx index 077b92e54422..e6e3d820da59 100644 --- a/vcl/qt5/Qt5Graphics_Controls.cxx +++ b/vcl/qt5/QtGraphics_Controls.cxx @@ -17,15 +17,15 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <Qt5Graphics_Controls.hxx> +#include <QtGraphics_Controls.hxx> #include <QtGui/QPainter> #include <QtWidgets/QApplication> #include <QtWidgets/QFrame> #include <QtWidgets/QLabel> -#include <Qt5Tools.hxx> -#include <Qt5GraphicsBase.hxx> +#include <QtTools.hxx> +#include <QtGraphicsBase.hxx> #include <vcl/decoview.hxx> /** diff --git a/vcl/qt5/Qt5Graphics_GDI.cxx b/vcl/qt5/QtGraphics_GDI.cxx index b375f77ce92a..0f9faa022d0b 100644 --- a/vcl/qt5/Qt5Graphics_GDI.cxx +++ b/vcl/qt5/QtGraphics_GDI.cxx @@ -17,10 +17,10 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <Qt5Graphics.hxx> +#include <QtGraphics.hxx> -#include <Qt5Bitmap.hxx> -#include <Qt5Painter.hxx> +#include <QtBitmap.hxx> +#include <QtPainter.hxx> #include <sal/log.hxx> diff --git a/vcl/qt5/Qt5Graphics_Text.cxx b/vcl/qt5/QtGraphics_Text.cxx index 411becfe914a..3f1e196d6d7a 100644 --- a/vcl/qt5/Qt5Graphics_Text.cxx +++ b/vcl/qt5/QtGraphics_Text.cxx @@ -19,10 +19,10 @@ #include <sal/config.h> -#include <Qt5Graphics.hxx> -#include <Qt5FontFace.hxx> -#include <Qt5Font.hxx> -#include <Qt5Painter.hxx> +#include <QtGraphics.hxx> +#include <QtFontFace.hxx> +#include <QtFont.hxx> +#include <QtPainter.hxx> #include <fontsubset.hxx> #include <vcl/fontcharmap.hxx> diff --git a/vcl/qt5/Qt5Instance.cxx b/vcl/qt5/QtInstance.cxx index d93b25f5bb89..a41e231b454e 100644 --- a/vcl/qt5/Qt5Instance.cxx +++ b/vcl/qt5/QtInstance.cxx @@ -17,24 +17,24 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <Qt5Instance.hxx> -#include <Qt5Instance.moc> +#include <QtInstance.hxx> +#include <QtInstance.moc> #include <com/sun/star/lang/IllegalArgumentException.hpp> -#include <Qt5Bitmap.hxx> -#include <Qt5Clipboard.hxx> -#include <Qt5Data.hxx> -#include <Qt5DragAndDrop.hxx> -#include <Qt5FilePicker.hxx> -#include <Qt5Frame.hxx> -#include <Qt5Menu.hxx> -#include <Qt5Object.hxx> -#include <Qt5OpenGLContext.hxx> -#include "Qt5SvpVirtualDevice.hxx" -#include <Qt5System.hxx> -#include <Qt5Timer.hxx> -#include <Qt5VirtualDevice.hxx> +#include <QtBitmap.hxx> +#include <QtClipboard.hxx> +#include <QtData.hxx> +#include <QtDragAndDrop.hxx> +#include <QtFilePicker.hxx> +#include <QtFrame.hxx> +#include <QtMenu.hxx> +#include <QtObject.hxx> +#include <QtOpenGLContext.hxx> +#include "QtSvpVirtualDevice.hxx" +#include <QtSystem.hxx> +#include <QtTimer.hxx> +#include <QtVirtualDevice.hxx> #include <headless/svpvd.hxx> diff --git a/vcl/qt5/Qt5Instance_Print.cxx b/vcl/qt5/QtInstance_Print.cxx index 2f9a096f7eb9..30251c8bb003 100644 --- a/vcl/qt5/Qt5Instance_Print.cxx +++ b/vcl/qt5/QtInstance_Print.cxx @@ -21,8 +21,8 @@ #include <string_view> -#include <Qt5Instance.hxx> -#include <Qt5Printer.hxx> +#include <QtInstance.hxx> +#include <QtPrinter.hxx> #include <vcl/svapp.hxx> #include <vcl/timer.hxx> diff --git a/vcl/qt5/Qt5MainWindow.cxx b/vcl/qt5/QtMainWindow.cxx index 3f8814cad73d..1e6ebc81a7be 100644 --- a/vcl/qt5/Qt5MainWindow.cxx +++ b/vcl/qt5/QtMainWindow.cxx @@ -8,9 +8,9 @@ * */ -#include <Qt5MainWindow.hxx> -#include <Qt5MainWindow.moc> -#include <Qt5AccessibleWidget.hxx> +#include <QtMainWindow.hxx> +#include <QtMainWindow.moc> +#include <QtAccessibleWidget.hxx> #include <QtGui/QAccessible> #include <QtGui/QCloseEvent> diff --git a/vcl/qt5/Qt5Menu.cxx b/vcl/qt5/QtMenu.cxx index ace199df9f88..6ba35daa0429 100644 --- a/vcl/qt5/Qt5Menu.cxx +++ b/vcl/qt5/QtMenu.cxx @@ -7,12 +7,12 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#include <Qt5Menu.hxx> -#include <Qt5Menu.moc> +#include <QtMenu.hxx> +#include <QtMenu.moc> -#include <Qt5Frame.hxx> -#include <Qt5Instance.hxx> -#include <Qt5MainWindow.hxx> +#include <QtFrame.hxx> +#include <QtInstance.hxx> +#include <QtMainWindow.hxx> #include <QtWidgets/QMenuBar> #include <QtWidgets/QPushButton> diff --git a/vcl/qt5/Qt5Object.cxx b/vcl/qt5/QtObject.cxx index b48c1a143248..1c9bc8d1fe09 100644 --- a/vcl/qt5/Qt5Object.cxx +++ b/vcl/qt5/QtObject.cxx @@ -17,11 +17,11 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <Qt5Object.hxx> -#include <Qt5Object.moc> +#include <QtObject.hxx> +#include <QtObject.moc> -#include <Qt5Frame.hxx> -#include <Qt5Widget.hxx> +#include <QtFrame.hxx> +#include <QtWidget.hxx> #include <QtGui/QGuiApplication> diff --git a/vcl/qt5/Qt5OpenGLContext.cxx b/vcl/qt5/QtOpenGLContext.cxx index 0c8dd1729886..ab2e228f1dcc 100644 --- a/vcl/qt5/Qt5OpenGLContext.cxx +++ b/vcl/qt5/QtOpenGLContext.cxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <Qt5OpenGLContext.hxx> +#include <QtOpenGLContext.hxx> #include <epoxy/gl.h> @@ -27,7 +27,7 @@ #include <window.h> -#include <Qt5Object.hxx> +#include <QtObject.hxx> #include <QtGui/QOpenGLContext> #include <QtGui/QWindow> diff --git a/vcl/qt5/Qt5Painter.cxx b/vcl/qt5/QtPainter.cxx index 5941b3dbeabb..fdf2a4ec08d7 100644 --- a/vcl/qt5/Qt5Painter.cxx +++ b/vcl/qt5/QtPainter.cxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <Qt5Painter.hxx> +#include <QtPainter.hxx> #include <QtGui/QColor> diff --git a/vcl/qt5/Qt5Printer.cxx b/vcl/qt5/QtPrinter.cxx index 3f77fce307ec..346dd3f26e3f 100644 --- a/vcl/qt5/Qt5Printer.cxx +++ b/vcl/qt5/QtPrinter.cxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <Qt5Printer.hxx> +#include <QtPrinter.hxx> QtPrinter::QtPrinter(SalInfoPrinter* pInfoPrinter) : PspSalPrinter(pInfoPrinter) diff --git a/vcl/qt5/Qt5SvpGraphics.cxx b/vcl/qt5/QtSvpGraphics.cxx index 1d2b4dc7de1a..b6018a95e299 100644 --- a/vcl/qt5/Qt5SvpGraphics.cxx +++ b/vcl/qt5/QtSvpGraphics.cxx @@ -13,12 +13,12 @@ #include <config_cairo_canvas.h> -#include <Qt5Data.hxx> -#include <Qt5Frame.hxx> -#include <Qt5Graphics_Controls.hxx> -#include <Qt5SvpGraphics.hxx> -#include <Qt5SvpSurface.hxx> -#include <Qt5Tools.hxx> +#include <QtData.hxx> +#include <QtFrame.hxx> +#include <QtGraphics_Controls.hxx> +#include <QtSvpGraphics.hxx> +#include <QtSvpSurface.hxx> +#include <QtTools.hxx> #include <QtGui/QScreen> #include <QtGui/QWindow> diff --git a/vcl/qt5/Qt5SvpSurface.cxx b/vcl/qt5/QtSvpSurface.cxx index 8b83e9f98424..456de177ce2c 100644 --- a/vcl/qt5/Qt5SvpSurface.cxx +++ b/vcl/qt5/QtSvpSurface.cxx @@ -9,9 +9,9 @@ #include <utility> -#include <Qt5SvpSurface.hxx> +#include <QtSvpSurface.hxx> -#include <Qt5SvpGraphics.hxx> +#include <QtSvpGraphics.hxx> #include <vcl/sysdata.hxx> #include <vcl/bitmap.hxx> diff --git a/vcl/qt5/Qt5SvpVirtualDevice.hxx b/vcl/qt5/QtSvpVirtualDevice.hxx index 8d9dcdc20d72..26247a6e1d58 100644 --- a/vcl/qt5/Qt5SvpVirtualDevice.hxx +++ b/vcl/qt5/QtSvpVirtualDevice.hxx @@ -20,7 +20,7 @@ #pragma once #include <headless/svpvd.hxx> -#include <Qt5SvpGraphics.hxx> +#include <QtSvpGraphics.hxx> class VCL_DLLPUBLIC QtSvpVirtualDevice : public SvpSalVirtualDevice { diff --git a/vcl/qt5/Qt5System.cxx b/vcl/qt5/QtSystem.cxx index 7483850a28e7..5f5f4ad284e5 100644 --- a/vcl/qt5/Qt5System.cxx +++ b/vcl/qt5/QtSystem.cxx @@ -11,8 +11,8 @@ #include <QtGui/QScreen> #include <tools/gen.hxx> -#include <Qt5System.hxx> -#include <Qt5Tools.hxx> +#include <QtSystem.hxx> +#include <QtTools.hxx> unsigned int QtSystem::GetDisplayScreenCount() { return QGuiApplication::screens().size(); } diff --git a/vcl/qt5/Qt5Timer.cxx b/vcl/qt5/QtTimer.cxx index f52491d81cd0..751937b44931 100644 --- a/vcl/qt5/Qt5Timer.cxx +++ b/vcl/qt5/QtTimer.cxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <Qt5Timer.hxx> -#include <Qt5Timer.moc> +#include <QtTimer.hxx> +#include <QtTimer.moc> #include <QtWidgets/QApplication> #include <QtCore/QThread> diff --git a/vcl/qt5/Qt5Tools.cxx b/vcl/qt5/QtTools.cxx index 6642c66af0cf..f9a0a0e0e328 100644 --- a/vcl/qt5/Qt5Tools.cxx +++ b/vcl/qt5/QtTools.cxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <Qt5Tools.hxx> +#include <QtTools.hxx> #include <cairo.h> diff --git a/vcl/qt5/Qt5Transferable.cxx b/vcl/qt5/QtTransferable.cxx index 5da55fa653c1..cf92f57ab47b 100644 --- a/vcl/qt5/Qt5Transferable.cxx +++ b/vcl/qt5/QtTransferable.cxx @@ -8,15 +8,15 @@ * */ -#include <Qt5Transferable.hxx> +#include <QtTransferable.hxx> #include <comphelper/sequence.hxx> #include <sal/log.hxx> #include <QtWidgets/QApplication> -#include <Qt5Instance.hxx> -#include <Qt5Tools.hxx> +#include <QtInstance.hxx> +#include <QtTools.hxx> #include <cassert> diff --git a/vcl/qt5/Qt5VirtualDevice.cxx b/vcl/qt5/QtVirtualDevice.cxx index 85f56bff4c17..7e0dbab873d4 100644 --- a/vcl/qt5/Qt5VirtualDevice.cxx +++ b/vcl/qt5/QtVirtualDevice.cxx @@ -17,10 +17,10 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <Qt5VirtualDevice.hxx> +#include <QtVirtualDevice.hxx> -#include <Qt5Graphics.hxx> -#include <Qt5Tools.hxx> +#include <QtGraphics.hxx> +#include <QtTools.hxx> #include <QtGui/QImage> diff --git a/vcl/qt5/Qt5Widget.cxx b/vcl/qt5/QtWidget.cxx index 9eb9ac7d3ee9..12e101d48224 100644 --- a/vcl/qt5/Qt5Widget.cxx +++ b/vcl/qt5/QtWidget.cxx @@ -17,15 +17,15 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <Qt5Widget.hxx> -#include <Qt5Widget.moc> - -#include <Qt5Frame.hxx> -#include <Qt5Graphics.hxx> -#include <Qt5Instance.hxx> -#include <Qt5SvpGraphics.hxx> -#include <Qt5Transferable.hxx> -#include <Qt5Tools.hxx> +#include <QtWidget.hxx> +#include <QtWidget.moc> + +#include <QtFrame.hxx> +#include <QtGraphics.hxx> +#include <QtInstance.hxx> +#include <QtSvpGraphics.hxx> +#include <QtTransferable.hxx> +#include <QtTools.hxx> #include <QtCore/QMimeData> #include <QtGui/QDrag> diff --git a/vcl/qt5/Qt5XAccessible.cxx b/vcl/qt5/QtXAccessible.cxx index 8bb4f837d6d9..c8ef055a2429 100644 --- a/vcl/qt5/Qt5XAccessible.cxx +++ b/vcl/qt5/QtXAccessible.cxx @@ -7,12 +7,12 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#include <Qt5XAccessible.hxx> -#include <Qt5XAccessible.moc> +#include <QtXAccessible.hxx> +#include <QtXAccessible.moc> -#include <Qt5Frame.hxx> -#include <Qt5Tools.hxx> -#include <Qt5Widget.hxx> +#include <QtFrame.hxx> +#include <QtTools.hxx> +#include <QtWidget.hxx> #include <com/sun/star/accessibility/XAccessible.hpp> |