Merge branch 'q3map2help' into 'master'

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

diff --git a/include/namespace.h b/include/namespace.h
index 30367bfdb46f8b6c40cbaa5ef37a289ea1fe8ffb..0b24059f879f8859ffc73f992ccaa87d60de38ea 100644 (file)
--- a/include/namespace.h
+++ b/include/namespace.h
@@ -1,49 +1,49 @@
 /*
-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_NAMESPACE_H)
+#if !defined( INCLUDED_NAMESPACE_H )
 #define INCLUDED_NAMESPACE_H
 
 #include "generic/constant.h"
-#include "generic/callbackfwd.h"
+#include "generic/callback.h"
 
-typedef Callback1<const char*> NameCallback;
-typedef Callback1<const NameCallback&> NameCallbackCallback;
+typedef Callback<void(const char*)> NameCallback;
+typedef Callback<void(const NameCallback&)> NameCallbackCallback;
 
 class Namespace
 {
 public:
-  INTEGER_CONSTANT(Version, 1);
-  STRING_CONSTANT(Name, "namespace");
-  virtual void attach(const NameCallback& setName, const NameCallbackCallback& attachObserver) = 0;
-  virtual void detach(const NameCallback& setName, const NameCallbackCallback& detachObserver) = 0;
-  virtual void makeUnique(const char* name, const NameCallback& setName) const = 0;
+INTEGER_CONSTANT( Version, 1 );
+STRING_CONSTANT( Name, "namespace" );
+virtual void attach( const NameCallback& setName, const NameCallbackCallback& attachObserver ) = 0;
+virtual void detach( const NameCallback& setName, const NameCallbackCallback& detachObserver ) = 0;
+virtual void makeUnique( const char* name, const NameCallback& setName ) const = 0;
 };
 
 class Namespaced
 {
 public:
-  STRING_CONSTANT(Name, "Namespaced");
+STRING_CONSTANT( Name, "Namespaced" );
 
-  virtual void setNamespace(Namespace& space) = 0;
+virtual void setNamespace( Namespace& space ) = 0;
 };
 
 #include "modulesystem.h"
@@ -56,8 +56,7 @@ template<typename Type>
 class GlobalModuleRef;
 typedef GlobalModuleRef<Namespace> GlobalNamespaceModuleRef;
 
-inline Namespace& GlobalNamespace()
-{
-  return GlobalNamespaceModule::getTable();
+inline Namespace& GlobalNamespace(){
+       return GlobalNamespaceModule::getTable();
 }
 #endif