Remove vcl/settings.hxx from vcl/svapp.hxx and vcl/outdev.hxx

Added vcl/settings.hxx to all cxx files which require it.
This helps to speed up compilation after changes to the settings.

Conflicts:
sc/source/ui/dbgui/pvlaydlg.cxx

Change-Id: I211a0735c47f72d6879f6f15339355abfe0e3cf4
Reviewed-on: https://gerrit.libreoffice.org/7933
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>

8 files changed, 12 insertions, 1 deletions

diff --git a/vcl/unx/generic/app/saldisp.cxx b/vcl/unx/generic/app/saldisp.cxx
index bfbc5582d7b1..607f413acfc5 100644
--- a/vcl/unx/generic/app/saldisp.cxx
+++ b/vcl/unx/generic/app/saldisp.cxx
@@ -57,6 +57,8 @@ Status XineramaGetInfo(Display*, int, XRectangle*, unsigned char*, int*);
 #include <postx.h>
 
 #include <vcl/svapp.hxx>
+#include <vcl/settings.hxx>
+
 #include <unx/salunx.h>
 #include <sal/types.h>
 #include "unx/i18n_im.hxx"
diff --git a/vcl/unx/generic/dtrans/bmp.cxx b/vcl/unx/generic/dtrans/bmp.cxx
index 06c57486d03d..a6a7f43370e3 100644
--- a/vcl/unx/generic/dtrans/bmp.cxx
+++ b/vcl/unx/generic/dtrans/bmp.cxx
@@ -31,6 +31,7 @@
 #include <tools/stream.hxx>
 #include <vcl/dibtools.hxx>
 #include <vcl/svapp.hxx>
+#include "vcl/bitmap.hxx"
 
 using namespace x11;
 
diff --git a/vcl/unx/generic/gdi/salgdi3.cxx b/vcl/unx/generic/gdi/salgdi3.cxx
index e150ebca23d6..84ec4f657873 100644
--- a/vcl/unx/generic/gdi/salgdi3.cxx
+++ b/vcl/unx/generic/gdi/salgdi3.cxx
@@ -47,6 +47,8 @@
 #include <boost/unordered_set.hpp>
 
 #include <vcl/sysdata.hxx>
+#include <vcl/settings.hxx>
+
 #include "generic/printergfx.hxx"
 #include "fontmanager.hxx"
 #include "vcl/jobdata.hxx"
diff --git a/vcl/unx/generic/printer/ppdparser.cxx b/vcl/unx/generic/printer/ppdparser.cxx
index dc0c3f928575..5204b036c9ba 100644
--- a/vcl/unx/generic/printer/ppdparser.cxx
+++ b/vcl/unx/generic/printer/ppdparser.cxx
@@ -28,6 +28,7 @@
 #include "vcl/strhelper.hxx"
 #include "vcl/helper.hxx"
 #include "vcl/svapp.hxx"
+#include "vcl/settings.hxx"
 #include "cupsmgr.hxx"
 #include "tools/urlobj.hxx"
 #include "tools/stream.hxx"
diff --git a/vcl/unx/gtk/app/gtkinst.cxx b/vcl/unx/gtk/app/gtkinst.cxx
index dbbcbd104e85..1f140f3141a3 100644
--- a/vcl/unx/gtk/app/gtkinst.cxx
+++ b/vcl/unx/gtk/app/gtkinst.cxx
@@ -35,9 +35,10 @@
 #include <vcl/apptypes.hxx>
 #include <generic/genpspgraphics.h>
 #include <rtl/strbuf.hxx>
-
 #include <rtl/uri.hxx>
 
+#include <vcl/settings.hxx>
+
 #include <dlfcn.h>
 #include <fcntl.h>
 #include <unistd.h>
diff --git a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
index 721f9b1d1236..01915a7c5576 100644
--- a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
+++ b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
@@ -36,6 +36,7 @@
 #include <boost/unordered_map.hpp>
 
 #include "vcl/vclenum.hxx"
+#include <vcl/settings.hxx>
 #include "fontmanager.hxx"
 #include <vcl/decoview.hxx>
 
diff --git a/vcl/unx/gtk/window/gtksalframe.cxx b/vcl/unx/gtk/window/gtksalframe.cxx
index 3fb2eb55624f..37d1bfad73da 100644
--- a/vcl/unx/gtk/window/gtksalframe.cxx
+++ b/vcl/unx/gtk/window/gtksalframe.cxx
@@ -36,6 +36,8 @@
 #include <vcl/floatwin.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/window.hxx>
+#include <vcl/settings.hxx>
+
 #if !GTK_CHECK_VERSION(3,0,0)
 #  include <unx/x11/xlimits.hxx>
 #endif
diff --git a/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx b/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx
index 1480d5e78568..e91c748196cd 100644
--- a/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx
+++ b/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx
@@ -14,6 +14,7 @@
 #include <unx/gtk/gtkdata.hxx>
 #include <unx/gtk/gtkinst.hxx>
 #include <unx/gtk/gtkgdi.hxx>
+#include <vcl/settings.hxx>
 #include "fontmanager.hxx"
 
 GtkStyleContext* GtkSalGraphics::mpButtonStyle = NULL;