Callback: remove fixed-arity wrappers

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

diff --git a/include/ifilesystem.h b/include/ifilesystem.h
index 70b5da92bbb96503b4fb24002f7f98f36bd4df95..d7e128e6e1791a83f40dcc81102a01acbfb26fc3 100644 (file)
--- a/include/ifilesystem.h
+++ b/include/ifilesystem.h
@@ -24,10 +24,10 @@
 
 #include <cstddef>
 #include "generic/constant.h"
-#include "generic/callbackfwd.h"
+#include "generic/callback.h"
 
-typedef Callback1<const char*> ArchiveNameCallback;
-typedef Callback1<const char*> FileNameCallback;
+typedef Callback<void(const char*)> ArchiveNameCallback;
+typedef Callback<void(const char*)> FileNameCallback;
 
 class ArchiveFile;
 class ArchiveTextFile;
@@ -124,7 +124,7 @@ inline VirtualFileSystem& GlobalFileSystem(){
 /// \deprecated Use \c openFile.
 inline int vfsLoadFile( const char* filename, void** buffer, int index = 0 ){
        return static_cast<int>( GlobalFileSystem().loadFile( filename, buffer ) );
-};
+}
 
 /// \deprecated Deprecated.
 inline void vfsFreeFile( void* p ){