summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Sherlock <chris.sherlock79@gmail.com>2016-01-11 13:20:38 +1100
committerChris Sherlock <chris.sherlock79@gmail.com>2016-01-11 03:30:24 +0000
commit557a6d20080e6f4d95db9e5b4dff87f3e51ac054 (patch)
treee6caca6a744d56a5f5dc4748e9b65751e84fc75b
parent12490c5a7fc681bcc689e659581a8471e7a8bb54 (diff)
vcl: rename gcach_ftyp.{cxx|hxx} to freetype_glyphcache.{cxx|hxx}
Change-Id: If17c0c36108c2437accba105e11a93a009d2c91f Reviewed-on: https://gerrit.libreoffice.org/21311 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Chris Sherlock <chris.sherlock79@gmail.com>
-rw-r--r--vcl/Library_vcl.mk2
-rw-r--r--vcl/generic/glyphs/gcach_layout.cxx2
-rw-r--r--vcl/generic/glyphs/glyphcache.cxx2
-rw-r--r--vcl/generic/glyphs/graphite_serverfont.cxx2
-rw-r--r--vcl/inc/unx/freetype_glyphcache.hxx (renamed from vcl/inc/unx/gcach_ftyp.hxx)0
-rw-r--r--vcl/unx/generic/glyphs/freetype_glyphcache.cxx (renamed from vcl/unx/generic/glyphs/gcach_ftyp.cxx)2
6 files changed, 5 insertions, 5 deletions
diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
index cfa9a981293a..b3dfd097de0d 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 9aa21bfb4f7b..70ac1901f09d 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 4d13c52a1f9f..33f06df2faab 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 63b0fa724147..623df7b3fb8d 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
index cf3c66b5aa10..cf3c66b5aa10 100644
--- a/vcl/inc/unx/gcach_ftyp.hxx
+++ b/vcl/inc/unx/freetype_glyphcache.hxx
diff --git a/vcl/unx/generic/glyphs/gcach_ftyp.cxx b/vcl/unx/generic/glyphs/freetype_glyphcache.cxx
index 7e49c0b5f236..5417590f2b63 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>