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

[lilypond.git] / lily / include / staff-symbol.hh

diff --git a/lily/include/staff-symbol.hh b/lily/include/staff-symbol.hh
index 9aee969f49533b141ede35799b10229c3eade3ca..9454ebe7f445a53c72f7284c1e7bfb5a6cd9280e 100644 (file)
--- a/lily/include/staff-symbol.hh
+++ b/lily/include/staff-symbol.hh
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 1997--2011 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 1997--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
@@ -33,12 +33,12 @@ public:
   static Real get_line_thickness (Grob *);
   static Real get_ledger_line_thickness (Grob *);
 
-  static int get_steps (Grob *);
+  static vector<Real> line_positions (Grob *);
+  static vector<Real> ledger_positions (Grob *me, int pos);
   static int line_count (Grob *);
-  static bool on_line (Grob *me, int pos);
+  static bool on_line (Grob *me, int pos, bool allow_ledger = true);
   static Interval line_span (Grob *);
   DECLARE_SCHEME_CALLBACK (print, (SCM));
   DECLARE_SCHEME_CALLBACK (height, (SCM));
-  DECLARE_GROB_INTERFACE ();
 };
 #endif // STAFF_SYMBOL_HH