Issue 4550 (2/2) Avoid "using namespace std;" in included files

[lilypond.git] / lily / include / all-font-metrics.hh

diff --git a/lily/include/all-font-metrics.hh b/lily/include/all-font-metrics.hh
index bd9d2d447e7c8b87bd9a18af06403eac26776d7f..53488cc9f73d73d275a30cc591b8ca0117ef0214 100644 (file)
--- a/lily/include/all-font-metrics.hh
+++ b/lily/include/all-font-metrics.hh
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 1998--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 1998--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
   LilyPond is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -29,12 +29,11 @@
 #include <pango/pangoft2.h>
 #endif
 
-
 /*
    Interface to all fonts (both system fonts and fonts loaded
    via Pango).
 */
-class All_font_metrics
+class All_font_metrics : public Smob<All_font_metrics>
 {
   Scheme_hash_table *otf_dict_;
   File_path search_path_;
@@ -45,23 +44,24 @@ class All_font_metrics
   int pango_dpi_;
 #endif
 
-  map<string, Index_to_charcode_map > filename_charcode_maps_map_;
-  
+  std::map<std::string, Index_to_charcode_map > filename_charcode_maps_map_;
+
   All_font_metrics (All_font_metrics const &);
 public:
+  SCM mark_smob () const;
 
-  Index_to_charcode_map const *get_index_to_charcode_map (string filename,
-                                                         int face_index,
-                                                         FT_Face face);
+  Index_to_charcode_map const *get_index_to_charcode_map (const std::string &filename,
+                                                          int face_index,
+                                                          FT_Face face);
 
-  All_font_metrics (string search_path);
+  All_font_metrics (const std::string &search_path);
   ~All_font_metrics ();
 
   Pango_font *find_pango_font (PangoFontDescription const *description,
-                              Real scale);
+                               Real scale);
 
-  Font_metric *find_font (string name);
-  Open_type_font *find_otf (string name);
+  Font_metric *find_font (const std::string &name);
+  Open_type_font *find_otf (const std::string &name);
   SCM font_descriptions () const;
 };