[Libreoffice-commits] core.git: vcl/inc vcl/opengl vcl/unx
Caolán McNamara
caolanm at redhat.com
Tue Sep 6 07:48:11 UTC 2016
vcl/inc/unx/gtk/gtkdata.hxx | 1 -
vcl/opengl/x11/salvd.cxx | 1 -
vcl/unx/generic/app/i18n_ic.cxx | 1 -
vcl/unx/generic/app/i18n_status.cxx | 2 +-
vcl/unx/generic/app/i18n_xkb.cxx | 1 -
vcl/unx/generic/app/randrwrapper.cxx | 1 -
vcl/unx/generic/app/saldata.cxx | 1 -
vcl/unx/generic/app/sm.cxx | 1 -
vcl/unx/generic/app/wmadaptor.cxx | 2 +-
vcl/unx/generic/dtrans/X11_selection.cxx | 1 -
vcl/unx/generic/gdi/gcach_xpeer.cxx | 1 -
vcl/unx/generic/gdi/gdiimpl.cxx | 3 +--
vcl/unx/generic/gdi/salbmp.cxx | 1 -
vcl/unx/generic/gdi/salgdi.cxx | 3 +--
vcl/unx/generic/gdi/salgdi2.cxx | 4 ++--
vcl/unx/generic/gdi/salvd.cxx | 4 ++--
vcl/unx/generic/gdi/x11cairotextrender.cxx | 1 -
vcl/unx/generic/gdi/x11cairotextrender.hxx | 4 +---
vcl/unx/generic/gdi/xrender_peer.cxx | 1 -
vcl/unx/generic/printer/printerinfomanager.cxx | 2 +-
vcl/unx/generic/window/salframe.cxx | 2 +-
vcl/unx/generic/window/salobj.cxx | 1 -
vcl/unx/gtk/salnativewidgets-gtk.cxx | 2 +-
vcl/unx/kde4/KDESalDisplay.cxx | 1 -
vcl/unx/kde4/KDESalGraphics.cxx | 1 -
vcl/unx/x11/x11sys.cxx | 1 -
26 files changed, 12 insertions(+), 32 deletions(-)
New commits:
commit 495ad69a2eb2b0b12bf799a8f973a7121c4722d2
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Sep 5 20:41:18 2016 +0100
don't need to include all these headers, reduce to required min
Change-Id: I1f05ed32cabc059309f46ec0a195705f0e774bd6
diff --git a/vcl/inc/unx/gtk/gtkdata.hxx b/vcl/inc/unx/gtk/gtkdata.hxx
index 4e29401..4d4970a 100644
--- a/vcl/inc/unx/gtk/gtkdata.hxx
+++ b/vcl/inc/unx/gtk/gtkdata.hxx
@@ -29,7 +29,6 @@
#include <unx/gendata.hxx>
#include <unx/saldisp.hxx>
-#include <unx/saldata.hxx>
#include <unx/gtk/gtksys.hxx>
#include <vcl/ptrstyle.hxx>
#include <osl/conditn.h>
diff --git a/vcl/opengl/x11/salvd.cxx b/vcl/opengl/x11/salvd.cxx
index d6b8eaf..ff0a2c3 100644
--- a/vcl/opengl/x11/salvd.cxx
+++ b/vcl/opengl/x11/salvd.cxx
@@ -10,7 +10,6 @@
#include <vcl/sysdata.hxx>
#include <unx/salunx.h>
-#include <unx/saldata.hxx>
#include <unx/saldisp.hxx>
#include <unx/salgdi.h>
#include <unx/salvd.h>
diff --git a/vcl/unx/generic/app/i18n_ic.cxx b/vcl/unx/generic/app/i18n_ic.cxx
index 503cd87..e83a3f5 100644
--- a/vcl/unx/generic/app/i18n_ic.cxx
+++ b/vcl/unx/generic/app/i18n_ic.cxx
@@ -32,7 +32,6 @@
#include <unx/i18n_status.hxx>
#include <unx/salframe.h>
-#include <unx/saldata.hxx>
#include <unx/saldisp.hxx>
using namespace vcl;
diff --git a/vcl/unx/generic/app/i18n_status.cxx b/vcl/unx/generic/app/i18n_status.cxx
index ffd7b76..769e056 100644
--- a/vcl/unx/generic/app/i18n_status.cxx
+++ b/vcl/unx/generic/app/i18n_status.cxx
@@ -31,7 +31,7 @@
#include <unx/i18n_ic.hxx>
#include <unx/saldisp.hxx>
#include <unx/salframe.h>
-#include <unx/saldata.hxx>
+#include <unx/salinst.h>
#include <vcl/wrkwin.hxx>
#include <vcl/fixed.hxx>
diff --git a/vcl/unx/generic/app/i18n_xkb.cxx b/vcl/unx/generic/app/i18n_xkb.cxx
index cc8a0a8..79739be 100644
--- a/vcl/unx/generic/app/i18n_xkb.cxx
+++ b/vcl/unx/generic/app/i18n_xkb.cxx
@@ -23,7 +23,6 @@
#include <X11/XKBlib.h>
#include "unx/saldisp.hxx"
-#include "unx/saldata.hxx"
#include "unx/i18n_xkb.hxx"
SalI18N_KeyboardExtension::SalI18N_KeyboardExtension( Display* pDisplay )
diff --git a/vcl/unx/generic/app/randrwrapper.cxx b/vcl/unx/generic/app/randrwrapper.cxx
index 0ae4027..27dbeb1 100644
--- a/vcl/unx/generic/app/randrwrapper.cxx
+++ b/vcl/unx/generic/app/randrwrapper.cxx
@@ -105,7 +105,6 @@ void RandRWrapper::releaseWrapper()
#endif
#include "unx/saldisp.hxx"
-#include "unx/salframe.h"
#if OSL_DEBUG_LEVEL > 1
#include <cstdio>
#endif
diff --git a/vcl/unx/generic/app/saldata.cxx b/vcl/unx/generic/app/saldata.cxx
index 15e541a..a75fe0a 100644
--- a/vcl/unx/generic/app/saldata.cxx
+++ b/vcl/unx/generic/app/saldata.cxx
@@ -44,7 +44,6 @@
#include "unx/saldisp.hxx"
#include "unx/saldata.hxx"
-#include "unx/salframe.h"
#include "unx/sm.hxx"
#include "unx/i18n_im.hxx"
#include "unx/i18n_xkb.hxx"
diff --git a/vcl/unx/generic/app/sm.cxx b/vcl/unx/generic/app/sm.cxx
index 4a95813..9a4c1f1 100644
--- a/vcl/unx/generic/app/sm.cxx
+++ b/vcl/unx/generic/app/sm.cxx
@@ -37,7 +37,6 @@
#include <X11/Xatom.h>
#include <unx/sm.hxx>
-#include <unx/saldata.hxx>
#include <unx/saldisp.hxx>
#include <unx/salframe.h>
#include <unx/salinst.h>
diff --git a/vcl/unx/generic/app/wmadaptor.cxx b/vcl/unx/generic/app/wmadaptor.cxx
index 640c16f..0c142e3 100644
--- a/vcl/unx/generic/app/wmadaptor.cxx
+++ b/vcl/unx/generic/app/wmadaptor.cxx
@@ -31,7 +31,7 @@
#include "unx/wmadaptor.hxx"
#include "unx/saldisp.hxx"
-#include "unx/saldata.hxx"
+#include "unx/salinst.h"
#include "unx/salframe.h"
#include "salgdi.hxx"
diff --git a/vcl/unx/generic/dtrans/X11_selection.cxx b/vcl/unx/generic/dtrans/X11_selection.cxx
index 50ccb40..89caeb7 100644
--- a/vcl/unx/generic/dtrans/X11_selection.cxx
+++ b/vcl/unx/generic/dtrans/X11_selection.cxx
@@ -22,7 +22,6 @@
#include <cstdlib>
#include "unx/saldisp.hxx"
-#include "unx/saldata.hxx"
#include <unistd.h>
#include <stdio.h>
diff --git a/vcl/unx/generic/gdi/gcach_xpeer.cxx b/vcl/unx/generic/gdi/gcach_xpeer.cxx
index c74498e..b72c624 100644
--- a/vcl/unx/generic/gdi/gcach_xpeer.cxx
+++ b/vcl/unx/generic/gdi/gcach_xpeer.cxx
@@ -22,7 +22,6 @@
#include "osl/thread.h"
#include "unx/saldisp.hxx"
-#include "unx/saldata.hxx"
#include "unx/salgdi.h"
#include "gcach_xpeer.hxx"
diff --git a/vcl/unx/generic/gdi/gdiimpl.cxx b/vcl/unx/generic/gdi/gdiimpl.cxx
index 0a07349..ed7b377 100644
--- a/vcl/unx/generic/gdi/gdiimpl.cxx
+++ b/vcl/unx/generic/gdi/gdiimpl.cxx
@@ -28,13 +28,12 @@
#include <vcl/gradient.hxx>
#include "unx/salunx.h"
-#include "unx/saldata.hxx"
#include "unx/saldisp.hxx"
#include "unx/salbmp.h"
#include "unx/salgdi.h"
-#include "unx/salframe.h"
#include "unx/salvd.h"
#include <unx/x11/xlimits.hxx>
+#include "salframe.hxx"
#include "xrender_peer.hxx"
#include "outdata.hxx"
diff --git a/vcl/unx/generic/gdi/salbmp.cxx b/vcl/unx/generic/gdi/salbmp.cxx
index bcba7e6..158a2f5 100644
--- a/vcl/unx/generic/gdi/salbmp.cxx
+++ b/vcl/unx/generic/gdi/salbmp.cxx
@@ -35,7 +35,6 @@
#include <com/sun/star/beans/XFastPropertySet.hpp>
#include <unx/salunx.h>
-#include <unx/saldata.hxx>
#include <unx/saldisp.hxx>
#include <unx/salgdi.h>
#include <unx/salbmp.h>
diff --git a/vcl/unx/generic/gdi/salgdi.cxx b/vcl/unx/generic/gdi/salgdi.cxx
index 72daa71..cfd8925 100644
--- a/vcl/unx/generic/gdi/salgdi.cxx
+++ b/vcl/unx/generic/gdi/salgdi.cxx
@@ -43,13 +43,12 @@
#include <basegfx/curve/b2dcubicbezier.hxx>
#include <vcl/jobdata.hxx>
+#include <vcl/sysdata.hxx>
#include <vcl/virdev.hxx>
#include "unx/salunx.h"
-#include "unx/saldata.hxx"
#include "unx/saldisp.hxx"
#include "unx/salgdi.h"
-#include "unx/salframe.h"
#include "unx/salvd.h"
#include "unx/x11/x11gdiimpl.h"
#include <unx/x11/xlimits.hxx>
diff --git a/vcl/unx/generic/gdi/salgdi2.cxx b/vcl/unx/generic/gdi/salgdi2.cxx
index 2080210..a600c31 100644
--- a/vcl/unx/generic/gdi/salgdi2.cxx
+++ b/vcl/unx/generic/gdi/salgdi2.cxx
@@ -21,18 +21,18 @@
#include "salgdiimpl.hxx"
#include <vcl/salbtype.hxx>
+#include <vcl/sysdata.hxx>
#include "unx/pixmap.hxx"
#include "unx/salunx.h"
-#include "unx/saldata.hxx"
#include "unx/saldisp.hxx"
#include "unx/salbmp.h"
#include "unx/salgdi.h"
-#include "unx/salframe.h"
#include "unx/salvd.h"
#include "unx/x11/x11gdiimpl.h"
#include <unx/x11/xlimits.hxx>
#include "xrender_peer.hxx"
+#include "salframe.hxx"
#include "unx/printergfx.hxx"
diff --git a/vcl/unx/generic/gdi/salvd.cxx b/vcl/unx/generic/gdi/salvd.cxx
index f4d8961..16d8d87 100644
--- a/vcl/unx/generic/gdi/salvd.cxx
+++ b/vcl/unx/generic/gdi/salvd.cxx
@@ -23,10 +23,10 @@
#include <X11/Xutil.h>
#include <X11/extensions/Xrender.h>
-#include <unx/salunx.h>
-#include <unx/saldata.hxx>
#include <unx/saldisp.hxx>
+#include <unx/salinst.h>
#include <unx/salgdi.h>
+#include <unx/salunx.h>
#include <unx/salvd.h>
#include <unx/x11/xlimits.hxx>
diff --git a/vcl/unx/generic/gdi/x11cairotextrender.cxx b/vcl/unx/generic/gdi/x11cairotextrender.cxx
index f25ed1f..612b921 100644
--- a/vcl/unx/generic/gdi/x11cairotextrender.cxx
+++ b/vcl/unx/generic/gdi/x11cairotextrender.cxx
@@ -18,7 +18,6 @@
*/
#include "x11cairotextrender.hxx"
-#include "unx/saldata.hxx"
#include "unx/saldisp.hxx"
#include "unx/salvd.h"
diff --git a/vcl/unx/generic/gdi/x11cairotextrender.hxx b/vcl/unx/generic/gdi/x11cairotextrender.hxx
index f614a4d..5e2648b 100644
--- a/vcl/unx/generic/gdi/x11cairotextrender.hxx
+++ b/vcl/unx/generic/gdi/x11cairotextrender.hxx
@@ -21,11 +21,9 @@
#define INCLUDED_VCL_UNX_GENERIC_GDI_X11CAIROTEXTRENDER_HXX
#include "unx/cairotextrender.hxx"
-
-#include "unx/saldata.hxx"
#include "unx/saldisp.hxx"
-
#include "unx/salgdi.h"
+#include "salframe.hxx"
class X11CairoTextRender : public CairoTextRender
{
diff --git a/vcl/unx/generic/gdi/xrender_peer.cxx b/vcl/unx/generic/gdi/xrender_peer.cxx
index b29bc66..4104a5a 100644
--- a/vcl/unx/generic/gdi/xrender_peer.cxx
+++ b/vcl/unx/generic/gdi/xrender_peer.cxx
@@ -19,7 +19,6 @@
#include <rtl/ustring.hxx>
#include <unx/salunx.h>
-#include <unx/saldata.hxx>
#include <unx/saldisp.hxx>
#include <xrender_peer.hxx>
diff --git a/vcl/unx/generic/printer/printerinfomanager.cxx b/vcl/unx/generic/printer/printerinfomanager.cxx
index 2c39a87..0111bcb 100644
--- a/vcl/unx/generic/printer/printerinfomanager.cxx
+++ b/vcl/unx/generic/printer/printerinfomanager.cxx
@@ -24,7 +24,7 @@
#include "unx/cupsmgr.hxx"
#include <vcl/strhelper.hxx>
-#include "unx/saldata.hxx"
+#include "saldatabasic.hxx"
#include "tools/urlobj.hxx"
#include "tools/stream.hxx"
diff --git a/vcl/unx/generic/window/salframe.cxx b/vcl/unx/generic/window/salframe.cxx
index 349d09f..491d629 100644
--- a/vcl/unx/generic/window/salframe.cxx
+++ b/vcl/unx/generic/window/salframe.cxx
@@ -44,7 +44,7 @@
#include <X11/extensions/shape.h>
#include "unx/salunx.h"
-#include "unx/saldata.hxx"
+#include "saldatabasic.hxx"
#include "unx/saldisp.hxx"
#include "unx/salgdi.h"
#include "unx/salframe.h"
diff --git a/vcl/unx/generic/window/salobj.cxx b/vcl/unx/generic/window/salobj.cxx
index 2c4d61a3..80c0726 100644
--- a/vcl/unx/generic/window/salobj.cxx
+++ b/vcl/unx/generic/window/salobj.cxx
@@ -31,7 +31,6 @@
#include <vcl/event.hxx>
#include <unx/salunx.h>
-#include <unx/saldata.hxx>
#include <unx/salinst.h>
#include <unx/saldisp.hxx>
#include <unx/salframe.h>
diff --git a/vcl/unx/gtk/salnativewidgets-gtk.cxx b/vcl/unx/gtk/salnativewidgets-gtk.cxx
index c6b8380..d096423 100644
--- a/vcl/unx/gtk/salnativewidgets-gtk.cxx
+++ b/vcl/unx/gtk/salnativewidgets-gtk.cxx
@@ -27,7 +27,7 @@
#include "unx/gtk/gtkgdi.hxx"
#include "unx/pixmap.hxx"
-#include "unx/saldata.hxx"
+#include "saldatabasic.hxx"
#include "unx/saldisp.hxx"
#include <cstdio>
diff --git a/vcl/unx/kde4/KDESalDisplay.cxx b/vcl/unx/kde4/KDESalDisplay.cxx
index 105393f..7c30c7a 100644
--- a/vcl/unx/kde4/KDESalDisplay.cxx
+++ b/vcl/unx/kde4/KDESalDisplay.cxx
@@ -23,7 +23,6 @@
#include "VCLKDEApplication.hxx"
#include <assert.h>
-#include <unx/saldata.hxx>
SalKDEDisplay* SalKDEDisplay::selfptr = nullptr;
diff --git a/vcl/unx/kde4/KDESalGraphics.cxx b/vcl/unx/kde4/KDESalGraphics.cxx
index 0a7066f..1c84e59 100644
--- a/vcl/unx/kde4/KDESalGraphics.cxx
+++ b/vcl/unx/kde4/KDESalGraphics.cxx
@@ -34,7 +34,6 @@
#include <vcl/settings.hxx>
#include <vcl/decoview.hxx>
#include <rtl/ustrbuf.hxx>
-#include <unx/saldata.hxx>
/**
Conversion function between VCL ControlState together with
diff --git a/vcl/unx/x11/x11sys.cxx b/vcl/unx/x11/x11sys.cxx
index 31fd008..e4f4b295 100644
--- a/vcl/unx/x11/x11sys.cxx
+++ b/vcl/unx/x11/x11sys.cxx
@@ -18,7 +18,6 @@
*/
#include <unx/salunx.h>
-#include <unx/saldata.hxx>
#include <unx/salinst.h>
#include <unx/saldisp.hxx>
#include <unx/x11/x11sys.hxx>
More information about the Libreoffice-commits
mailing list