Callback: remove fixed-arity wrappers

[xonotic/netradiant.git] / radiant / renderstate.cpp

diff --git a/radiant/renderstate.cpp b/radiant/renderstate.cpp
index b906f2cdad4bf27cb4675b4b5a70d55b85586de2..9dc8e2de0a2136076eea4e0789036b1e2b437d78 100644 (file)
--- a/radiant/renderstate.cpp
+++ b/radiant/renderstate.cpp
@@ -979,7 +979,7 @@ void addRenderable( const OpenGLRenderable& renderable, const Matrix4& modelview
                if ( ( ( *i )->state().m_state & RENDER_BUMP ) != 0 ) {
                        if ( lights != 0 ) {
                                OpenGLStateBucketAdd add( *( *i ), renderable, modelview );
-                               lights->forEachLight( makeCallback1( add ) );
+                               lights->forEachLight(makeCallback( add ) );
                        }
                }
                else
@@ -1071,13 +1071,13 @@ class LinearLightList : public LightList
 {
 LightCullable& m_cullable;
 RendererLights& m_allLights;
-Callback m_evaluateChanged;
+Callback<void()> m_evaluateChanged;
 
 typedef std::list<RendererLight*> Lights;
 mutable Lights m_lights;
 mutable bool m_lightsChanged;
 public:
-LinearLightList( LightCullable& cullable, RendererLights& lights, const Callback& evaluateChanged ) :
+LinearLightList( LightCullable& cullable, RendererLights& lights, const Callback<void()>& evaluateChanged ) :
        m_cullable( cullable ), m_allLights( lights ), m_evaluateChanged( evaluateChanged ){
        m_lightsChanged = true;
 }
@@ -1463,7 +1463,7 @@ void evaluateChanged(){
                }
        }
 }
-typedef MemberCaller<OpenGLShaderCache, &OpenGLShaderCache::evaluateChanged> EvaluateChangedCaller;
+typedef MemberCaller<OpenGLShaderCache, void(), &OpenGLShaderCache::evaluateChanged> EvaluateChangedCaller;
 
 typedef std::set<const Renderable*> Renderables;
 Renderables m_renderables;