Merge branch 'issue4082'

[lilypond.git] / lily / include / grob.hh

diff --git a/lily/include/grob.hh b/lily/include/grob.hh
index a0902d6d8907a74542ee3260efea9b1003fd2246..ae2a9a20a1eb4dead148333203a36268efe22046 100644 (file)
--- a/lily/include/grob.hh
+++ b/lily/include/grob.hh
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 1996--2012 Han-Wen Nienhuys
+  Copyright (C) 1996--2014 Han-Wen Nienhuys
 
   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,10 +27,14 @@
 
 #include <set>
 
-class Grob
+class Grob : public Smob<Grob>
 {
+public:
+  static int print_smob (SCM, SCM, scm_print_state *);
+  static SCM mark_smob (SCM);
+  static const char type_p_name_[];
+  virtual ~Grob ();
 private:
-  DECLARE_SMOBS (Grob);
   DECLARE_CLASSNAME (Grob);
 
   void init ();
@@ -171,11 +175,6 @@ public:
   static SCM internal_skylines_from_element_stencils (SCM, Axis);
 };
 
-/* smob utilities */
-DECLARE_UNSMOB (Grob, grob);
-Spanner *unsmob_spanner (SCM);
-Item *unsmob_item (SCM);
-
 /* unification */
 void uniquify (vector <Grob *> &);