Revert "Issue 4550 (2/2) Avoid "using namespace std;" in included files"

[lilypond.git] / lily / include / engraver-group.hh

diff --git a/lily/include/engraver-group.hh b/lily/include/engraver-group.hh
index 52d931b523b6db31dc053246d9f349945506b617..aa3cd478bce652c5bc6a098e0250be689a38d0f0 100644 (file)
--- a/lily/include/engraver-group.hh
+++ b/lily/include/engraver-group.hh
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 1997--2012 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 1997--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
@@ -23,23 +23,22 @@
 #include "engraver.hh"
 #include "translator-group.hh"
 
-class Engraver_group : public virtual Translator_group
+class Engraver_group : public Translator_group
 {
 protected:
   vector<Grob_info> announce_infos_;
   Drul_array<SCM> acknowledge_hash_table_drul_;
-  DECLARE_LISTENER (override);
-  DECLARE_LISTENER (revert);
+  void override (SCM);
+  void revert (SCM);
 public:
-  VIRTUAL_COPY_CONSTRUCTOR (Translator_group, Engraver_group);
-
+  DECLARE_CLASSNAME (Engraver_group);
   Engraver_group ();
   virtual void derived_mark () const;
   void do_announces ();
   virtual void connect_to_context (Context *c);
   virtual void disconnect_from_context ();
   virtual void announce_grob (Grob_info);
-  int pending_grob_count () const;
+  bool pending_grobs () const;
 private:
   virtual void acknowledge_grobs ();
 };