Win/X11OpenGLDeviceInfo don't need a common base class

Change-Id: I9fc7e763b8cf055c3aabaaa97fe8c85ebc5e71b6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131926
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>

6 files changed, 4 insertions, 51 deletions

diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
index 31cf81c8bd0d..a0f61992b74b 100644
--- a/vcl/Library_vcl.mk
+++ b/vcl/Library_vcl.mk
@@ -604,7 +604,6 @@ $(eval $(call gb_Library_add_exception_objects,vcl,\
 else # !DISABLE_GUI
 
 $(eval $(call gb_Library_add_exception_objects,vcl,\
-    vcl/source/opengl/DeviceInfo \
     vcl/source/opengl/OpenGLContext \
     vcl/source/opengl/OpenGLHelper \
     $(if $(filter SKIA,$(BUILD_TYPE)), \
diff --git a/vcl/inc/opengl/DeviceInfo.hxx b/vcl/inc/opengl/DeviceInfo.hxx
deleted file mode 100644
index b0ad3a6cfec6..000000000000
--- a/vcl/inc/opengl/DeviceInfo.hxx
+++ /dev/null
@@ -1,23 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- */
-
-#ifndef INCLUDED_VCL_INC_OPENGL_DEVICEINFO_HXX
-#define INCLUDED_VCL_INC_OPENGL_DEVICEINFO_HXX
-
-class OpenGLDeviceInfo
-{
-public:
-    virtual ~OpenGLDeviceInfo() = 0;
-
-    virtual bool isDeviceBlocked() = 0;
-};
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/opengl/win/WinDeviceInfo.hxx b/vcl/inc/opengl/win/WinDeviceInfo.hxx
index 04d97406b54a..e79905c24c37 100644
--- a/vcl/inc/opengl/win/WinDeviceInfo.hxx
+++ b/vcl/inc/opengl/win/WinDeviceInfo.hxx
@@ -12,14 +12,13 @@
 
 #include <vcl/dllapi.h>
 
-#include <opengl/DeviceInfo.hxx>
 #include <driverblocklist.hxx>
 
 #include <rtl/ustring.hxx>
 #include <vector>
 #include <cstdint>
 
-class VCL_DLLPUBLIC WinOpenGLDeviceInfo : public OpenGLDeviceInfo
+class VCL_DLLPUBLIC WinOpenGLDeviceInfo
 {
 private:
     OUString maDriverVersion;
@@ -54,9 +53,7 @@ private:
 public:
     WinOpenGLDeviceInfo();
 
-    virtual ~WinOpenGLDeviceInfo() override;
-
-    virtual bool isDeviceBlocked() override;
+    bool isDeviceBlocked();
 
     const OUString& GetDriverVersion() const
     {
diff --git a/vcl/inc/opengl/x11/X11DeviceInfo.hxx b/vcl/inc/opengl/x11/X11DeviceInfo.hxx
index d51de3a69a2e..e55f24d23ec8 100644
--- a/vcl/inc/opengl/x11/X11DeviceInfo.hxx
+++ b/vcl/inc/opengl/x11/X11DeviceInfo.hxx
@@ -10,11 +10,9 @@
 #ifndef INCLUDED_VCL_INC_OPENGL_X11_X11DEVICEINFO_HXX
 #define INCLUDED_VCL_INC_OPENGL_X11_X11DEVICEINFO_HXX
 
-#include <opengl/DeviceInfo.hxx>
-
 #include <rtl/string.hxx>
 
-class X11OpenGLDeviceInfo final : public OpenGLDeviceInfo
+class X11OpenGLDeviceInfo final
 {
 private:
     bool mbIsMesa;
@@ -41,7 +39,7 @@ private:
 public:
     X11OpenGLDeviceInfo();
 
-    virtual bool isDeviceBlocked() override;
+    bool isDeviceBlocked();
 
     const OString& GetVendor() const
     {
diff --git a/vcl/source/opengl/DeviceInfo.cxx b/vcl/source/opengl/DeviceInfo.cxx
deleted file mode 100644
index f4bce64a88d8..000000000000
--- a/vcl/source/opengl/DeviceInfo.cxx
+++ /dev/null
@@ -1,14 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- */
-
-#include <opengl/DeviceInfo.hxx>
-
-OpenGLDeviceInfo::~OpenGLDeviceInfo() {}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/source/opengl/win/WinDeviceInfo.cxx b/vcl/source/opengl/win/WinDeviceInfo.cxx
index a43a304d8cb7..ef6a840f533b 100644
--- a/vcl/source/opengl/win/WinDeviceInfo.cxx
+++ b/vcl/source/opengl/win/WinDeviceInfo.cxx
@@ -163,10 +163,6 @@ WinOpenGLDeviceInfo::WinOpenGLDeviceInfo():
     GetData();
 }
 
-WinOpenGLDeviceInfo::~WinOpenGLDeviceInfo()
-{
-}
-
 static OUString getDenylistFile()
 {
     OUString url("$BRAND_BASE_DIR/" LIBO_SHARE_FOLDER);