Update source file headers. Fixes using standard GNU package conventions.

[lilypond.git] / flower / interval-set.cc

diff --git a/flower/interval-set.cc b/flower/interval-set.cc
index 89e518883085e1bf7051cba084a0f654f8035e00..4de14592c5efe04b392c3ea4f50f30fea366f348 100644 (file)
--- a/flower/interval-set.cc
+++ b/flower/interval-set.cc
@@ -1,9 +1,20 @@
 /*
-  interval-set.hh -- implement Interval_set
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 2004--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c) 2004 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
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  LilyPond is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "interval-set.hh"
@@ -27,13 +38,13 @@ Interval_set::set_full ()
   allowed_regions_.clear ();
   Interval s;
   s.set_full ();
-  allowed_regions_.push (s);
+  allowed_regions_.push_back (s);
 }
 
 void
 Interval_set::remove_interval (Interval rm)
 {
-  for (int i = 0; i < allowed_regions_.size ();)
+  for (vsize i = 0; i < allowed_regions_.size ();)
     {
       Interval s = rm;
 
@@ -49,13 +60,13 @@ Interval_set::remove_interval (Interval rm)
 
          if (!before.is_empty () && before.length () > 0.0)
            {
-             allowed_regions_.insert (before, i);
+             allowed_regions_.insert (allowed_regions_.begin () + i, before);
              i++;
            }
-         allowed_regions_.del (i);
+         allowed_regions_.erase (allowed_regions_.begin () + i);
          if (!after.is_empty () && after.length () > 0.0)
            {
-             allowed_regions_.insert (after, i);
+             allowed_regions_.insert (allowed_regions_.begin () + i, after);
              i++;
            }
        }