vcl/Library_vcl.mk | 2 vcl/generic/glyphs/gcach_layout.cxx | 2 vcl/generic/glyphs/glyphcache.cxx | 2 vcl/generic/glyphs/graphite_serverfont.cxx | 2 vcl/inc/unx/freetype_glyphcache.hxx | 164 ++ vcl/inc/unx/gcach_ftyp.hxx | 164 -- vcl/unx/generic/glyphs/freetype_glyphcache.cxx | 1547 +++++++++++++++++++++++++ vcl/unx/generic/glyphs/gcach_ftyp.cxx | 1547 ------------------------- 8 files changed, 1715 insertions(+), 1715 deletions(-)
New commits: commit 557a6d20080e6f4d95db9e5b4dff87f3e51ac054 Author: Chris Sherlock <chris.sherloc...@gmail.com> Date: Mon Jan 11 13:20:38 2016 +1100 vcl: rename gcach_ftyp.{cxx|hxx} to freetype_glyphcache.{cxx|hxx} Change-Id: If17c0c36108c2437accba105e11a93a009d2c91f Reviewed-on: https://gerrit.libreoffice.org/21311 Tested-by: Jenkins <c...@libreoffice.org> Reviewed-by: Chris Sherlock <chris.sherloc...@gmail.com> diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk index cfa9a98..b3dfd09 100644 --- a/vcl/Library_vcl.mk +++ b/vcl/Library_vcl.mk @@ -578,7 +578,7 @@ vcl_headless_freetype_code=\ vcl/headless/svptext \ vcl/headless/svpglyphcache \ vcl/unx/generic/gdi/cairotextrender \ - vcl/unx/generic/glyphs/gcach_ftyp \ + vcl/unx/generic/glyphs/freetype_glyphcache \ vcl/headless/svpcairotextrender \ ifeq ($(USING_X11),TRUE) diff --git a/vcl/generic/glyphs/gcach_layout.cxx b/vcl/generic/glyphs/gcach_layout.cxx index 9aa21bf..70ac190 100644 --- a/vcl/generic/glyphs/gcach_layout.cxx +++ b/vcl/generic/glyphs/gcach_layout.cxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include "unx/gcach_ftyp.hxx" +#include "unx/freetype_glyphcache.hxx" #include <sallayout.hxx> #include <salgdi.hxx> #include <scrptrun.h> diff --git a/vcl/generic/glyphs/glyphcache.cxx b/vcl/generic/glyphs/glyphcache.cxx index 4d13c52..33f06df 100644 --- a/vcl/generic/glyphs/glyphcache.cxx +++ b/vcl/generic/glyphs/glyphcache.cxx @@ -19,7 +19,7 @@ #include <stdlib.h> #include <math.h> -#include "unx/gcach_ftyp.hxx" +#include "unx/freetype_glyphcache.hxx" #include <vcl/svapp.hxx> #include <vcl/bitmap.hxx> diff --git a/vcl/generic/glyphs/graphite_serverfont.cxx b/vcl/generic/glyphs/graphite_serverfont.cxx index 63b0fa7..623df7b 100644 --- a/vcl/generic/glyphs/graphite_serverfont.cxx +++ b/vcl/generic/glyphs/graphite_serverfont.cxx @@ -23,7 +23,7 @@ #include <i18nlangtag/languagetag.hxx> #include <sallayout.hxx> // Module -#include "unx/gcach_ftyp.hxx" +#include "unx/freetype_glyphcache.hxx" #include "generic/glyphcache.hxx" #include <graphite_features.hxx> #include <graphite_serverfont.hxx> diff --git a/vcl/inc/unx/gcach_ftyp.hxx b/vcl/inc/unx/freetype_glyphcache.hxx similarity index 100% rename from vcl/inc/unx/gcach_ftyp.hxx rename to vcl/inc/unx/freetype_glyphcache.hxx diff --git a/vcl/unx/generic/glyphs/gcach_ftyp.cxx b/vcl/unx/generic/glyphs/freetype_glyphcache.cxx similarity index 99% rename from vcl/unx/generic/glyphs/gcach_ftyp.cxx rename to vcl/unx/generic/glyphs/freetype_glyphcache.cxx index 7e49c0b..5417590 100644 --- a/vcl/unx/generic/glyphs/gcach_ftyp.cxx +++ b/vcl/unx/generic/glyphs/freetype_glyphcache.cxx @@ -20,7 +20,7 @@ #include <vcl/fontcharmap.hxx> -#include "unx/gcach_ftyp.hxx" +#include "unx/freetype_glyphcache.hxx" #include "vcl/svapp.hxx" #include <fontinstance.hxx> _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits