Run grand-replace (issue 3765)

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

diff --git a/lily/include/skyline-pair.hh b/lily/include/skyline-pair.hh
index 604d2fb4dfa706463d423fba58e94dc4db44fc70..0d37f794f4557d9e7dfb04a57d749afdabeb0585 100644 (file)
--- a/lily/include/skyline-pair.hh
+++ b/lily/include/skyline-pair.hh
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 2008--2012 Han-Wen Nienhuys <hanwen@lilypond.org>
+  Copyright (C) 2008--2014 Han-Wen Nienhuys <hanwen@lilypond.org>
 
   LilyPond is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -35,20 +35,15 @@ public:
   Skyline_pair (vector<Skyline_pair> const &skypairs);
   Skyline_pair (Box const &, Axis a);
 
+  Real left () const;
+  Real right () const;
   void raise (Real);
-  void grow (Real);
   void shift (Real);
   void deholify ();
-  Real smallest_shift (Skyline_pair const &other, Direction d,
-                       Real h_padding = 0, Real v_padding = 0);
-  Real left () const;
-  Real right () const;
-  bool intersects (Skyline_pair const &other) const;
   void insert (Box const &, Axis);
   void merge (Skyline_pair const &other);
   Skyline &operator [] (Direction d);
   Skyline const &operator [] (Direction d) const;
-  bool is_singleton () const;
   bool is_empty () const;
   void print () const;
   void print_points () const;