and so glyphcache.hxx is revealed to be unx only

8 files changed, 9 insertions, 17 deletions

diff --git a/vcl/inc/glyphcache.hxx b/vcl/inc/unx/glyphcache.hxx
index a94ccd2b2130..40c3eb551f2f 100644
--- a/vcl/inc/glyphcache.hxx
+++ b/vcl/inc/unx/glyphcache.hxx
@@ -63,6 +63,7 @@ class GraphiteFaceWrapper;
 
 #include <ft2build.h>
 #include FT_FREETYPE_H
+#include FT_GLYPH_H
 
 namespace vcl
 {
diff --git a/vcl/unx/generic/gdi/gcach_xpeer.hxx b/vcl/unx/generic/gdi/gcach_xpeer.hxx
index d2b4ec259e8e..990cba36d245 100644
--- a/vcl/unx/generic/gdi/gcach_xpeer.hxx
+++ b/vcl/unx/generic/gdi/gcach_xpeer.hxx
@@ -33,7 +33,7 @@
 #include <X11/extensions/Xrender.h>
 #include <tools/postx.h>
 
-#include <glyphcache.hxx>
+#include "unx/glyphcache.hxx"
 
 class SalDisplay;
 struct MultiScreenGlyph;
diff --git a/vcl/unx/generic/gdi/pspgraphics.cxx b/vcl/unx/generic/gdi/pspgraphics.cxx
index a75ec2e5b30e..a3cae9210c06 100644
--- a/vcl/unx/generic/gdi/pspgraphics.cxx
+++ b/vcl/unx/generic/gdi/pspgraphics.cxx
@@ -37,6 +37,7 @@
 #include <sys/types.h>
 
 #include "unx/pspgraphics.h"
+#include "unx/glyphcache.hxx"
 
 #include "vcl/jobdata.hxx"
 #include "vcl/printerinfomanager.hxx"
@@ -46,7 +47,6 @@
 
 #include "printergfx.hxx"
 #include "salbmp.hxx"
-#include "glyphcache.hxx"
 #include "impfont.hxx"
 #include "outfont.hxx"
 #include "fontsubset.hxx"
diff --git a/vcl/unx/generic/glyphs/gcach_ftyp.hxx b/vcl/unx/generic/glyphs/gcach_ftyp.hxx
index e70b29debcbc..808f3868f3c4 100644
--- a/vcl/unx/generic/glyphs/gcach_ftyp.hxx
+++ b/vcl/unx/generic/glyphs/gcach_ftyp.hxx
@@ -29,19 +29,15 @@
 #ifndef _SV_GCACHFTYP_HXX
 #define _SV_GCACHFTYP_HXX
 
-#include <glyphcache.hxx>
-#include <rtl/textcvt.h>
+#include "unx/glyphcache.hxx"
 
-#include <ft2build.h>
-#include FT_FREETYPE_H
+#include <rtl/textcvt.h>
 
 class FreetypeServerFont;
 #ifdef ENABLE_GRAPHITE
 class GraphiteFaceWrapper;
 #endif
 
-struct FT_GlyphRec_;
-
 // -----------------------------------------------------------------------
 
 // FtFontFile has the responsibility that a font file is only mapped once.
diff --git a/vcl/unx/generic/glyphs/gcach_rbmp.cxx b/vcl/unx/generic/glyphs/gcach_rbmp.cxx
index 71784f5dd083..47321a343458 100644
--- a/vcl/unx/generic/glyphs/gcach_rbmp.cxx
+++ b/vcl/unx/generic/glyphs/gcach_rbmp.cxx
@@ -29,7 +29,7 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_vcl.hxx"
 
-#include <glyphcache.hxx>
+#include "unx/glyphcache.hxx"
 #include <string.h>
 
 //------------------------------------------------------------------------
diff --git a/vcl/unx/generic/glyphs/graphite_serverfont.cxx b/vcl/unx/generic/glyphs/graphite_serverfont.cxx
index a062b0ff6975..d7928eae77b9 100644
--- a/vcl/unx/generic/glyphs/graphite_serverfont.cxx
+++ b/vcl/unx/generic/glyphs/graphite_serverfont.cxx
@@ -40,13 +40,10 @@
 #include <sallayout.hxx>
 // Module
 #include "gcach_ftyp.hxx"
-#include <glyphcache.hxx>
+#include "unx/glyphcache.hxx"
 #include <graphite_features.hxx>
-//#include "graphite_textsrc.hxx"
 #include <graphite_serverfont.hxx>
 
-#ifndef WNT
-
 float freetypeServerFontAdvance(const void* appFontHandle, gr_uint16 glyphId)
 {
     ServerFont * pServerFont =
@@ -154,6 +151,4 @@ sal_GlyphId GraphiteLayoutImpl::getKashidaGlyph(int & width)
     return nKashidaIndex;
 }
 
-#endif
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/unx/headless/svppspgraphics.cxx b/vcl/unx/headless/svppspgraphics.cxx
index 7b463a338e13..0e6832efc694 100644
--- a/vcl/unx/headless/svppspgraphics.cxx
+++ b/vcl/unx/headless/svppspgraphics.cxx
@@ -49,13 +49,13 @@
 
 #include "salprn.hxx"
 #include "salbmp.hxx"
-#include "glyphcache.hxx"
 #include "impfont.hxx"
 #include "outfont.hxx"
 #include "fontsubset.hxx"
 #include "printergfx.hxx"
 #include "unx/headless/svppspgraphics.hxx"
 #include "unx/headless/svpbmp.hxx"
+#include "unx/glyphcache.hxx"
 #include "region.h"
 
 using namespace psp;
diff --git a/vcl/unx/headless/svptext.cxx b/vcl/unx/headless/svptext.cxx
index 4d3424605ba2..41908cbc06b2 100644
--- a/vcl/unx/headless/svptext.cxx
+++ b/vcl/unx/headless/svptext.cxx
@@ -39,10 +39,10 @@
 #endif
 
 #include <outfont.hxx>
-#include <glyphcache.hxx>
 #include <impfont.hxx>
 #include <rtl/instance.hxx>
 
+#include "unx/glyphcache.hxx"
 #include "unx/headless/svpgdi.hxx"
 #include "unx/headless/svpbmp.hxx"
 #include "unx/headless/svppspgraphics.hxx"