Callback: remove fixed-arity wrappers

[xonotic/netradiant.git] / radiant / map.h

diff --git a/radiant/map.h b/radiant/map.h
index a359d46159a676405df4523b4961573c41f1d10a..c68b02751e270df0790012a283216e01dd98ccca 100644 (file)
--- a/radiant/map.h
+++ b/radiant/map.h
@@ -37,11 +37,11 @@ bool Map_Valid( const Map& map );
 
 class DeferredDraw
 {
-Callback m_draw;
+Callback<void()> m_draw;
 bool m_defer;
 bool m_deferred;
 public:
-DeferredDraw( const Callback& draw ) : m_draw( draw ), m_defer( false ), m_deferred( false ){
+DeferredDraw( const Callback<void()>& draw ) : m_draw( draw ), m_defer( false ), m_deferred( false ){
 }
 void defer(){
        m_defer = true;
@@ -73,7 +73,7 @@ inline void DeferredDraw_onMapValidChanged( DeferredDraw& self ){
                self.defer();
        }
 }
-typedef ReferenceCaller<DeferredDraw, DeferredDraw_onMapValidChanged> DeferredDrawOnMapValidChangedCaller;
+typedef ReferenceCaller<DeferredDraw, void(), DeferredDraw_onMapValidChanged> DeferredDrawOnMapValidChangedCaller;