mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Win/X11OpenGLDeviceInfo don't need a common base class

Browse Source 
Change-Id: I9fc7e763b8cf055c3aabaaa97fe8c85ebc5e71b6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131926
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
This commit is contained in:
Stephan Bergmann
2022-03-22 10:25:04 +01:00
parent 377e6f7e85
commit fe40f64578
7 changed files with 4 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
compilerplugins/clang/mergeclasses.results
View File

@@ -96,7 +96,6 @@ merge LwpDLVListHead with LwpPropList
merge LwpMarker with LwpStoryMarker
merge ObservableThread with SwAsyncRetrieveInputStreamThread
merge OldBasicPassword with basic::SfxScriptLibraryContainer
merge OpenGLDeviceInfo with X11OpenGLDeviceInfo
merge PPTExBulletProvider with PPTWriter
merge PriorityHBox with PriorityMergedHBox
merge PropertyAccessorBase with GenericPropertyAccessor

1
vcl/Library_vcl.mk
View File

@@ -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)), \

23
vcl/inc/opengl/DeviceInfo.hxx
View File

@@ -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: */

7
vcl/inc/opengl/win/WinDeviceInfo.hxx
View File

@@ -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
{

6
vcl/inc/opengl/x11/X11DeviceInfo.hxx
View File

@@ -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
{

14
vcl/source/opengl/DeviceInfo.cxx
View File

@@ -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: */

4
vcl/source/opengl/win/WinDeviceInfo.cxx
View File

@@ -163,10 +163,6 @@ WinOpenGLDeviceInfo::WinOpenGLDeviceInfo():
GetData();
}
WinOpenGLDeviceInfo::~WinOpenGLDeviceInfo()
{
}
static OUString getDenylistFile()
{
OUString url("$BRAND_BASE_DIR/" LIBO_SHARE_FOLDER);