X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=include%2Fifilesystem.h;h=d7e128e6e1791a83f40dcc81102a01acbfb26fc3;hb=18d60f90d7603cb420150739251cf98519c57406;hp=70b5da92bbb96503b4fb24002f7f98f36bd4df95;hpb=8cfdea7ce327143a8f7bf7da8df536511c9287ca;p=xonotic%2Fnetradiant.git

diff --git a/include/ifilesystem.h b/include/ifilesystem.h
index 70b5da92..d7e128e6 100644
--- 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 ){