Cleanup: sort header order, use explicit std:: prefix rather than

[lilypond.git] / lily / include / font-metric.hh

diff --git a/lily/include/font-metric.hh b/lily/include/font-metric.hh
index 7f2aad917c184aa763e59e65650764c9f3c5fe91..21433d2403c6f21ef415cdf50b9a672ab34b87ec 100644 (file)
--- a/lily/include/font-metric.hh
+++ b/lily/include/font-metric.hh
@@ -21,15 +21,14 @@
 #define FONT_METRIC_HH
 
 #include "box.hh"
+#include "freetype.hh"
 #include "lily-proto.hh"
 #include "smobs.hh"
 #include "virtual-methods.hh"
-#include "freetype.hh"
 
 #include <map>
-using namespace std;
 
-typedef map<FT_UInt, FT_ULong> Index_to_charcode_map;
+typedef std::map<FT_UInt, FT_ULong> Index_to_charcode_map;
 
 class Font_metric
 {
@@ -51,7 +50,6 @@ public:
   virtual Box get_indexed_char_dimensions (size_t index) const;
   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;
   virtual Real design_size () const;
   virtual Stencil find_by_name (string) const;
   virtual SCM sub_fonts () const;