vcl/Library_vcl.mk | 8 vcl/generic/fontmanager/fontsubst.cxx | 2 vcl/generic/glyphs/gcach_layout.cxx | 621 ------------------------- vcl/generic/glyphs/glyphcache.cxx | 379 --------------- vcl/generic/glyphs/graphite_serverfont.cxx | 135 ----- vcl/generic/glyphs/scrptrun.cxx | 234 --------- vcl/generic/glyphs/scrptrun.h | 173 ------ vcl/generic/print/genpspgraphics.cxx | 2 vcl/headless/svpglyphcache.cxx | 2 vcl/inc/generic/glyphcache.hxx | 300 ------------ vcl/inc/graphite_serverfont.hxx | 2 vcl/inc/unx/freetype_glyphcache.hxx | 2 vcl/inc/unx/glyphcache.hxx | 300 ++++++++++++ vcl/unx/generic/gdi/cairotextrender.cxx | 2 vcl/unx/generic/gdi/gcach_xpeer.hxx | 2 vcl/unx/generic/glyphs/gcach_layout.cxx | 621 +++++++++++++++++++++++++ vcl/unx/generic/glyphs/glyphcache.cxx | 379 +++++++++++++++ vcl/unx/generic/glyphs/graphite_serverfont.cxx | 135 +++++ vcl/unx/generic/glyphs/scrptrun.cxx | 234 +++++++++ vcl/unx/generic/glyphs/scrptrun.h | 173 ++++++ 20 files changed, 1853 insertions(+), 1853 deletions(-)
New commits: commit 09a1566bf18cdf98b111d4979e4f4ad52ce65b07 Author: Chris Sherlock <[email protected]> Date: Mon Jan 11 13:41:05 2016 +1100 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 <[email protected]> Reviewed-by: Chris Sherlock <[email protected]> diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk index b3dfd09..94ee4c3 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 5f7bfb3..f8894450 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 145bf7d..d3cc75c 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 a94ea85..e5c5675 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 0a5b913..137cb14 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 cf3c66b..3b8d315 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 similarity index 100% rename from vcl/inc/generic/glyphcache.hxx rename to vcl/inc/unx/glyphcache.hxx diff --git a/vcl/unx/generic/gdi/cairotextrender.cxx b/vcl/unx/generic/gdi/cairotextrender.cxx index 97af78f..5e39d0e 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 5d3b89f..d933c8b 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 similarity index 100% rename from vcl/generic/glyphs/gcach_layout.cxx rename to vcl/unx/generic/glyphs/gcach_layout.cxx diff --git a/vcl/generic/glyphs/glyphcache.cxx b/vcl/unx/generic/glyphs/glyphcache.cxx similarity index 100% rename from vcl/generic/glyphs/glyphcache.cxx rename to vcl/unx/generic/glyphs/glyphcache.cxx diff --git a/vcl/generic/glyphs/graphite_serverfont.cxx b/vcl/unx/generic/glyphs/graphite_serverfont.cxx similarity index 99% rename from vcl/generic/glyphs/graphite_serverfont.cxx rename to vcl/unx/generic/glyphs/graphite_serverfont.cxx index 623df7b..d2126b0 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 similarity index 100% rename from vcl/generic/glyphs/scrptrun.cxx rename to vcl/unx/generic/glyphs/scrptrun.cxx diff --git a/vcl/generic/glyphs/scrptrun.h b/vcl/unx/generic/glyphs/scrptrun.h similarity index 100% rename from vcl/generic/glyphs/scrptrun.h rename to vcl/unx/generic/glyphs/scrptrun.h _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
