-typedef MemberCaller1<ToggleFilterFlag, const BoolImportCallback&, &ToggleFilterFlag::active> ActiveCaller;
+typedef MemberCaller<ToggleFilterFlag, void(const ImportExportCallback<bool>::Import_t&), &ToggleFilterFlag::active> ActiveCaller;
create_check_menu_item_with_mnemonic( menu_in_menu, "World", "FilterWorldBrushes" );
create_check_menu_item_with_mnemonic( menu_in_menu, "Entities", "FilterEntities" );
if ( g_pGameDescription->mGameType == "doom3" ) {
create_check_menu_item_with_mnemonic( menu_in_menu, "World", "FilterWorldBrushes" );
create_check_menu_item_with_mnemonic( menu_in_menu, "Entities", "FilterEntities" );
if ( g_pGameDescription->mGameType == "doom3" ) {
void ConstructFilters(){
GlobalPreferenceSystem().registerPreference( "SI_Exclude", SizeImportStringCaller( g_filters_globals.exclude ), SizeExportStringCaller( g_filters_globals.exclude ) );
void ConstructFilters(){
GlobalPreferenceSystem().registerPreference( "SI_Exclude", SizeImportStringCaller( g_filters_globals.exclude ), SizeExportStringCaller( g_filters_globals.exclude ) );
- GlobalCommands_insert( "InvertFilters", FreeCaller<InvertFilters>() );
- GlobalCommands_insert( "ResetFilters", FreeCaller<ResetFilters>() );
+ GlobalCommands_insert( "InvertFilters", makeCallbackF(InvertFilters) );
+ GlobalCommands_insert( "ResetFilters", makeCallbackF(ResetFilters) );
add_filter_command( EXCLUDE_WORLD, "FilterWorldBrushes", Accelerator( '1', (GdkModifierType)GDK_MOD1_MASK ) );
add_filter_command( EXCLUDE_ENT, "FilterEntities", Accelerator( '2', (GdkModifierType)GDK_MOD1_MASK ) );
add_filter_command( EXCLUDE_WORLD, "FilterWorldBrushes", Accelerator( '1', (GdkModifierType)GDK_MOD1_MASK ) );
add_filter_command( EXCLUDE_ENT, "FilterEntities", Accelerator( '2', (GdkModifierType)GDK_MOD1_MASK ) );