rename SalGenericData to GenericUnixSalData

since it's generic over the various unixen, not anything else

Change-Id: I994d5c9be99134b804e96bc045bf054fd9b434ef
Reviewed-on: https://gerrit.libreoffice.org/42455
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

4 files changed, 15 insertions, 15 deletions

diff --git a/vcl/inc/unx/gendata.hxx b/vcl/inc/unx/gendata.hxx
index 8a34120d2541..94d3b7ac0cfb 100644
--- a/vcl/inc/unx/gendata.hxx
+++ b/vcl/inc/unx/gendata.hxx
@@ -16,23 +16,23 @@
 
 class SalGenericDisplay;
 
-enum SalGenericDataType { SAL_DATA_GTK, SAL_DATA_GTK3,
-                          SAL_DATA_TDE3, SAL_DATA_KDE3, SAL_DATA_KDE4,
-                          SAL_DATA_UNX, SAL_DATA_SVP,
-                          SAL_DATA_ANDROID, SAL_DATA_IOS,
-                          SAL_DATA_HEADLESS };
+enum GenericUnixSalDataType { SAL_DATA_GTK, SAL_DATA_GTK3,
+                              SAL_DATA_TDE3, SAL_DATA_KDE3, SAL_DATA_KDE4,
+                              SAL_DATA_UNX, SAL_DATA_SVP,
+                              SAL_DATA_ANDROID, SAL_DATA_IOS,
+                              SAL_DATA_HEADLESS };
 
-class VCL_DLLPUBLIC SalGenericData : public SalData
+class VCL_DLLPUBLIC GenericUnixSalData : public SalData
 {
  protected:
-    SalGenericDataType m_eType;
+    GenericUnixSalDataType m_eType;
     SalGenericDisplay *m_pDisplay;
     // cached hostname to avoid slow lookup
     OUString      m_aHostname;
     // for transient storage of unicode strings eg. 'u123' by input methods
     OUString      m_aUnicodeEntry;
  public:
-    SalGenericData( SalGenericDataType t, SalInstance *pInstance ) : SalData(), m_eType( t ), m_pDisplay( nullptr ) { m_pInstance = pInstance; SetSalData( this ); }
+    GenericUnixSalData( GenericUnixSalDataType t, SalInstance *pInstance ) : SalData(), m_eType( t ), m_pDisplay( nullptr ) { m_pInstance = pInstance; SetSalData( this ); }
     virtual void Dispose() {}
 
     SalGenericDisplay *GetDisplay() const { return m_pDisplay; }
@@ -48,7 +48,7 @@ class VCL_DLLPUBLIC SalGenericData : public SalData
     {
         return m_aUnicodeEntry;
     }
-    SalGenericDataType GetType() const
+    GenericUnixSalDataType GetType() const
     {
         return m_eType;
     }
@@ -58,9 +58,9 @@ class VCL_DLLPUBLIC SalGenericData : public SalData
     virtual bool ErrorTrapPop( bool bIgnoreError = true ) = 0; // true on error
 };
 
-inline SalGenericData * GetGenericData()
+inline GenericUnixSalData * GetGenericData()
 {
-    return static_cast<SalGenericData *>(ImplGetSVData()->mpSalData);
+    return static_cast<GenericUnixSalData *>(ImplGetSVData()->mpSalData);
 }
 
 #endif
diff --git a/vcl/inc/unx/gtk/gtkdata.hxx b/vcl/inc/unx/gtk/gtkdata.hxx
index 36c42d0c3f09..146c1656f302 100644
--- a/vcl/inc/unx/gtk/gtkdata.hxx
+++ b/vcl/inc/unx/gtk/gtkdata.hxx
@@ -92,7 +92,7 @@ public:
     sal_uLong    m_nTimeoutMS;
 };
 
-class GtkSalData : public SalGenericData
+class GtkSalData : public GenericUnixSalData
 {
     GSource*        m_pUserEvent;
     osl::Mutex      m_aDispatchMutex;
diff --git a/vcl/inc/unx/saldata.hxx b/vcl/inc/unx/saldata.hxx
index e7899c4138f4..6a7902dbf444 100644
--- a/vcl/inc/unx/saldata.hxx
+++ b/vcl/inc/unx/saldata.hxx
@@ -44,7 +44,7 @@ class SalPrinter;
 typedef unsigned int pthread_t;
 #endif
 
-class VCLPLUG_GEN_PUBLIC X11SalData : public SalGenericData
+class VCLPLUG_GEN_PUBLIC X11SalData : public GenericUnixSalData
 {
     struct XErrorStackEntry
     {
@@ -59,7 +59,7 @@ protected:
     SalXLib      *pXLib_;
 
 public:
-             X11SalData( SalGenericDataType t, SalInstance *pInstance );
+             X11SalData( GenericUnixSalDataType t, SalInstance *pInstance );
     virtual ~X11SalData() override;
 
     virtual void            Init();
diff --git a/vcl/inc/unx/saldisp.hxx b/vcl/inc/unx/saldisp.hxx
index 2c23d6010c35..0ec4e10e7d65 100644
--- a/vcl/inc/unx/saldisp.hxx
+++ b/vcl/inc/unx/saldisp.hxx
@@ -402,7 +402,7 @@ namespace vcl_sal {
         const OUString& pLang,
         KeySym nSymbol );
 
-    inline SalDisplay *getSalDisplay(SalGenericData const * data)
+    inline SalDisplay *getSalDisplay(GenericUnixSalData const * data)
     {
         assert(data != nullptr);
         assert(data->GetType() != SAL_DATA_GTK3);