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>

6 files changed, 10 insertions, 10 deletions

diff --git a/vcl/unx/generic/app/saldata.cxx b/vcl/unx/generic/app/saldata.cxx
index b8d6de519ff0..eeadf9d083ac 100644
--- a/vcl/unx/generic/app/saldata.cxx
+++ b/vcl/unx/generic/app/saldata.cxx
@@ -243,8 +243,8 @@ static const char* XRequest[] = {
     "X_NoOperation"
 };
 
-X11SalData::X11SalData( SalGenericDataType t, SalInstance *pInstance )
-    : SalGenericData( t, pInstance )
+X11SalData::X11SalData( GenericUnixSalDataType t, SalInstance *pInstance )
+    : GenericUnixSalData( t, pInstance )
 {
     pXLib_          = nullptr;
 
diff --git a/vcl/unx/generic/app/saldisp.cxx b/vcl/unx/generic/app/saldisp.cxx
index e5980e5f9e43..c4250049a607 100644
--- a/vcl/unx/generic/app/saldisp.cxx
+++ b/vcl/unx/generic/app/saldisp.cxx
@@ -294,7 +294,7 @@ SalDisplay::SalDisplay( Display *display ) :
 #if OSL_DEBUG_LEVEL > 1
     fprintf( stderr, "SalDisplay::SalDisplay()\n" );
 #endif
-    SalGenericData *pData = GetGenericData();
+    GenericUnixSalData *pData = GetGenericData();
 
     SAL_WARN_IF(  pData->GetDisplay(), "vcl", "Second SalDisplay created !!!" );
     pData->SetDisplay( this );
@@ -322,7 +322,7 @@ SalDisplay::~SalDisplay()
 
 void SalDisplay::doDestruct()
 {
-    SalGenericData *pData = GetGenericData();
+    GenericUnixSalData *pData = GetGenericData();
 
     delete m_pWMAdaptor;
     m_pWMAdaptor = nullptr;
diff --git a/vcl/unx/generic/app/salinst.cxx b/vcl/unx/generic/app/salinst.cxx
index 456c238a1d08..3a98d3243e2b 100644
--- a/vcl/unx/generic/app/salinst.cxx
+++ b/vcl/unx/generic/app/salinst.cxx
@@ -141,7 +141,7 @@ Bool ImplPredicateEvent( Display *, XEvent *pEvent, char *pData )
 
 bool X11SalInstance::AnyInput(VclInputFlags nType)
 {
-    SalGenericData *pData = GetGenericData();
+    GenericUnixSalData *pData = GetGenericData();
     Display *pDisplay  = vcl_sal::getSalDisplay(pData)->GetDisplay();
     bool bRet = false;
 
diff --git a/vcl/unx/generic/window/salframe.cxx b/vcl/unx/generic/window/salframe.cxx
index f8baf9b0742e..ec179e8808f7 100644
--- a/vcl/unx/generic/window/salframe.cxx
+++ b/vcl/unx/generic/window/salframe.cxx
@@ -812,7 +812,7 @@ X11SalFrame::X11SalFrame( SalFrame *pParent, SalFrameStyleFlags nSalFrameStyle,
                           SystemParentData* pSystemParent ) :
     m_nXScreen( 0 )
 {
-    SalGenericData *pData = GetGenericData();
+    GenericUnixSalData *pData = GetGenericData();
 
     // initialize frame geometry
     memset( &maGeometry, 0, sizeof(maGeometry) );
diff --git a/vcl/unx/gtk/gtkdata.cxx b/vcl/unx/gtk/gtkdata.cxx
index f29663636633..7a304a859825 100644
--- a/vcl/unx/gtk/gtkdata.cxx
+++ b/vcl/unx/gtk/gtkdata.cxx
@@ -414,7 +414,7 @@ int GtkSalDisplay::CaptureMouse( SalFrame* pSFrame )
  **********************************************************************/
 
 GtkSalData::GtkSalData( SalInstance *pInstance )
-    : SalGenericData( SAL_DATA_GTK, pInstance )
+    : GenericUnixSalData( SAL_DATA_GTK, pInstance )
     , m_aDispatchMutex()
     , m_aDispatchCondition()
 {
@@ -819,7 +819,7 @@ gboolean GtkSalData::userEventFn( gpointer data )
 {
     gboolean bContinue = FALSE;
     GtkSalData *pThis = static_cast<GtkSalData *>(data);
-    SalGenericData *pData = GetGenericData();
+    GenericUnixSalData *pData = GetGenericData();
     SolarMutexGuard aGuard;
     const SalGenericDisplay *pDisplay = pData->GetDisplay();
     if (pDisplay)
diff --git a/vcl/unx/gtk3/gtk3gtkdata.cxx b/vcl/unx/gtk3/gtk3gtkdata.cxx
index c0d1b8021f00..88175a865003 100644
--- a/vcl/unx/gtk3/gtk3gtkdata.cxx
+++ b/vcl/unx/gtk3/gtk3gtkdata.cxx
@@ -385,7 +385,7 @@ int GtkSalDisplay::CaptureMouse( SalFrame* pSFrame )
  **********************************************************************/
 
 GtkSalData::GtkSalData( SalInstance *pInstance )
-    : SalGenericData( SAL_DATA_GTK3, pInstance )
+    : GenericUnixSalData( SAL_DATA_GTK3, pInstance )
     , m_aDispatchMutex()
     , m_aDispatchCondition()
 {
@@ -781,7 +781,7 @@ gboolean GtkSalData::userEventFn( gpointer data )
 {
     gboolean bContinue = FALSE;
     GtkSalData *pThis = static_cast<GtkSalData *>(data);
-    SalGenericData *pData = GetGenericData();
+    GenericUnixSalData *pData = GetGenericData();
     SolarMutexGuard aGuard;
     const SalGenericDisplay *pDisplay = pData->GetDisplay();
     if (pDisplay)