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

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

diff --git a/lily/include/pango-font.hh b/lily/include/pango-font.hh
index 43eca3a6ba156dde4d43e988cf732a703f2cc0bf..58f5a884f59b76e4d62a99cb6d18af5c0cfc8a5b 100644 (file)
--- a/lily/include/pango-font.hh
+++ b/lily/include/pango-font.hh
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 2004--2014 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 2004--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
@@ -46,11 +46,11 @@ public:
               Real);
   ~Pango_font ();
 
-  string description_string () const;
+  std::string description_string () const;
   SCM font_file_name () const;
-  void register_font_file (const string &filename, const string &ps_name, int face_index);
+  void register_font_file (const std::string &filename, const std::string &ps_name, int face_index);
 
-  size_t name_to_index (string) const;
+  size_t name_to_index (std::string) const;
   SCM get_glyph_outline (size_t signed_idx) const;
   Box get_glyph_outline_bbox (size_t signed_idx) const;
   Box get_unscaled_indexed_char_dimensions (size_t) const;
@@ -59,7 +59,7 @@ public:
   Stencil pango_item_string_stencil (PangoGlyphItem const *) const;
 
   virtual Stencil text_stencil (Output_def *output_state,
-                                const string &text, bool music) const;
+                                const std::string &text, bool music) const;
   virtual void derived_mark () const;
 };