Run grand replace for 2015.

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

diff --git a/lily/include/skyline-pair.hh b/lily/include/skyline-pair.hh
index 604d2fb4dfa706463d423fba58e94dc4db44fc70..6d7cea0ac248d917091bea19bb05cba6d0abf72c 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--2015 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
@@ -22,12 +22,13 @@
 
 #include "skyline.hh"
 
-class Skyline_pair
+class Skyline_pair : public Simple_smob<Skyline_pair>
 {
+public:
+  static const char type_p_name_[];
 private:
   Drul_array<Skyline> skylines_;
 
-  DECLARE_SIMPLE_SMOBS (Skyline_pair);
 public:
   Skyline_pair ();
   Skyline_pair (vector<Box> const &boxes, Axis a);
@@ -35,20 +36,14 @@ public:
   Skyline_pair (vector<Skyline_pair> const &skypairs);
   Skyline_pair (Box const &, Axis a);
 
-  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 raise (Real);
+  void shift (Real);
   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;