Run grand replace for 2015.

[lilypond.git] / lily / include / timing-translator.hh

diff --git a/lily/include/timing-translator.hh b/lily/include/timing-translator.hh
index 6dc8f7968c8149cc8edf1a500d57c8718ebaea1f..18b4425483449c94c9a40910ca8431b9c0e39698 100644 (file)
--- a/lily/include/timing-translator.hh
+++ b/lily/include/timing-translator.hh
@@ -1,11 +1,21 @@
 /*
-  timing-translator.hh -- declare Timing_translator
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 1997--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c)  1997--2003 Han-Wen Nienhuys <hanwen@cs.uu.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/>.
+*/
 
 #ifndef TIMING_TRANSLATOR_HH
 #define TIMING_TRANSLATOR_HH
@@ -13,22 +23,18 @@
 #include "moment.hh"
 #include "translator.hh"
 
-#include "parray.hh"
-
-class Timing_translator : public virtual Translator
+class Timing_translator : public Translator
 {
 public:
-  //  VIRTUAL_COPY_CONS (Translator);
-  TRANSLATOR_DECLARATIONS(Timing_translator);
-
+  TRANSLATOR_DECLARATIONS (Timing_translator);
 
-protected: 
+protected:
   virtual void initialize ();
-  virtual void stop_translation_timestep ();
-  virtual void start_translation_timestep ();
+  void stop_translation_timestep ();
+  void start_translation_timestep ();
 
 public:
-  Moment measure_position () const;
-  Rational measure_length () const;  
+  Rational measure_length () const;
 };
+
 #endif // TIMING_TRANSLATOR_HH