Run grand replace for 2015.

[lilypond.git] / lily / include / skyline.hh

diff --git a/lily/include/skyline.hh b/lily/include/skyline.hh
index dd65bec147f3e0408e13a792b6a40483056bc241..21693420c88419fd0fc8834eb3e7e749d4fafb6d 100644 (file)
--- a/lily/include/skyline.hh
+++ b/lily/include/skyline.hh
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 2006--2014 Joe Neeman <joeneeman@gmail.com>
+  Copyright (C) 2006--2015 Joe Neeman <joeneeman@gmail.com>
 
   LilyPond is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -44,15 +44,13 @@ struct Building
 
   Real height (Real x) const;
   Real intersection_x (Building const &other) const;
-  void leading_part (Real chop);
-  bool conceals (Building const &other, Real x) const;
+  bool above (Building const &other, Real x) const;
   Real shift_to_intersect (Real x, Real y) const;
 };
 
 class Skyline : public Simple_smob<Skyline>
 {
 public:
-  static int print_smob (SCM, SCM, scm_print_state *);
   static const char type_p_name_[];
 private:
   list<Building> buildings_;
@@ -75,7 +73,6 @@ public:
   Skyline (Box const &b, Axis a, Direction sky);
 
   vector<Offset> to_points (Axis) const;
-  void deholify ();
   void merge (Skyline const &);
   void insert (Box const &, Axis);
   void print () const;