Callback: remove fixed-arity wrappers

[xonotic/netradiant.git] / plugins / shaders / shaders.cpp

diff --git a/plugins/shaders/shaders.cpp b/plugins/shaders/shaders.cpp
index 656c1d8404cb85eab959046c87d4f27d16800ea8..6a1ec968851081dcf0f4a8033e737c865b700d72 100644 (file)
--- a/plugins/shaders/shaders.cpp
+++ b/plugins/shaders/shaders.cpp
@@ -82,7 +82,7 @@ void ActiveShaders_IteratorBegin();
 bool ActiveShaders_IteratorAtEnd();
 IShader *ActiveShaders_IteratorCurrent();
 void ActiveShaders_IteratorIncrement();
-Callback g_ActiveShadersChangedNotify;
+Callback<void()> g_ActiveShadersChangedNotify;
 
 void FreeShaders();
 void LoadShaderFile( const char *filename );
@@ -1442,7 +1442,7 @@ void LoadShaderFile( const char* filename ){
        }
 }
 
-typedef FreeCaller1<const char*, LoadShaderFile> LoadShaderFileCaller;
+typedef FreeCaller<void(const char*), LoadShaderFile> LoadShaderFileCaller;
 
 
 void loadGuideFile( const char* filename ){
@@ -1466,7 +1466,7 @@ void loadGuideFile( const char* filename ){
        }
 }
 
-typedef FreeCaller1<const char*, loadGuideFile> LoadGuideFileCaller;
+typedef FreeCaller<void(const char*), loadGuideFile> LoadGuideFileCaller;
 
 
 CShader* Try_Shader_ForName( const char* name ){
@@ -1543,7 +1543,7 @@ void IfFound_dumpUnreferencedShader( bool& bFound, const char* filename ){
                globalOutputStream() << "\t" << filename << "\n";
        }
 }
-typedef ReferenceCaller1<bool, const char*, IfFound_dumpUnreferencedShader> IfFoundDumpUnreferencedShaderCaller;
+typedef ReferenceCaller<bool, void(const char*), IfFound_dumpUnreferencedShader> IfFoundDumpUnreferencedShaderCaller;
 
 void DumpUnreferencedShaders(){
        bool bFound = false;
@@ -1567,7 +1567,7 @@ void ShaderList_addShaderFile( const char* dirstring ){
        }
 }
 
-typedef FreeCaller1<const char*, ShaderList_addShaderFile> AddShaderFileCaller;
+typedef FreeCaller<void(const char*), ShaderList_addShaderFile> AddShaderFileCaller;
 
 
 /*
@@ -1624,7 +1624,7 @@ void ShaderList_addFromArchive( const char *archivename ){
        }
 }
 
-typedef FreeCaller1<const char *, ShaderList_addFromArchive> AddShaderListFromArchiveCaller;
+typedef FreeCaller<void(const char *), ShaderList_addFromArchive> AddShaderListFromArchiveCaller;
 
 #include "stream/filestream.h"
 
@@ -1763,7 +1763,7 @@ IShader* dereferenceActiveShadersIterator(){
 void incrementActiveShadersIterator(){
        ActiveShaders_IteratorIncrement();
 }
-void setActiveShadersChangedNotify( const Callback& notify ){
+void setActiveShadersChangedNotify( const Callback<void()>& notify ){
        g_ActiveShadersChangedNotify = notify;
 }