[Libreoffice-commits] core.git: vcl/inc

[Stephan Bergmann]

 vcl/inc/generic/gendata.hxx |    8 --------
 vcl/inc/unx/gtk/gtkdata.hxx |    5 +++++
 2 files changed, 5 insertions(+), 8 deletions(-)

New commits:
commit e09cd23cea227fc40110650488c5bd09f72b3a52
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Fri Dec 5 11:01:02 2014 +0100

    loplugin:cstylecast, involving pointer to incomplete type
    
    ...though it's unclear to me why loplugin:csytlecast doesn't complain about the
    C-style cast in GtkData::GetGtkDisplay; needs further investigation.
    
    Change-Id: Ie5c42dd2c1c97cf4092b2cb6bafa599cc36daab7

diff --git a/vcl/inc/generic/gendata.hxx b/vcl/inc/generic/gendata.hxx
index 384c20a..6c34226 100644
--- a/vcl/inc/generic/gendata.hxx
+++ b/vcl/inc/generic/gendata.hxx
@@ -14,8 +14,6 @@
 
 #include <saldatabasic.hxx>
 
-// Not the prettiest - but helpful for migrating old code ...
-class GtkSalDisplay;
 class SalGenericDisplay;
 
 enum SalGenericDataType { SAL_DATA_GTK, SAL_DATA_GTK3,
@@ -59,12 +57,6 @@ class VCL_DLLPUBLIC SalGenericData : public SalData
     // Mostly useful for remote protocol backends
     virtual void ErrorTrapPush() = 0;
     virtual bool ErrorTrapPop( bool bIgnoreError = true ) = 0; // true on error
-
-    // Not the prettiest - but helpful for migrating old code ...
-    inline GtkSalDisplay *GetGtkDisplay() const
-    {
-        return (GtkSalDisplay *)GetDisplay();
-    }
 };
 
 inline SalGenericData * GetGenericData()
diff --git a/vcl/inc/unx/gtk/gtkdata.hxx b/vcl/inc/unx/gtk/gtkdata.hxx
index 0622f59..235c599 100644
--- a/vcl/inc/unx/gtk/gtkdata.hxx
+++ b/vcl/inc/unx/gtk/gtkdata.hxx
@@ -118,6 +118,11 @@ public:
 
     virtual void ErrorTrapPush() SAL_OVERRIDE;
     virtual bool ErrorTrapPop( bool bIgnoreError ) SAL_OVERRIDE;
+
+    inline GtkSalDisplay *GetGtkDisplay() const
+    {
+        return (GtkSalDisplay *)GetDisplay();
+    }
 };
 
 class GtkSalFrame;