Merge branch 'q3map2help' into 'master'

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

diff --git a/include/namespace.h b/include/namespace.h
index 9a00793c07a99350d9cabd2317130f63c90a78b0..0b24059f879f8859ffc73f992ccaa87d60de38ea 100644 (file)
--- a/include/namespace.h
+++ b/include/namespace.h
@@ -23,10 +23,10 @@
 #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
 {