Merge branch 'q3map2help' into 'master'

[xonotic/netradiant.git] / include / nameable.h

diff --git a/include/nameable.h b/include/nameable.h
index 8e1357a46be52b682084f5557fef1fd5ef189d25..ceb7aabb450a999c995f3fc591c89e3bee8b8a22 100644 (file)
--- a/include/nameable.h
+++ b/include/nameable.h
@@ -1,40 +1,40 @@
 /*
-Copyright (C) 2001-2006, William Joseph.
-All Rights Reserved.
+   Copyright (C) 2001-2006, William Joseph.
+   All Rights Reserved.
 
-This file is part of GtkRadiant.
+   This file is part of GtkRadiant.
 
-GtkRadiant 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 2 of the License, or
-(at your option) any later version.
+   GtkRadiant 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 2 of the License, or
+   (at your option) any later version.
 
-GtkRadiant 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.
+   GtkRadiant 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 GtkRadiant; if not, write to the Free Software
-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-*/
+   You should have received a copy of the GNU General Public License
+   along with GtkRadiant; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ */
 
-#if !defined(INCLUDED_NAMEABLE_H)
+#if !defined( INCLUDED_NAMEABLE_H )
 #define INCLUDED_NAMEABLE_H
 
 #include "generic/constant.h"
-#include "generic/callbackfwd.h"
+#include "generic/callback.h"
 
-typedef Callback1<const char*> NameCallback;
+typedef Callback<void(const char*)> NameCallback;
 
 class Nameable
 {
 public:
-  STRING_CONSTANT(Name, "Nameable");
+STRING_CONSTANT( Name, "Nameable" );
 
-  virtual const char* name() const = 0;
-  virtual void attach(const NameCallback& callback) = 0;
-  virtual void detach(const NameCallback& callback) = 0;
+virtual const char* name() const = 0;
+virtual void attach( const NameCallback& callback ) = 0;
+virtual void detach( const NameCallback& callback ) = 0;
 };