qt5: Drop "5" from VCLPLUG_QT5_{IMPLEMENTATION,PUBLIC} defines

Rename those to no more include the Qt version number,
since they will be used for the upcoming qt6 VCL plugin
as well.

Change-Id: I49bf362b830e07193dca03524e0d6001d0d191a4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/122807
Tested-by: Jenkins
Reviewed-by: Michael Weghorn <m.weghorn@posteo.de>

9 files changed, 15 insertions, 15 deletions

diff --git a/vcl/Library_vclplug_qt5.mk b/vcl/Library_vclplug_qt5.mk
index 1b094fda79f9..32bf4dc215df 100644
--- a/vcl/Library_vclplug_qt5.mk
+++ b/vcl/Library_vclplug_qt5.mk
@@ -29,7 +29,7 @@ $(eval $(call gb_Library_set_include,vclplug_qt5,\
 ))
 
 $(eval $(call gb_Library_add_defs,vclplug_qt5,\
-    -DVCLPLUG_QT5_IMPLEMENTATION \
+    -DVCLPLUG_QT_IMPLEMENTATION \
     -DVCL_INTERNALS \
 ))
 
diff --git a/vcl/inc/qt5/QtData.hxx b/vcl/inc/qt5/QtData.hxx
index ef8ee8f6f8f1..960126f0fde6 100644
--- a/vcl/inc/qt5/QtData.hxx
+++ b/vcl/inc/qt5/QtData.hxx
@@ -28,7 +28,7 @@
 
 class QCursor;
 
