Callback: cleanup

[xonotic/netradiant.git] / contrib / shaderplug / shaderplug.cpp

diff --git a/contrib/shaderplug/shaderplug.cpp b/contrib/shaderplug/shaderplug.cpp
index 7bc9814ab3e96a011c4dd6d785acda9f2929e4a6..9d7bc4c52c78eca92c1e9d80095534675e5dc5d0 100644 (file)
--- a/contrib/shaderplug/shaderplug.cpp
+++ b/contrib/shaderplug/shaderplug.cpp
@@ -96,8 +96,6 @@ void loadArchiveFile( const char* filename ){
        archives.push_back( filename );
 }
 
-typedef FreeCaller<void(const char*), loadArchiveFile> LoadArchiveFileCaller;
-
 void LoadTextureFile( const char* filename ){
        std::string s_filename = filename;
 
@@ -116,10 +114,8 @@ void LoadTextureFile( const char* filename ){
        }
 }
 
-typedef FreeCaller<void(const char*), LoadTextureFile> LoadTextureFileCaller;
-
 void GetTextures( const char* extension ){
-       GlobalFileSystem().forEachFile( "textures/", extension, LoadTextureFileCaller(), 0 );
+       GlobalFileSystem().forEachFile("textures/", extension, makeCallbackF(LoadTextureFile), 0);
 }
 
 void LoadShaderList( const char* filename ){
@@ -128,14 +124,12 @@ void LoadShaderList( const char* filename ){
        }
 }
 
-typedef FreeCaller<void(const char*), LoadShaderList> LoadShaderListCaller;
-
 void GetAllShaders(){
-       GlobalShaderSystem().foreachShaderName( LoadShaderListCaller() );
+       GlobalShaderSystem().foreachShaderName(makeCallbackF(LoadShaderList));
 }
 
 void GetArchiveList(){
-       GlobalFileSystem().forEachArchive( LoadArchiveFileCaller() );
+       GlobalFileSystem().forEachArchive(makeCallbackF(loadArchiveFile));
        globalOutputStream() << "Shaderplug: " << (const Unsigned)Shaderplug::archives.size() << " archives found.\n";
 }