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

[Caolán McNamara]

 vcl/inc/unx/gtk/gtkdata.hxx  |    2 --
 vcl/inc/unx/gtk/gtkframe.hxx |    2 --
 vcl/inc/unx/gtk/gtkgdi.hxx   |    2 --
 vcl/unx/gtk/gtksalframe.cxx  |    5 +----
 4 files changed, 1 insertion(+), 10 deletions(-)

New commits:
commit 0b229f73b676d1e9f1dd28b04b6aae4de1f4de32
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Sep 7 13:12:11 2016 +0100

    gtk: drop unneeded X11 includes
    
    Change-Id: Iea6f90e40401bd3f0e4c54de598df2262f14b686

diff --git a/vcl/inc/unx/gtk/gtkdata.hxx b/vcl/inc/unx/gtk/gtkdata.hxx
index 4d4970a..21a407b 100644
--- a/vcl/inc/unx/gtk/gtkdata.hxx
+++ b/vcl/inc/unx/gtk/gtkdata.hxx
@@ -20,8 +20,6 @@
 #ifndef INCLUDED_VCL_INC_UNX_GTK_GTKDATA_HXX
 #define INCLUDED_VCL_INC_UNX_GTK_GTKDATA_HXX
 
-#include <X11/Xlib.h>
-#include <X11/Xutil.h>
 #define GLIB_DISABLE_DEPRECATION_WARNINGS
 #include <gdk/gdk.h>
 #include <gdk/gdkx.h>
diff --git a/vcl/inc/unx/gtk/gtkframe.hxx b/vcl/inc/unx/gtk/gtkframe.hxx
index 3748847..4f07262a 100644
--- a/vcl/inc/unx/gtk/gtkframe.hxx
+++ b/vcl/inc/unx/gtk/gtkframe.hxx
@@ -20,8 +20,6 @@
 #ifndef INCLUDED_VCL_INC_UNX_GTK_GTKFRAME_HXX
 #define INCLUDED_VCL_INC_UNX_GTK_GTKFRAME_HXX
 
-#include <X11/Xlib.h>
-#include <X11/Xutil.h>
 #include <cairo.h>
 #include <gdk/gdk.h>
 #include <gdk/gdkx.h>
diff --git a/vcl/inc/unx/gtk/gtkgdi.hxx b/vcl/inc/unx/gtk/gtkgdi.hxx
index 5bfcaf5d9..563bc74 100644
--- a/vcl/inc/unx/gtk/gtkgdi.hxx
+++ b/vcl/inc/unx/gtk/gtkgdi.hxx
@@ -20,8 +20,6 @@
 #ifndef INCLUDED_VCL_INC_UNX_GTK_GTKGDI_HXX
 #define INCLUDED_VCL_INC_UNX_GTK_GTKGDI_HXX
 
-#include <X11/Xlib.h>
-#include <X11/Xutil.h>
 #include <gtk/gtk.h>
 #include <gdk/gdkx.h>
 #include <gdk/gdkkeysyms.h>
diff --git a/vcl/unx/gtk/gtksalframe.cxx b/vcl/unx/gtk/gtksalframe.cxx
index e2e75f9..bb55677 100644
--- a/vcl/unx/gtk/gtksalframe.cxx
+++ b/vcl/unx/gtk/gtksalframe.cxx
@@ -50,11 +50,8 @@
 #endif
 
 #include <gtk/gtk.h>
-
-#include <X11/Xlib.h>
-#include <X11/Xutil.h>
-#include <X11/Xatom.h>
 #include <gdk/gdkx.h>
+#include <X11/Xatom.h>
 
 #include <dlfcn.h>
 #include <vcl/salbtype.hxx>