rename GtkData to GtkSalData

to match all of the other SalData derivates

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

3 files changed, 17 insertions, 17 deletions

diff --git a/vcl/unx/gtk/gtkdata.cxx b/vcl/unx/gtk/gtkdata.cxx
index a8a0322856df..f29663636633 100644
--- a/vcl/unx/gtk/gtkdata.cxx
+++ b/vcl/unx/gtk/gtkdata.cxx
@@ -410,10 +410,10 @@ int GtkSalDisplay::CaptureMouse( SalFrame* pSFrame )
 }
 
 /**********************************************************************
- * class GtkData                                                      *
+ * class GtkSalData                                                   *
  **********************************************************************/
 
-GtkData::GtkData( SalInstance *pInstance )
+GtkSalData::GtkSalData( SalInstance *pInstance )
     : SalGenericData( SAL_DATA_GTK, pInstance )
     , m_aDispatchMutex()
     , m_aDispatchCondition()
@@ -435,7 +435,7 @@ static int XIOErrorHdl(Display *)
 
 }
 
-GtkData::~GtkData()
+GtkSalData::~GtkSalData()
 {
     Yield( true, true );
     g_warning ("TESTME: We used to have a stop-timer here, but the central code should do this");
@@ -454,13 +454,13 @@ GtkData::~GtkData()
     XSetIOErrorHandler(aOrigXIOErrorHandler);
 }
 
-void GtkData::Dispose()
+void GtkSalData::Dispose()
 {
     deInitNWF();
 }
 
 /// Allows events to be processed, returns true if we processed an event.
-bool GtkData::Yield( bool bWait, bool bHandleAllCurrentEvents )
+bool GtkSalData::Yield( bool bWait, bool bHandleAllCurrentEvents )
 {
     /* #i33212# only enter g_main_context_iteration in one thread at any one
      * time, else one of them potentially will never end as long as there is
@@ -512,7 +512,7 @@ bool GtkData::Yield( bool bWait, bool bHandleAllCurrentEvents )
     return bWasEvent;
 }
 
-void GtkData::Init()
+void GtkSalData::Init()
 {
     int i;
     SAL_INFO( "vcl.gtk", "GtkMainloop::Init()" );
@@ -641,12 +641,12 @@ void GtkData::Init()
     }
 }
 
-void GtkData::ErrorTrapPush()
+void GtkSalData::ErrorTrapPush()
 {
     gdk_error_trap_push ();
 }
 
-bool GtkData::ErrorTrapPop( bool bIgnoreError )
+bool GtkSalData::ErrorTrapPop( bool bIgnoreError )
 {
     (void) bIgnoreError;
     return gdk_error_trap_pop () != 0;
@@ -815,10 +815,10 @@ void GtkSalTimer::Stop()
     }
 }
 
-gboolean GtkData::userEventFn( gpointer data )
+gboolean GtkSalData::userEventFn( gpointer data )
 {
     gboolean bContinue = FALSE;
-    GtkData *pThis = static_cast<GtkData *>(data);
+    GtkSalData *pThis = static_cast<GtkSalData *>(data);
     SalGenericData *pData = GetGenericData();
     SolarMutexGuard aGuard;
     const SalGenericDisplay *pDisplay = pData->GetDisplay();
@@ -850,12 +850,12 @@ extern "C" {
     static gboolean call_userEventFn( void *data )
     {
         SolarMutexGuard aGuard;
-        return GtkData::userEventFn( data );
+        return GtkSalData::userEventFn( data );
     }
 }
 
 // hEventGuard_ held during this invocation
-void GtkData::PostUserEvent()
+void GtkSalData::PostUserEvent()
 {
     if (m_pUserEvent)
         g_main_context_wakeup (nullptr); // really needed ?
diff --git a/vcl/unx/gtk/gtkinst.cxx b/vcl/unx/gtk/gtkinst.cxx
index eabae272c1d1..2cd8b11c44d1 100644
--- a/vcl/unx/gtk/gtkinst.cxx
+++ b/vcl/unx/gtk/gtkinst.cxx
@@ -115,7 +115,7 @@ extern "C"
         SAL_INFO("vcl.gtk", "creating GtkInstance " << pInstance);
 
         // Create SalData, this does not leak
-        new GtkData( pInstance );
+        new GtkSalData( pInstance );
 
         return pInstance;
     }
@@ -178,9 +178,9 @@ void GtkInstance::EnsureInit()
     if (!bNeedsInit)
         return;
     // initialize SalData
-    GtkData *pSalData = GetGtkSalData();
+    GtkSalData *pSalData = GetGtkSalData();
     pSalData->Init();
-    GtkData::initNWF();
+    GtkSalData::initNWF();
 
     InitAtkBridge();
 
diff --git a/vcl/unx/gtk/salnativewidgets-gtk.cxx b/vcl/unx/gtk/salnativewidgets-gtk.cxx
index 95fecb7d57c7..161caedefabd 100644
--- a/vcl/unx/gtk/salnativewidgets-gtk.cxx
+++ b/vcl/unx/gtk/salnativewidgets-gtk.cxx
@@ -470,7 +470,7 @@ inline void NW_gtk_border_set_from_border( GtkBorder& aDst, const GtkBorder * pS
 /*********************************************************
  * Initialize GTK and local stuff
  *********************************************************/
-void GtkData::initNWF()
+void GtkSalData::initNWF()
 {
     ImplSVData* pSVData = ImplGetSVData();
 
@@ -557,7 +557,7 @@ void GtkData::initNWF()
 /*********************************************************
  * Release GTK and local stuff
  *********************************************************/
-void GtkData::deInitNWF()
+void GtkSalData::deInitNWF()
 {
     for( size_t i = 0; i < gWidgetData.size(); i++ )
     {