X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=radiant%2Fgrid.cpp;h=be267002a7ec66508bfa6e8fc2259b7731161b1b;hb=2a1cfc426e60b77c7b212d827e2592de01041266;hp=8ede1a221bbd530becdcf0403830f575d7338916;hpb=04fe1ceba51db67b2b1743e383f146ea8d31a07e;p=xonotic%2Fnetradiant.git

diff --git a/radiant/grid.cpp b/radiant/grid.cpp
index 8ede1a22..be267002 100644
--- a/radiant/grid.cpp
+++ b/radiant/grid.cpp
@@ -133,11 +133,11 @@ void set(){
 	m_item.update();
 	setGridPower( m_id );
 }
-typedef MemberCaller<GridMenuItem, &GridMenuItem::set> SetCaller;
-void active( const BoolImportCallback& importCallback ){
+typedef MemberCaller<GridMenuItem, void(), &GridMenuItem::set> SetCaller;
+void active( const ImportExportCallback<bool>::Import_t& importCallback ){
 	importCallback( g_grid_power == m_id );
 }
-typedef MemberCaller1<GridMenuItem, const BoolImportCallback&, &GridMenuItem::active> ExportCaller;
+typedef MemberCaller<GridMenuItem, void(const ImportExportCallback<bool>::Import_t&), &GridMenuItem::active> ExportCaller;
 };
 
 GridMenuItem g_gridMenu0125( GRIDPOWER_0125 );
@@ -192,10 +192,10 @@ void ToggleGridSnap(){
 }
 
 void Grid_registerCommands(){
-	GlobalCommands_insert( "GridDown", FreeCaller<GridPrev>(), Accelerator( '[' ) );
-	GlobalCommands_insert( "GridUp", FreeCaller<GridNext>(), Accelerator( ']' ) );
+	GlobalCommands_insert( "GridDown", makeCallbackF(GridPrev), Accelerator( '[' ) );
+	GlobalCommands_insert( "GridUp", makeCallbackF(GridNext), Accelerator( ']' ) );
 
-	GlobalCommands_insert( "ToggleGridSnap", FreeCaller<ToggleGridSnap>() );
+	GlobalCommands_insert( "ToggleGridSnap", makeCallbackF(ToggleGridSnap) );
 
 	GlobalToggles_insert( "SetGrid0.125", GridMenuItem::SetCaller( g_gridMenu0125 ), ToggleItem::AddCallbackCaller( g_gridMenu0125.m_item ) );
 	GlobalToggles_insert( "SetGrid0.25", GridMenuItem::SetCaller( g_gridMenu025 ), ToggleItem::AddCallbackCaller( g_gridMenu025.m_item ) );
@@ -246,7 +246,7 @@ void Grid_constructPage( PreferenceGroup& group ){
 	Grid_constructPreferences( page );
 }
 void Grid_registerPreferencesPage(){
-	PreferencesDialog_addSettingsPage( FreeCaller1<PreferenceGroup&, Grid_constructPage>() );
+	PreferencesDialog_addSettingsPage( makeCallbackF(Grid_constructPage) );
 }
 
 void Grid_construct(){