X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=flower%2Finclude%2Fvirtual-methods.hh;h=dc91d7b6696f41cccee3e5832e888c71c991ef87;hb=57120404e1b09f6923f5f5d8f4f17a21cec4f873;hp=ea81cbbc992fc8eb0ff9496e248de8e4d4a0825c;hpb=0dc651561ed849b121d26cbd07a192e9fefeb832;p=lilypond.git

diff --git a/flower/include/virtual-methods.hh b/flower/include/virtual-methods.hh
index ea81cbbc99..dc91d7b669 100644
--- a/flower/include/virtual-methods.hh
+++ b/flower/include/virtual-methods.hh
@@ -1,47 +1,48 @@
 /*
-  virtual-methods.hh -- declare 
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the Flower Library
+  Copyright (C) 1997--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.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 VIRTUAL_METHODS_HH
 #define VIRTUAL_METHODS_HH
 
-/** a macro to declare the classes name as a static and virtual function.
-  The static_name() can *not* be inlined (this might have the effect that 
-  s->name() != S::static_name(). Overlapping strings need not be merged in C++
- */
-#define NAME_MEMBERS()	\
-static char const *static_name();\
-virtual bool is_type_b(const char *)const; \
-virtual char const *name() const{ return static_name(); } \
-int a_stupid_nonexistent_function_to_allow_the_semicolon_come_out()
-
-#define IMPLEMENT_STATIC_NAME(c)\
-    char const *c::static_name() { return #c; } 
-
-#define VIRTUAL_COPY_CONS(T, R)\
-  virtual R *clone() const { return  new T(*this); } \
-  int  yet_another_stupid_function_to_allow_semicolon()
-
-#define IMPLEMENT_IS_TYPE_B(D) 							   \
-  bool D::is_type_b(const char *s)	const					   \
-{ 										   \
-    return s == static_name();							   \
-}										   
-										   
-#define IMPLEMENT_IS_TYPE_B1(D,B) 						   \
-  bool D::is_type_b(const char *s)const						   \
-{ 										   \
-    return s == static_name() || B::is_type_b(s);				   \
-}										   
-#define IMPLEMENT_IS_TYPE_B2(D, BA, BB) 						   \
-  bool D::is_type_b(const char *s)	const					   \
-{ 										   \
-    return s == static_name() || BA::is_type_b(s) || BB::is_type_b(s); \
+#include <typeinfo>
+using namespace std;
+
+/*
+Virtual copy constructor.  Make up for C++'s lack of a standard
+factory or clone () function.  Usage:
+
+class Foo : Baseclass
+{
+VIRTUAL_COPY_CONSTRUCTOR (Baseclass, Foo);
+};
+*/
+
+#define DECLARE_CLASSNAME(name) \
+  virtual const char *class_name () const {     \
+    return #name; \
 }
 
-#endif 
+#define VIRTUAL_COPY_CONSTRUCTOR(Base, name)    \
+  DECLARE_CLASSNAME(name);\
+  virtual Base *clone () const                  \
+  {                                             \
+    return new name (*this);                    \
+  }
+
+#endif /* VIRTUAL_METHODS_HH */