vcl: move all glyph files from generic to unx

All the files in glyph are only used by Unix based systems, with the
exception of OS X. Therefore, it's not really "generic" as in "used
across all platforms" but is generic as in "used in all Unix-based
systems".

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

14 files changed, 12 insertions, 12 deletions

diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
index b3dfd097de0d..94ee4c35e964 100644
--- a/vcl/Library_vcl.mk
+++ b/vcl/Library_vcl.mk
@@ -423,7 +423,7 @@ $(eval $(call gb_Library_add_exception_objects,vcl,\
 # handle X11 platforms, which have additional files and possibly system graphite
 ifneq (,$(or $(USING_X11),$(ENABLE_HEADLESS)))
 $(eval $(call gb_Library_add_exception_objects,vcl,\
-    vcl/generic/glyphs/graphite_serverfont \
+    vcl/unx/generic/glyphs/graphite_serverfont \
 ))
 endif
 
@@ -555,9 +555,6 @@ vcl_generic_code= \
     vcl/generic/print/prtsetup \
     vcl/generic/print/text_gfx \
     vcl/generic/fontmanager/fontsubst \
-    vcl/generic/glyphs/gcach_layout \
-    vcl/generic/glyphs/glyphcache \
-    vcl/generic/glyphs/scrptrun \
     vcl/generic/fontmanager/fontcache \
     vcl/generic/fontmanager/fontconfig \
     vcl/generic/fontmanager/fontmanager \
@@ -579,6 +576,9 @@ vcl_headless_freetype_code=\
     vcl/headless/svpglyphcache \
     vcl/unx/generic/gdi/cairotextrender \
     vcl/unx/generic/glyphs/freetype_glyphcache \
+    vcl/unx/generic/glyphs/gcach_layout \
+    vcl/unx/generic/glyphs/glyphcache \
+    vcl/unx/generic/glyphs/scrptrun \
     vcl/headless/svpcairotextrender \
 
 ifeq ($(USING_X11),TRUE)
diff --git a/vcl/generic/fontmanager/fontsubst.cxx b/vcl/generic/fontmanager/fontsubst.cxx
index 5f7bfb361d46..f88944504764 100644
--- a/vcl/generic/fontmanager/fontsubst.cxx
+++ b/vcl/generic/fontmanager/fontsubst.cxx
@@ -19,7 +19,7 @@
 
 #include "generic/geninst.h"
 #include "generic/genpspgraphics.h"
-#include "generic/glyphcache.hxx"
+#include "unx/glyphcache.hxx"
 
 #include "vcl/sysdata.hxx"
 #include "fontinstance.hxx"
diff --git a/vcl/generic/print/genpspgraphics.cxx b/vcl/generic/print/genpspgraphics.cxx
index 145bf7dc18e6..d3cc75c1466b 100644
--- a/vcl/generic/print/genpspgraphics.cxx
+++ b/vcl/generic/print/genpspgraphics.cxx
@@ -46,7 +46,7 @@
 #include "fontsubset.hxx"
 #include "generic/geninst.h"
 #include "generic/genpspgraphics.h"
-#include "generic/glyphcache.hxx"
+#include "unx/glyphcache.hxx"
 #include "generic/printergfx.hxx"
 #include "impfont.hxx"
 #include "langboost.hxx"
diff --git a/vcl/headless/svpglyphcache.cxx b/vcl/headless/svpglyphcache.cxx
index a94ea85ea76f..e5c56751b9dc 100644
--- a/vcl/headless/svpglyphcache.cxx
+++ b/vcl/headless/svpglyphcache.cxx
@@ -25,7 +25,7 @@
 #include <tools/debug.hxx>
 
 #include "generic/geninst.h"
-#include "generic/glyphcache.hxx"
+#include "unx/glyphcache.hxx"
 #include "headless/svpgdi.hxx"
 
 namespace
diff --git a/vcl/inc/graphite_serverfont.hxx b/vcl/inc/graphite_serverfont.hxx
index 0a5b9133acf7..137cb14ba5e7 100644
--- a/vcl/inc/graphite_serverfont.hxx
+++ b/vcl/inc/graphite_serverfont.hxx
@@ -26,7 +26,7 @@
 #ifndef _MSC_VER
 #include <graphite_layout.hxx>
 
-#include "generic/glyphcache.hxx"
+#include "unx/glyphcache.hxx"
 
 class PhysicalFontFace;
 
diff --git a/vcl/inc/unx/freetype_glyphcache.hxx b/vcl/inc/unx/freetype_glyphcache.hxx
index cf3c66b5aa10..3b8d315e5a5c 100644
--- a/vcl/inc/unx/freetype_glyphcache.hxx
+++ b/vcl/inc/unx/freetype_glyphcache.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_VCL_GENERIC_GLYPHS_GCACH_FTYP_HXX
 #define INCLUDED_VCL_GENERIC_GLYPHS_GCACH_FTYP_HXX
 
-#include "generic/glyphcache.hxx"
+#include "unx/glyphcache.hxx"
 #include "PhysicalFontFace.hxx"
 
 #include <config_graphite.h>
diff --git a/vcl/inc/generic/glyphcache.hxx b/vcl/inc/unx/glyphcache.hxx
index da8f29c57608..da8f29c57608 100644
--- a/vcl/inc/generic/glyphcache.hxx
+++ b/vcl/inc/unx/glyphcache.hxx
diff --git a/vcl/unx/generic/gdi/cairotextrender.cxx b/vcl/unx/generic/gdi/cairotextrender.cxx
index 97af78fc5800..5e39d0e162c5 100644
--- a/vcl/unx/generic/gdi/cairotextrender.cxx
+++ b/vcl/unx/generic/gdi/cairotextrender.cxx
@@ -28,7 +28,7 @@
 #include "generic/printergfx.hxx"
 #include "generic/genpspgraphics.h"
 #include "generic/geninst.h"
-#include "generic/glyphcache.hxx"
+#include "unx/glyphcache.hxx"
 #include "PhysicalFontFace.hxx"
 #include "impfont.hxx"
 
diff --git a/vcl/unx/generic/gdi/gcach_xpeer.hxx b/vcl/unx/generic/gdi/gcach_xpeer.hxx
index 5d3b89ffe3f4..d933c8b61490 100644
--- a/vcl/unx/generic/gdi/gcach_xpeer.hxx
+++ b/vcl/unx/generic/gdi/gcach_xpeer.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_VCL_UNX_GENERIC_GDI_GCACH_XPEER_HXX
 #define INCLUDED_VCL_UNX_GENERIC_GDI_GCACH_XPEER_HXX
 
-#include "generic/glyphcache.hxx"
+#include "unx/glyphcache.hxx"
 
 class X11GlyphCache : public GlyphCache
 {
diff --git a/vcl/generic/glyphs/gcach_layout.cxx b/vcl/unx/generic/glyphs/gcach_layout.cxx
index 70ac1901f09d..70ac1901f09d 100644
--- a/vcl/generic/glyphs/gcach_layout.cxx
+++ b/vcl/unx/generic/glyphs/gcach_layout.cxx
diff --git a/vcl/generic/glyphs/glyphcache.cxx b/vcl/unx/generic/glyphs/glyphcache.cxx
index 33f06df2faab..33f06df2faab 100644
--- a/vcl/generic/glyphs/glyphcache.cxx
+++ b/vcl/unx/generic/glyphs/glyphcache.cxx
diff --git a/vcl/generic/glyphs/graphite_serverfont.cxx b/vcl/unx/generic/glyphs/graphite_serverfont.cxx
index 623df7b3fb8d..d2126b05f377 100644
--- a/vcl/generic/glyphs/graphite_serverfont.cxx
+++ b/vcl/unx/generic/glyphs/graphite_serverfont.cxx
@@ -24,7 +24,7 @@
 #include <sallayout.hxx>
 // Module
 #include "unx/freetype_glyphcache.hxx"
-#include "generic/glyphcache.hxx"
+#include "unx/glyphcache.hxx"
 #include <graphite_features.hxx>
 #include <graphite_serverfont.hxx>
 
diff --git a/vcl/generic/glyphs/scrptrun.cxx b/vcl/unx/generic/glyphs/scrptrun.cxx
index d6557d79a894..d6557d79a894 100644
--- a/vcl/generic/glyphs/scrptrun.cxx
+++ b/vcl/unx/generic/glyphs/scrptrun.cxx
diff --git a/vcl/generic/glyphs/scrptrun.h b/vcl/unx/generic/glyphs/scrptrun.h
index 2efcff4110ba..2efcff4110ba 100644
--- a/vcl/generic/glyphs/scrptrun.h
+++ b/vcl/unx/generic/glyphs/scrptrun.h