vcl: move vcl/generic/print files to vcl/unx/generic/print

These source files as all specific to Unix environments (not, however,
OS X) and are not "generic" (i.e. used across all platforms).

Change-Id: I6008a272c4b961a12702e2ef8727c56df9e80164
Reviewed-on: https://gerrit.libreoffice.org/21334
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Chris Sherlock <chris.sherlock79@gmail.com>

33 files changed, 43 insertions, 43 deletions

diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
index 65ad25d83d92..5556cf9d487e 100644
--- a/vcl/Library_vcl.mk
+++ b/vcl/Library_vcl.mk
@@ -545,15 +545,6 @@ vcl_really_generic_code= \
 vcl_generic_code= \
 	$(vcl_really_generic_code) \
     vcl/generic/app/gendisp \
-    vcl/generic/print/bitmap_gfx \
-    vcl/generic/print/common_gfx \
-    vcl/generic/print/glyphset \
-    vcl/generic/print/printerjob \
-    vcl/generic/print/psputil \
-    vcl/generic/print/genpspgraphics \
-    vcl/generic/print/genprnpsp \
-    vcl/generic/print/prtsetup \
-    vcl/generic/print/text_gfx \
 
 vcl_headless_code= \
     vcl/headless/svpbmp \
@@ -580,6 +571,15 @@ vcl_headless_freetype_code=\
     vcl/unx/generic/fontmanager/helper \
     vcl/unx/generic/fontmanager/parseAFM \
     vcl/headless/svpcairotextrender \
