From 40652d626dc52d09f28ec25e1a986c036ac171ae Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Mon, 15 Mar 2010 01:26:30 -0300 Subject: [PATCH] Remove Font_metric::index_to_ascii. --- lily/font-metric.cc | 8 +------- lily/include/font-metric.hh | 6 ------ lily/include/modified-font-metric.hh | 1 - lily/modified-font-metric.cc | 6 ------ 4 files changed, 1 insertion(+), 20 deletions(-) diff --git a/lily/font-metric.cc b/lily/font-metric.cc index a27dda61d1..691ed2b5e5 100644 --- a/lily/font-metric.cc +++ b/lily/font-metric.cc @@ -138,16 +138,10 @@ Font_metric::font_name () const return s; } -size_t -Font_metric::index_to_ascii (size_t i) const -{ - return i; -} - size_t Font_metric::index_to_charcode (size_t i) const { - return index_to_ascii (i); + return i; } Offset diff --git a/lily/include/font-metric.hh b/lily/include/font-metric.hh index 364965844f..7f2aad917c 100644 --- a/lily/include/font-metric.hh +++ b/lily/include/font-metric.hh @@ -49,12 +49,6 @@ public: virtual Offset attachment_point (string) const; virtual Offset get_indexed_wxwy (size_t) const; virtual Box get_indexed_char_dimensions (size_t index) const; - - /* - WTF are these vsize ? - - Font_metric is not related to vector<> - */ virtual size_t name_to_index (string) const; virtual size_t index_to_charcode (size_t) const; virtual size_t index_to_ascii (size_t) const; diff --git a/lily/include/modified-font-metric.hh b/lily/include/modified-font-metric.hh index bd51ea459f..93c7634848 100644 --- a/lily/include/modified-font-metric.hh +++ b/lily/include/modified-font-metric.hh @@ -46,7 +46,6 @@ protected: Real design_size () const; void derived_mark () const; Box get_indexed_char_dimensions (size_t) const; - size_t index_to_ascii (size_t) const; }; #endif /* MODIFIED_FONT_METRIC_HH */ diff --git a/lily/modified-font-metric.cc b/lily/modified-font-metric.cc index 6b3d767669..2ba488d396 100644 --- a/lily/modified-font-metric.cc +++ b/lily/modified-font-metric.cc @@ -93,12 +93,6 @@ Modified_font_metric::index_to_charcode (vsize i) const return orig_->index_to_charcode (i); } -vsize -Modified_font_metric::index_to_ascii (vsize k) const -{ - return orig_->index_to_ascii (k); -} - void Modified_font_metric::derived_mark () const { -- 2.39.2