Release: bump Welcome versions.

[lilypond.git] / lily / context-handle.cc

diff --git a/lily/context-handle.cc b/lily/context-handle.cc
index 3ed04b18ebbaba67e47bca780d9f03cd4acd465f..f399937c1843e854da3016a731287c77423057d2 100644 (file)
--- a/lily/context-handle.cc
+++ b/lily/context-handle.cc
@@ -1,77 +1,71 @@
-/*   
-  interpretation-context-handle.cc --  implement Interpretation_context_handle
-  
-  source file of the GNU LilyPond music typesetter
-  
-  (c) 1999--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
- */
-
-#include "interpretation-context-handle.hh"
+/*
+  This file is part of LilyPond, the GNU music typesetter.
+
+  Copyright (C) 1999--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
+  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 "context-handle.hh"
 #include "context.hh"
 
-Interpretation_context_handle::Interpretation_context_handle ()
+Context_handle::Context_handle ()
 {
   outlet_ = 0;
 }
 
-Interpretation_context_handle::Interpretation_context_handle (Interpretation_context_handle const&s)
+Context_handle::Context_handle (Context_handle const &s)
 {
   outlet_ = 0;
   if (s.outlet_)
     up (s.outlet_);
 }
 
-
-Interpretation_context_handle::~Interpretation_context_handle ()
+Context_handle::~Context_handle ()
 {
   /*
     Don't do
 
     if (outlet_)
-      down ();
+    down ();
 
     with GC, this is asynchronous.
-   */
+  */
 }
 
 void
-Interpretation_context_handle::up (Context *t)
+Context_handle::up (Context *t)
 {
   outlet_ = t;
-  t->iterator_count_ ++;
+  t->client_count_++;
 }
 
 void
-Interpretation_context_handle::down ()
+Context_handle::down ()
 {
-  outlet_->iterator_count_ --;
+  outlet_->client_count_--;
   outlet_ = 0;
 }
 
 void
-Interpretation_context_handle::quit ()
-{
-  if (outlet_)
-    {
-      outlet_->iterator_count_ --;
-      outlet_ = 0;
-    }
-}
-
-bool
-Interpretation_context_handle::try_music (Music *m)
-{
-  return outlet_->try_music (m);
-}
-
-void
-Interpretation_context_handle::operator = (Interpretation_context_handle const &s)
+Context_handle::operator = (Context_handle const &s)
 {
   set_context (s.outlet_);
 }
 
 void
-Interpretation_context_handle::set_context (Context *trans)
+Context_handle::set_context (Context *trans)
 {
   if (outlet_ == trans)
     return;
@@ -82,14 +76,14 @@ Interpretation_context_handle::set_context (Context *trans)
 }
 
 Context *
-Interpretation_context_handle::get_outlet () const
+Context_handle::get_context () const
 {
-  
+
   return outlet_;
 }
 
 int
-Interpretation_context_handle::get_count () const
+Context_handle::get_count () const
 {
-  return outlet_->iterator_count_ ;
+  return outlet_->client_count_;
 }