+    vcl/unx/generic/print/bitmap_gfx \
+    vcl/unx/generic/print/common_gfx \
+    vcl/unx/generic/print/glyphset \
+    vcl/unx/generic/print/printerjob \
+    vcl/unx/generic/print/psputil \
+    vcl/unx/generic/print/genpspgraphics \
+    vcl/unx/generic/print/genprnpsp \
+    vcl/unx/generic/print/prtsetup \
+    vcl/unx/generic/print/text_gfx \
 
 ifeq ($(USING_X11),TRUE)
 $(eval $(call gb_Library_add_exception_objects,vcl,\
diff --git a/vcl/headless/svpprn.cxx b/vcl/headless/svpprn.cxx
index 89413035513b..422da1ca578a 100644
--- a/vcl/headless/svpprn.cxx
+++ b/vcl/headless/svpprn.cxx
@@ -26,7 +26,7 @@
 #include "salptype.hxx"
 #include "saldatabasic.hxx"
 
-#include "generic/genpspgraphics.h"
+#include "unx/genpspgraphics.h"
 
 #include "headless/svpprn.hxx"
 #include "headless/svpinst.hxx"
diff --git a/vcl/inc/generic/geninst.h b/vcl/inc/generic/geninst.h
index 5e7e61e0a50a..cda664aa2522 100644
--- a/vcl/inc/generic/geninst.h
+++ b/vcl/inc/generic/geninst.h
@@ -26,7 +26,7 @@
 #include <vclpluginapi.h>
 #include <salinst.hxx>
 #include <saldatabasic.hxx>
-#include <generic/genprn.h>
+#include "unx/genprn.h"
 
 class VCL_DLLPUBLIC SalYieldMutexReleaser
 {
diff --git a/vcl/inc/headless/svpinst.hxx b/vcl/inc/headless/svpinst.hxx
index 2d2716eb1d4f..97fa2f8d66c6 100644
--- a/vcl/inc/headless/svpinst.hxx
+++ b/vcl/inc/headless/svpinst.hxx
@@ -26,7 +26,7 @@
 #include <salwtype.hxx>
 #include <saltimer.hxx>
 #include <generic/geninst.h>
-#include <generic/genprn.h>
+#include <unx/genprn.h>
 #include <basebmp/scanlineformats.hxx>
 
 #include <list>
diff --git a/vcl/inc/headless/svpprn.hxx b/vcl/inc/headless/svpprn.hxx
index 54280f60c931..61487e7a13f7 100644
--- a/vcl/inc/headless/svpprn.hxx
+++ b/vcl/inc/headless/svpprn.hxx
@@ -21,9 +21,9 @@
 #define INCLUDED_VCL_INC_HEADLESS_SVPPRN_HXX
 
 #include "vcl/jobdata.hxx"
-#include "generic/printergfx.hxx"
-#include "generic/printerjob.hxx"
-#include "generic/genprn.h"
+#include "unx/printergfx.hxx"
+#include "unx/printerjob.hxx"
+#include "unx/genprn.h"
 
 #include "vclpluginapi.h"
 
diff --git a/vcl/inc/generic/genprn.h b/vcl/inc/unx/genprn.h
index 5914784ba7c5..5fee250958a3 100644
--- a/vcl/inc/generic/genprn.h
+++ b/vcl/inc/unx/genprn.h
@@ -21,8 +21,8 @@
 #define INCLUDED_VCL_INC_GENERIC_GENPRN_H
 
 #include "vcl/jobdata.hxx"
-#include "generic/printergfx.hxx"
-#include "generic/printerjob.hxx"
+#include "unx/printergfx.hxx"
+#include "unx/printerjob.hxx"
 #include "salprn.hxx"
 #include "vclpluginapi.h"
 
diff --git a/vcl/inc/generic/genpspgraphics.h b/vcl/inc/unx/genpspgraphics.h
index 860f15bd794b..860f15bd794b 100644
--- a/vcl/inc/generic/genpspgraphics.h
+++ b/vcl/inc/unx/genpspgraphics.h
diff --git a/vcl/inc/unx/gtk/gtkprn.hxx b/vcl/inc/unx/gtk/gtkprn.hxx
index 910ddcbf4c32..e7da3c75b0fd 100644
--- a/vcl/inc/unx/gtk/gtkprn.hxx
+++ b/vcl/inc/unx/gtk/gtkprn.hxx
@@ -10,7 +10,7 @@
 #ifndef INCLUDED_VCL_INC_UNX_GTK_GTKPRN_HXX
 #define INCLUDED_VCL_INC_UNX_GTK_GTKPRN_HXX
 
-#include "generic/genprn.h"
+#include "unx/genprn.h"
 
 #include <memory>
 
diff --git a/vcl/inc/generic/printergfx.hxx b/vcl/inc/unx/printergfx.hxx
index e6eec88e53ab..e6eec88e53ab 100644
--- a/vcl/inc/generic/printergfx.hxx
+++ b/vcl/inc/unx/printergfx.hxx
diff --git a/vcl/inc/generic/printerjob.hxx b/vcl/inc/unx/printerjob.hxx
index c3738a5c3bef..c3738a5c3bef 100644
--- a/vcl/inc/generic/printerjob.hxx
+++ b/vcl/inc/unx/printerjob.hxx
diff --git a/vcl/unx/generic/app/salinst.cxx b/vcl/unx/generic/app/salinst.cxx
index af3f95cf09a2..697e16fba31e 100644
--- a/vcl/unx/generic/app/salinst.cxx
+++ b/vcl/unx/generic/app/salinst.cxx
@@ -27,9 +27,9 @@
 #include "unx/saldata.hxx"
 #include "unx/saldisp.hxx"
 #include "generic/geninst.h"
-#include "generic/genpspgraphics.h"
+#include "unx/genpspgraphics.h"
 #include "unx/salframe.h"
-#include "generic/genprn.h"
+#include "unx/genprn.h"
 #include "unx/sm.hxx"
 
 #include "vcl/apptypes.hxx"
diff --git a/vcl/unx/generic/fontmanager/fontsubst.cxx b/vcl/unx/generic/fontmanager/fontsubst.cxx
index f88944504764..c78ec9b1314e 100644
--- a/vcl/unx/generic/fontmanager/fontsubst.cxx
+++ b/vcl/unx/generic/fontmanager/fontsubst.cxx
@@ -18,13 +18,13 @@
  */
 
 #include "generic/geninst.h"
-#include "generic/genpspgraphics.h"
+#include "unx/genpspgraphics.h"
 #include "unx/glyphcache.hxx"
 
 #include "vcl/sysdata.hxx"
 #include "fontinstance.hxx"
 
-#include "generic/printergfx.hxx"
+#include "unx/printergfx.hxx"
 #include "salbmp.hxx"
 #include "impfont.hxx"
 #include "outdev.h"
diff --git a/vcl/unx/generic/gdi/cairotextrender.cxx b/vcl/unx/generic/gdi/cairotextrender.cxx
index 5e39d0e162c5..b48b0ca2b67c 100644
--- a/vcl/unx/generic/gdi/cairotextrender.cxx
+++ b/vcl/unx/generic/gdi/cairotextrender.cxx
@@ -25,8 +25,8 @@
 #include <vcl/svapp.hxx>
 #include <vcl/fontcharmap.hxx>
 
-#include "generic/printergfx.hxx"
-#include "generic/genpspgraphics.h"
+#include "unx/printergfx.hxx"
+#include "unx/genpspgraphics.h"
 #include "generic/geninst.h"
 #include "unx/glyphcache.hxx"
 #include "PhysicalFontFace.hxx"
diff --git a/vcl/unx/generic/gdi/salgdi.cxx b/vcl/unx/generic/gdi/salgdi.cxx
index 650bd83f184a..fc8554b85cf3 100644
--- a/vcl/unx/generic/gdi/salgdi.cxx
+++ b/vcl/unx/generic/gdi/salgdi.cxx
@@ -60,7 +60,7 @@
 #include "x11cairotextrender.hxx"
 #include "openglx11cairotextrender.hxx"
 
-#include "generic/printergfx.hxx"
+#include "unx/printergfx.hxx"
 #include "xrender_peer.hxx"
 #include "cairo_cairo.hxx"
 #include "cairo_xlib_cairo.hxx"
diff --git a/vcl/unx/generic/gdi/salgdi2.cxx b/vcl/unx/generic/gdi/salgdi2.cxx
index 629cf880a8cf..456d1467d05a 100644
--- a/vcl/unx/generic/gdi/salgdi2.cxx
+++ b/vcl/unx/generic/gdi/salgdi2.cxx
@@ -34,7 +34,7 @@
 #include <unx/x11/xlimits.hxx>
 #include "xrender_peer.hxx"
 
-#include "generic/printergfx.hxx"
+#include "unx/printergfx.hxx"
 
 #include "vcl/bmpacc.hxx"
 #include <outdata.hxx>
diff --git a/vcl/unx/generic/gdi/salgdi3.cxx b/vcl/unx/generic/gdi/salgdi3.cxx
index 9a45d116b182..5112546d5a53 100644
--- a/vcl/unx/generic/gdi/salgdi3.cxx
+++ b/vcl/unx/generic/gdi/salgdi3.cxx
@@ -45,8 +45,8 @@
 #include "fontmanager.hxx"
 #include "impfont.hxx"
 #include "gcach_xpeer.hxx"
-#include "generic/genpspgraphics.h"
-#include "generic/printergfx.hxx"
+#include "unx/genpspgraphics.h"
+#include "unx/printergfx.hxx"
 #include "outdev.h"
 #include "PhysicalFontCollection.hxx"
 #include "PhysicalFontFace.hxx"
diff --git a/vcl/generic/print/bitmap_gfx.cxx b/vcl/unx/generic/print/bitmap_gfx.cxx
index 3baff518fa46..47c48daa3a8b 100644
--- a/vcl/generic/print/bitmap_gfx.cxx
+++ b/vcl/unx/generic/print/bitmap_gfx.cxx
@@ -19,7 +19,7 @@
 
 #include "psputil.hxx"
 
-#include "generic/printergfx.hxx"
+#include "unx/printergfx.hxx"
 #include "vcl/strhelper.hxx"
 
 namespace psp {
diff --git a/vcl/generic/print/common_gfx.cxx b/vcl/unx/generic/print/common_gfx.cxx
index cc9724c16ace..3034e3e42dc3 100644
--- a/vcl/generic/print/common_gfx.cxx
+++ b/vcl/unx/generic/print/common_gfx.cxx
@@ -24,8 +24,8 @@
 #include "psputil.hxx"
 #include "glyphset.hxx"
 
-#include "generic/printergfx.hxx"
-#include "generic/printerjob.hxx"
+#include "unx/printergfx.hxx"
+#include "unx/printerjob.hxx"
 #include "fontmanager.hxx"
 #include "vcl/strhelper.hxx"
 #include "vcl/printerinfomanager.hxx"
diff --git a/vcl/generic/print/genprnpsp.cxx b/vcl/unx/generic/print/genprnpsp.cxx
index 36e3538fbb4f..5a961ba10252 100644
--- a/vcl/generic/print/genprnpsp.cxx
+++ b/vcl/unx/generic/print/genprnpsp.cxx
@@ -51,9 +51,9 @@
 #include "vcl/settings.hxx"
 #include "svids.hrc"
 #include "saldatabasic.hxx"
-#include "generic/genprn.h"
+#include "unx/genprn.h"
 #include "generic/geninst.h"
-#include "generic/genpspgraphics.h"
+#include "unx/genpspgraphics.h"
 
 #include "jobset.h"
 #include "print.h"
diff --git a/vcl/generic/print/genpspgraphics.cxx b/vcl/unx/generic/print/genpspgraphics.cxx
index d3cc75c1466b..80f4fa4d4ed0 100644
--- a/vcl/generic/print/genpspgraphics.cxx
+++ b/vcl/unx/generic/print/genpspgraphics.cxx
@@ -45,9 +45,9 @@
 
 #include "fontsubset.hxx"
 #include "generic/geninst.h"
-#include "generic/genpspgraphics.h"
+#include "unx/genpspgraphics.h"
 #include "unx/glyphcache.hxx"
-#include "generic/printergfx.hxx"
+#include "unx/printergfx.hxx"
 #include "impfont.hxx"
 #include "langboost.hxx"
 #include "fontinstance.hxx"
diff --git a/vcl/generic/print/glyphset.cxx b/vcl/unx/generic/print/glyphset.cxx
index b004a5ea0b66..7bd8e0324179 100644
--- a/vcl/generic/print/glyphset.cxx
+++ b/vcl/unx/generic/print/glyphset.cxx
@@ -22,7 +22,7 @@
 
 #include "sft.hxx"
 
-#include "generic/printergfx.hxx"
+#include "unx/printergfx.hxx"
 #include "fontsubset.hxx"
 #include "fontmanager.hxx"
 
diff --git a/vcl/generic/print/glyphset.hxx b/vcl/unx/generic/print/glyphset.hxx
index 4f68e502fb84..4f68e502fb84 100644
--- a/vcl/generic/print/glyphset.hxx
+++ b/vcl/unx/generic/print/glyphset.hxx
diff --git a/vcl/generic/print/printerjob.cxx b/vcl/unx/generic/print/printerjob.cxx
index b446c1b5cab7..746ceed6aca2 100644
--- a/vcl/generic/print/printerjob.cxx
+++ b/vcl/unx/generic/print/printerjob.cxx
@@ -26,8 +26,8 @@
 #include "psputil.hxx"
 #include "glyphset.hxx"
 
-#include "generic/printerjob.hxx"
-#include "generic/printergfx.hxx"
+#include "unx/printerjob.hxx"
+#include "unx/printergfx.hxx"
 #include "vcl/ppdparser.hxx"
 #include "vcl/strhelper.hxx"
 #include "vcl/printerinfomanager.hxx"
diff --git a/vcl/generic/print/prtsetup.cxx b/vcl/unx/generic/print/prtsetup.cxx
index a89ded554bc9..a89ded554bc9 100644
--- a/vcl/generic/print/prtsetup.cxx
+++ b/vcl/unx/generic/print/prtsetup.cxx
diff --git a/vcl/generic/print/prtsetup.hxx b/vcl/unx/generic/print/prtsetup.hxx
index 1d39f31420bb..1d39f31420bb 100644
--- a/vcl/generic/print/prtsetup.hxx
+++ b/vcl/unx/generic/print/prtsetup.hxx
diff --git a/vcl/generic/print/psheader.ps b/vcl/unx/generic/print/psheader.ps
index bbbd96760300..bbbd96760300 100644
--- a/vcl/generic/print/psheader.ps
+++ b/vcl/unx/generic/print/psheader.ps
diff --git a/vcl/generic/print/psputil.cxx b/vcl/unx/generic/print/psputil.cxx
index 7c363b9898ee..7c363b9898ee 100644
--- a/vcl/generic/print/psputil.cxx
+++ b/vcl/unx/generic/print/psputil.cxx
diff --git a/vcl/generic/print/psputil.hxx b/vcl/unx/generic/print/psputil.hxx
index 01a2d4f3cb31..01a2d4f3cb31 100644
--- a/vcl/generic/print/psputil.hxx
+++ b/vcl/unx/generic/print/psputil.hxx
diff --git a/vcl/generic/print/text_gfx.cxx b/vcl/unx/generic/print/text_gfx.cxx
index 3bf390d5f9ef..f5b1e7efa6b6 100644
--- a/vcl/generic/print/text_gfx.cxx
+++ b/vcl/unx/generic/print/text_gfx.cxx
@@ -22,7 +22,7 @@
 #include "psputil.hxx"
 #include "glyphset.hxx"
 
-#include "generic/printergfx.hxx"
+#include "unx/printergfx.hxx"
 #include "fontmanager.hxx"
 #include "vcl/helper.hxx"
 
diff --git a/vcl/unx/generic/window/salframe.cxx b/vcl/unx/generic/window/salframe.cxx
index d7eb98dce954..d88a7f9ad84b 100644
--- a/vcl/unx/generic/window/salframe.cxx
+++ b/vcl/unx/generic/window/salframe.cxx
@@ -50,7 +50,7 @@
 #include "unx/salframe.h"
 #include "unx/sm.hxx"
 #include "unx/wmadaptor.hxx"
-#include "generic/genprn.h"
+#include "unx/genprn.h"
 #include "unx/salbmp.h"
 #include "unx/i18n_ic.hxx"
 #include "unx/i18n_keysym.hxx"
diff --git a/vcl/unx/gtk/gtkinst.cxx b/vcl/unx/gtk/gtkinst.cxx
index 7ae75c43f963..99679ae6a2aa 100644
--- a/vcl/unx/gtk/gtkinst.cxx
+++ b/vcl/unx/gtk/gtkinst.cxx
@@ -32,7 +32,7 @@
 #include <headless/svpvd.hxx>
 #include <headless/svpbmp.hxx>
 #include <vcl/apptypes.hxx>
-#include <generic/genpspgraphics.h>
+#include <unx/genpspgraphics.h>
 #include <rtl/strbuf.hxx>
 #include <rtl/uri.hxx>
 
diff --git a/vcl/unx/gtk/gtksalframe.cxx b/vcl/unx/gtk/gtksalframe.cxx
index 29d5bca8fcf6..d49dafa4240b 100644
--- a/vcl/unx/gtk/gtksalframe.cxx
+++ b/vcl/unx/gtk/gtksalframe.cxx
@@ -27,7 +27,7 @@
 #include <unx/wmadaptor.hxx>
 #include <unx/sm.hxx>
 #include <unx/salbmp.h>
-#include <generic/genprn.h>
+#include <unx/genprn.h>
 #include <generic/geninst.h>
 #include <headless/svpgdi.hxx>
 #include <osl/file.hxx>
diff --git a/vcl/unx/gtk3/gtk3gtkframe.cxx b/vcl/unx/gtk3/gtk3gtkframe.cxx
index fea19c96f5e4..71a7b3da0543 100644
--- a/vcl/unx/gtk3/gtk3gtkframe.cxx
+++ b/vcl/unx/gtk3/gtk3gtkframe.cxx
@@ -27,7 +27,7 @@
 #include <unx/wmadaptor.hxx>
 #include <unx/sm.hxx>
 #include <unx/salbmp.h>
-#include <generic/genprn.h>
+#include <unx/genprn.h>
 #include <generic/geninst.h>
 #include <headless/svpgdi.hxx>
 #include <osl/file.hxx>