Merge branch 'master' into translation

[lilypond.git] / lily / include / accidental-placement.hh

diff --git a/lily/include/accidental-placement.hh b/lily/include/accidental-placement.hh
index 6a92ce478306049d15c9a45a00f7374864249acb..4c362cbd93d1c1df2d1ba0f4e77613e74257b253 100644 (file)
--- a/lily/include/accidental-placement.hh
+++ b/lily/include/accidental-placement.hh
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 2002--2011 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 2002--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
@@ -27,7 +27,7 @@ class Accidental_placement
 {
 public:
   DECLARE_SCHEME_CALLBACK (alignment_callback, (SCM element));
-  static void add_accidental (Grob *, Grob *);
+  static void add_accidental (Grob *, Grob *, bool, long);
 
   static vector<Grob *> get_relevant_accidentals (vector<Grob *> const &elts, Grob *left);
   static void split_accidentals (Grob *accs,
@@ -35,7 +35,6 @@ public:
                                  vector<Grob *> *real_acc);
 
   DECLARE_SCHEME_CALLBACK (calc_positioning_done, (SCM));
-  DECLARE_GROB_INTERFACE ();
 };
 #endif /* ACCIDENTAL_PLACEMENT_HH */