Callback: remove fixed-arity wrappers

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

diff --git a/contrib/shaderplug/shaderplug.cpp b/contrib/shaderplug/shaderplug.cpp
index e8f4f5fc4e0fb868e4a6c762a1a3269cd1dbb804..7bc9814ab3e96a011c4dd6d785acda9f2929e4a6 100644 (file)
--- a/contrib/shaderplug/shaderplug.cpp
+++ b/contrib/shaderplug/shaderplug.cpp
@@ -67,7 +67,7 @@ XmlTagBuilder TagBuilder;
 void CreateTagFile();
 
 const char* init( void* hApp, void* pMainWidget ){
-       g_window = ui::Window(GTK_WINDOW( pMainWidget ));
+       g_window = ui::Window::from(pMainWidget);
        return "";
 }
 const char* getName(){
@@ -96,7 +96,7 @@ void loadArchiveFile( const char* filename ){
        archives.push_back( filename );
 }
 
-typedef FreeCaller1<const char*, loadArchiveFile> LoadArchiveFileCaller;
+typedef FreeCaller<void(const char*), loadArchiveFile> LoadArchiveFileCaller;
 
 void LoadTextureFile( const char* filename ){
        std::string s_filename = filename;
@@ -116,9 +116,9 @@ void LoadTextureFile( const char* filename ){
        }
 }
 
-typedef FreeCaller1<const char*, LoadTextureFile> LoadTextureFileCaller;
+typedef FreeCaller<void(const char*), LoadTextureFile> LoadTextureFileCaller;
 
-void GetTextures( char* extension ){
+void GetTextures( const char* extension ){
        GlobalFileSystem().forEachFile( "textures/", extension, LoadTextureFileCaller(), 0 );
 }
 
@@ -128,7 +128,7 @@ void LoadShaderList( const char* filename ){
        }
 }
 
-typedef FreeCaller1<const char*, LoadShaderList> LoadShaderListCaller;
+typedef FreeCaller<void(const char*), LoadShaderList> LoadShaderListCaller;
 
 void GetAllShaders(){
        GlobalShaderSystem().foreachShaderName( LoadShaderListCaller() );