vcl: drop GenericUnixSalDataType

It's just used for a singke assert and SalData is generally just
used as a static cast.

Change-Id: I8d74e82e511413d940a3f200f022a9204e588cd7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118288
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de>

3 files changed, 2 insertions, 19 deletions

diff --git a/vcl/inc/unx/gendata.hxx b/vcl/inc/unx/gendata.hxx
index f06dda35cb2e..f20281ff0602 100644
--- a/vcl/inc/unx/gendata.hxx
+++ b/vcl/inc/unx/gendata.hxx
@@ -23,23 +23,9 @@ namespace psp
 class PrintFontManager;
 }
 
-enum GenericUnixSalDataType
-{
-    SAL_DATA_GTK,
-    SAL_DATA_GTK3,
-    SAL_DATA_KF5,
-    SAL_DATA_UNX,
-    SAL_DATA_SVP,
-    SAL_DATA_ANDROID,
-    SAL_DATA_IOS,
-    SAL_DATA_HEADLESS,
-    SAL_DATA_QT5
-};
-
 class VCL_DLLPUBLIC GenericUnixSalData : public SalData
 {
 private:
-    GenericUnixSalDataType m_eType;
     SalGenericDisplay* m_pDisplay;
     // cached hostname to avoid slow lookup
     OUString m_aHostname;
@@ -53,7 +39,7 @@ private:
     void InitPrintFontManager();
 
 public:
-    GenericUnixSalData(GenericUnixSalDataType const t, SalInstance* const pInstance);
+    GenericUnixSalData(SalInstance* const pInstance);
     virtual ~GenericUnixSalData() override;
     virtual void Dispose() {}
 
@@ -69,8 +55,6 @@ public:
 
     OUString& GetUnicodeCommand() { return m_aUnicodeEntry; }
 
-    GenericUnixSalDataType GetType() const { return m_eType; }
-
     FreetypeManager* GetFreetypeManager()
     {
         if (!m_pFreetypeManager)
diff --git a/vcl/inc/unx/saldata.hxx b/vcl/inc/unx/saldata.hxx
index de66ace37def..f5819403ba63 100644
--- a/vcl/inc/unx/saldata.hxx
+++ b/vcl/inc/unx/saldata.hxx
@@ -44,7 +44,7 @@ class X11SalData final : public GenericUnixSalData
     std::unique_ptr<SalXLib>  pXLib_;
 
 public:
-             X11SalData( GenericUnixSalDataType t, SalInstance *pInstance );
+             X11SalData(SalInstance *pInstance);
     virtual ~X11SalData() override;
 
     virtual void            Init();
diff --git a/vcl/inc/unx/saldisp.hxx b/vcl/inc/unx/saldisp.hxx
index 591423df7683..59d02f394da0 100644
--- a/vcl/inc/unx/saldisp.hxx
+++ b/vcl/inc/unx/saldisp.hxx
@@ -417,7 +417,6 @@ namespace vcl_sal {
     inline SalDisplay *getSalDisplay(GenericUnixSalData const * data)
     {
         assert(data != nullptr);
-        assert(data->GetType() != SAL_DATA_GTK3);
         return static_cast<SalDisplay *>(data->GetDisplay());
     }
 }