From dfd3fdfe664e214ca1bba72b96d19b89ff25e7bc Mon Sep 17 00:00:00 2001 From: Michael Weghorn Date: Tue, 28 Sep 2021 15:02:47 +0200 Subject: qt5: Remove "5" from class names in qt5 VCL plugin Rename classes for the qt5 VCL plugin to no longer contain the Qt version number "5" in them, e.g. "Qt5Widget" -> "QtWidget". Also, adapt some variable names and comments accordingly. The code will be used for an upcoming qt6 VCL plugin as well, so a "Qt" prefix fits better than a "Qt5" one. Renaming the headers and source files will be done in a separate commit to make tracking git history easier. Change-Id: Idf422f82ca9dafbb70e9a64de9c8cfc4cc8c0909 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/122805 Tested-by: Jenkins Reviewed-by: Michael Weghorn --- vcl/qt5/Qt5System.cxx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'vcl/qt5/Qt5System.cxx') diff --git a/vcl/qt5/Qt5System.cxx b/vcl/qt5/Qt5System.cxx index e787ea0cab2b..7483850a28e7 100644 --- a/vcl/qt5/Qt5System.cxx +++ b/vcl/qt5/Qt5System.cxx @@ -14,15 +14,15 @@ #include #include -unsigned int Qt5System::GetDisplayScreenCount() { return QGuiApplication::screens().size(); } +unsigned int QtSystem::GetDisplayScreenCount() { return QGuiApplication::screens().size(); } -tools::Rectangle Qt5System::GetDisplayScreenPosSizePixel(unsigned int nScreen) +tools::Rectangle QtSystem::GetDisplayScreenPosSizePixel(unsigned int nScreen) { QRect qRect = QGuiApplication::screens().at(nScreen)->geometry(); return toRectangle(scaledQRect(qRect, qApp->devicePixelRatio())); } -int Qt5System::ShowNativeDialog(const OUString&, const OUString&, const std::vector&) +int QtSystem::ShowNativeDialog(const OUString&, const OUString&, const std::vector&) { return 0; } -- cgit