X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=flower%2Finclude%2Fvirtual-methods.hh;h=71deec28b1055f12abffdafe3f653f63fe21a942;hb=9e781b7dc83b60a543ce218aa1a5f139f74c760f;hp=fa6b5df9d448131f0bc1ef71c4c2cfe05a465742;hpb=0d2593e4ef1f3d1eb6994223f1de8f6c8fbcd066;p=lilypond.git

diff --git a/flower/include/virtual-methods.hh b/flower/include/virtual-methods.hh
index fa6b5df9d4..71deec28b1 100644
--- a/flower/include/virtual-methods.hh
+++ b/flower/include/virtual-methods.hh
@@ -1,29 +1,48 @@
 /*
-  class-name.hh -- declare 
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the LilyPond music typesetter
+  Copyright (C) 1997--2014 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
 
-#ifndef CLASS_NAME_HH
-#define CLASS_NAME_HH
+#include <typeinfo>
+using namespace std;
 
-/** 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 char const *name() const{ return static_name(); } \
-int a_stupid_nonexistent_function_to_allow_the_semicolon_come_out()
+/*
+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 IMPLEMENT_STATIC_NAME(c)\
-    char const *c::static_name() { return #c; } 
+#define DECLARE_CLASSNAME(name) \
+  virtual const char *class_name () const {     \
+    return #name; \
+}
 
-#define VIRTUAL_COPY_CONS(T, R)\
-  virtual R *clone() const { return  new T(*this); } \
+#define VIRTUAL_COPY_CONSTRUCTOR(Base, name)    \
+  DECLARE_CLASSNAME(name);\
+  virtual Base *clone () const                  \
+  {                                             \
+    return new name (*this);                    \
+  }
 
-    
-#endif // CLASS-NAME_HH
+#endif /* VIRTUAL_METHODS_HH */