From 7eb4c6921850a5a377f6aa42ce4af85b145da01c Mon Sep 17 00:00:00 2001
From: Markus Mohrhard <markus.mohrhard@googlemail.com>
Date: Thu, 4 Jun 2015 17:39:48 +0200
Subject: remove all traces of old device code

Change-Id: I792749951f11e99504c708bf27bec56c2d98019e
Reviewed-on: https://gerrit.libreoffice.org/16331
Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
Tested-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
---
 vcl/inc/opengl/win/WinDeviceInfo.hxx | 32 ++------------------------------
 1 file changed, 2 insertions(+), 30 deletions(-)

(limited to 'vcl/inc/opengl')

diff --git a/vcl/inc/opengl/win/WinDeviceInfo.hxx b/vcl/inc/opengl/win/WinDeviceInfo.hxx
index 37779a56e83c..0c60b35f274e 100644
--- a/vcl/inc/opengl/win/WinDeviceInfo.hxx
+++ b/vcl/inc/opengl/win/WinDeviceInfo.hxx
@@ -47,22 +47,6 @@ enum VersionComparisonOp {
     DRIVER_COMPARISON_IGNORED
 };
 
-enum DeviceFamily {
-    IntelGMA500,
-    IntelGMA900,
-    IntelGMA950,
-    IntelGMA3150,
-    IntelGMAX3000,
-    IntelGMAX4500HD,
-    IntelHD3000,
-    IntelMobileHDGraphics,
-    NvidiaBlockD3D9Layers,
-    RadeonX1000,
-    Geforce7300GT,
-    Nvidia310M,
-    DeviceFamilyMax
-};
-
 enum DeviceVendor {
     VendorAll,
     VendorIntel,
@@ -77,15 +61,8 @@ bool ParseDriverVersion(const OUString& rString, uint64_t& rVersion);
 
 struct DriverInfo
 {
-    typedef std::vector<OUString> DeviceFamilyVector;
-
-    // If |ownDevices| is true, you are transferring ownership of the devices
-    // array, and it will be deleted when this GfxDriverInfo is destroyed.
-
-    DriverInfo(OperatingSystem os, const OUString& vendor, DeviceFamilyVector* devices,
-            VersionComparisonOp op,
-            uint64_t driverVersion, bool bWhiteListed = false, const char *suggestedVersion = nullptr,
-            bool ownDevices = false);
+    DriverInfo(OperatingSystem os, const OUString& vendor, VersionComparisonOp op,
+            uint64_t driverVersion, bool bWhiteListed = false, const char *suggestedVersion = nullptr);
 
     DriverInfo();
     DriverInfo(const DriverInfo&);
@@ -96,8 +73,6 @@ struct DriverInfo
 
     OUString maAdapterVendor;
 
-    static DeviceFamilyVector* const allDevices;
-    DeviceFamilyVector* mpDevices;
     std::vector<OUString> maDevices;
 
     // Whether the mDevices array should be deleted when this structure is
@@ -113,9 +88,6 @@ struct DriverInfo
     uint64_t mnDriverVersionMax;
     static uint64_t allDriverVersions;
 
-    static const DeviceFamilyVector* GetDeviceFamily(DeviceFamily id);
-    static DeviceFamilyVector* mpDeviceFamilies[DeviceFamilyMax];
-
     OUString maSuggestedVersion;
     OUString maMsg;
 };
-- 
cgit