-class VCLPLUG_QT5_PUBLIC QtData final : public GenericUnixSalData
+class VCLPLUG_QT_PUBLIC QtData final : public GenericUnixSalData
 {
     o3tl::enumarray<PointerStyle, std::unique_ptr<QCursor>> m_aCursors;
 
diff --git a/vcl/inc/qt5/QtFilePicker.hxx b/vcl/inc/qt5/QtFilePicker.hxx
index ffad1acc6f2f..c1a95f5c64a0 100644
--- a/vcl/inc/qt5/QtFilePicker.hxx
+++ b/vcl/inc/qt5/QtFilePicker.hxx
@@ -54,7 +54,7 @@ typedef ::cppu::WeakComponentImplHelper<css::frame::XTerminateListener, css::lan
                                         css::ui::dialogs::XFolderPicker2>
     QtFilePicker_Base;
 
-class VCLPLUG_QT5_PUBLIC QtFilePicker : public QObject, public QtFilePicker_Base
+class VCLPLUG_QT_PUBLIC QtFilePicker : public QObject, public QtFilePicker_Base
 {
     Q_OBJECT
 
diff --git a/vcl/inc/qt5/QtFontFace.hxx b/vcl/inc/qt5/QtFontFace.hxx
index 2f15a26e308b..6089a18b38c2 100644
--- a/vcl/inc/qt5/QtFontFace.hxx
+++ b/vcl/inc/qt5/QtFontFace.hxx
@@ -44,9 +44,9 @@ public:
     static QtFontFace* fromQFontDatabase(const QString& aFamily, const QString& aStyle);
     static void fillAttributesFromQFont(const QFont& rFont, FontAttributes& rFA);
 
-    VCLPLUG_QT5_PUBLIC static FontWeight toFontWeight(const int nWeight);
-    VCLPLUG_QT5_PUBLIC static FontWidth toFontWidth(const int nStretch);
-    VCLPLUG_QT5_PUBLIC static FontItalic toFontItalic(const QFont::Style eStyle);
+    VCLPLUG_QT_PUBLIC static FontWeight toFontWeight(const int nWeight);
+    VCLPLUG_QT_PUBLIC static FontWidth toFontWidth(const int nStretch);
+    VCLPLUG_QT_PUBLIC static FontItalic toFontItalic(const QFont::Style eStyle);
 
     sal_IntPtr GetFontId() const override;
 
diff --git a/vcl/inc/qt5/QtFrame.hxx b/vcl/inc/qt5/QtFrame.hxx
index c584c1d750f9..d2265229e267 100644
--- a/vcl/inc/qt5/QtFrame.hxx
+++ b/vcl/inc/qt5/QtFrame.hxx
@@ -64,7 +64,7 @@ class QPaintDevice;
 class QScreen;
 class QWidget;
 
-class VCLPLUG_QT5_PUBLIC QtFrame : public QObject, public SalFrame
+class VCLPLUG_QT_PUBLIC QtFrame : public QObject, public SalFrame
 {
     Q_OBJECT
 
diff --git a/vcl/inc/qt5/QtInstance.hxx b/vcl/inc/qt5/QtInstance.hxx
index 8ec1d98b387e..6891b32f2f3c 100644
--- a/vcl/inc/qt5/QtInstance.hxx
+++ b/vcl/inc/qt5/QtInstance.hxx
@@ -47,9 +47,9 @@ struct StdFreeCStr
 };
 using FreeableCStr = std::unique_ptr<char[], StdFreeCStr>;
 
-class VCLPLUG_QT5_PUBLIC QtInstance : public QObject,
-                                      public SalGenericInstance,
-                                      public SalUserEventList
+class VCLPLUG_QT_PUBLIC QtInstance : public QObject,
+                                     public SalGenericInstance,
+                                     public SalUserEventList
 {
     Q_OBJECT
 
diff --git a/vcl/inc/qt5/QtSvpGraphics.hxx b/vcl/inc/qt5/QtSvpGraphics.hxx
index 23f3ccc82abd..da3786eee165 100644
--- a/vcl/inc/qt5/QtSvpGraphics.hxx
+++ b/vcl/inc/qt5/QtSvpGraphics.hxx
@@ -26,7 +26,7 @@
 
 class QtFrame;
 
-class VCLPLUG_QT5_PUBLIC QtSvpGraphics final : public SvpSalGraphics, public QtGraphicsBase
+class VCLPLUG_QT_PUBLIC QtSvpGraphics final : public SvpSalGraphics, public QtGraphicsBase
 {
     QtFrame* const m_pFrame;
 
diff --git a/vcl/inc/vclpluginapi.h b/vcl/inc/vclpluginapi.h
index 589d7244ddaa..930f080a9a9d 100644
--- a/vcl/inc/vclpluginapi.h
+++ b/vcl/inc/vclpluginapi.h
@@ -47,10 +47,10 @@
 #define VCLPLUG_OSX_PUBLIC SAL_DLLPUBLIC_IMPORT
 #endif
 
-#if defined VCLPLUG_QT5_IMPLEMENTATION
-#define VCLPLUG_QT5_PUBLIC SAL_DLLPUBLIC_EXPORT
+#if defined VCLPLUG_QT_IMPLEMENTATION
+#define VCLPLUG_QT_PUBLIC SAL_DLLPUBLIC_EXPORT
 #else
-#define VCLPLUG_QT5_PUBLIC SAL_DLLPUBLIC_IMPORT
+#define VCLPLUG_QT_PUBLIC SAL_DLLPUBLIC_IMPORT
 #endif
 
 #if defined VCLPLUG_SVP_IMPLEMENTATION
diff --git a/vcl/qt5/QtInstance.cxx b/vcl/qt5/QtInstance.cxx
index a41e231b454e..f641dda8e9ef 100644
--- a/vcl/qt5/QtInstance.cxx
+++ b/vcl/qt5/QtInstance.cxx
@@ -678,7 +678,7 @@ std::unique_ptr<QApplication> QtInstance::CreateQApplication(int& nArgc, char**
 }
 
 extern "C" {
-VCLPLUG_QT5_PUBLIC SalInstance* create_SalInstance()
+VCLPLUG_QT_PUBLIC SalInstance* create_SalInstance()
 {
     static const bool bUseCairo = (nullptr != getenv("SAL_VCL_QT5_USE_CAIRO"));