Group import/export callbacks

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

diff --git a/radiant/grid.cpp b/radiant/grid.cpp
index 148fa4faf8db327ad0f1f25f72975f18af22dab7..be267002a7ec66508bfa6e8fc2259b7731161b1b 100644 (file)
--- 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 ) );
@@ -212,7 +212,7 @@ void Grid_registerCommands(){
 }
 
 
-void Grid_constructMenu( GtkMenu* menu ){
+void Grid_constructMenu( ui::Menu menu ){
        create_check_menu_item_with_mnemonic( menu, "Grid0.125", "SetGrid0.125" );
        create_check_menu_item_with_mnemonic( menu, "Grid0.25", "SetGrid0.25" );
        create_check_menu_item_with_mnemonic( menu, "Grid0.5", "SetGrid0.5" );
@@ -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(){