X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=radiant%2Ffilters.cpp;h=9764f4af5a817dfe63f5e522d104c788aa3ef99b;hb=2a1cfc426e60b77c7b212d827e2592de01041266;hp=3ff4ddd0703c2290f65624d66ac96a9397ab7029;hpb=7fc621fc78d0e040dc2c12f38dc53dd9048215dc;p=xonotic%2Fnetradiant.git

diff --git a/radiant/filters.cpp b/radiant/filters.cpp
index 3ff4ddd0..9764f4af 100644
--- a/radiant/filters.cpp
+++ b/radiant/filters.cpp
@@ -127,10 +127,10 @@ ToggleFilterFlag( unsigned int mask ) : m_mask( mask ), m_item( ActiveCaller( *t
 }
 ToggleFilterFlag( const ToggleFilterFlag& other ) : m_mask( other.m_mask ), m_item( ActiveCaller( *this ) ){
 }
-void active( const BoolImportCallback& importCallback ){
+void active( const ImportExportCallback<bool>::Import_t& importCallback ){
 	importCallback( ( g_filters_globals.exclude & m_mask ) != 0 );
 }
-typedef MemberCaller1<ToggleFilterFlag, const BoolImportCallback&, &ToggleFilterFlag::active> ActiveCaller;
+typedef MemberCaller<ToggleFilterFlag, void(const ImportExportCallback<bool>::Import_t&), &ToggleFilterFlag::active> ActiveCaller;
 void toggle(){
 	g_filters_globals.exclude ^= m_mask;
 	m_item.update();
@@ -141,7 +141,7 @@ void reset(){
 	m_item.update();
 	PerformFiltering();
 }
-typedef MemberCaller<ToggleFilterFlag, &ToggleFilterFlag::toggle> ToggleCaller;
+typedef MemberCaller<ToggleFilterFlag, void(), &ToggleFilterFlag::toggle> ToggleCaller;
 };
 
 
@@ -171,7 +171,7 @@ void ResetFilters(){
 	}
 }
 
-void Filters_constructMenu( GtkMenu* menu_in_menu ){
+void Filters_constructMenu( ui::Menu menu_in_menu ){
 	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" ) {
@@ -218,8 +218,8 @@ void Filters_constructMenu( GtkMenu* menu_in_menu ){
 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 ) );