From: Thomas Debesse <dev@illwieckz.net>
Date: Mon, 25 May 2020 23:55:24 +0000 (+0200)
Subject: fix merge
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=93a3d833ff57ef8304cb547dd1e3664b6b276ec4;p=xonotic%2Fnetradiant.git

fix merge
---

diff --git a/radiant/mainframe.cpp b/radiant/mainframe.cpp
index 4dd87b71..cf0525aa 100644
--- a/radiant/mainframe.cpp
+++ b/radiant/mainframe.cpp
@@ -3582,9 +3582,6 @@ void MainFrame_Construct(){
 	GlobalCommands_insert( "ArbitraryRotation", makeCallbackF(DoRotateDlg), Accelerator( 'R', (GdkModifierType)GDK_SHIFT_MASK ) );
 	GlobalCommands_insert( "ArbitraryScale", makeCallbackF(DoScaleDlg), Accelerator( 'S', (GdkModifierType)( GDK_SHIFT_MASK | GDK_CONTROL_MASK ) ) );
 
-	GlobalCommands_insert( "ArbitraryRotation", makeCallbackF(DoRotateDlg) );
-	GlobalCommands_insert( "ArbitraryScale", makeCallbackF(DoScaleDlg) );
-
 	GlobalCommands_insert( "BuildMenuCustomize", makeCallbackF(DoBuildMenu) );
 	GlobalCommands_insert( "Build_runRecentExecutedBuild", makeCallbackF(Build_runRecentExecutedBuild), Accelerator( GDK_F5 ) );
 
diff --git a/radiant/select.cpp b/radiant/select.cpp
index 1c97e9ee..1e4a4170 100644
--- a/radiant/select.cpp
+++ b/radiant/select.cpp
@@ -878,21 +878,21 @@ void Selection_RotateAnticlockwise(){
 
 
 void Select_registerCommands(){
-	GlobalCommands_insert( "ShowHidden", FreeCaller<Select_ShowAllHidden>(), Accelerator( 'H', (GdkModifierType)GDK_SHIFT_MASK ) );
-	GlobalToggles_insert( "HideSelected", FreeCaller<HideSelected>(), ToggleItem::AddCallbackCaller( g_hidden_item ), Accelerator( 'H' ) );
+	GlobalCommands_insert( "ShowHidden", makeCallbackF( Select_ShowAllHidden ), Accelerator( 'H', (GdkModifierType)GDK_SHIFT_MASK ) );
+	GlobalToggles_insert( "HideSelected", makeCallbackF( HideSelected ), ToggleItem::AddCallbackCaller( g_hidden_item ), Accelerator( 'H' ) );
 
-	GlobalCommands_insert( "MirrorSelectionX", FreeCaller<Selection_Flipx>() );
-	GlobalCommands_insert( "RotateSelectionX", FreeCaller<Selection_Rotatex>() );
-	GlobalCommands_insert( "MirrorSelectionY", FreeCaller<Selection_Flipy>() );
-	GlobalCommands_insert( "RotateSelectionY", FreeCaller<Selection_Rotatey>() );
-	GlobalCommands_insert( "MirrorSelectionZ", FreeCaller<Selection_Flipz>() );
-	GlobalCommands_insert( "RotateSelectionZ", FreeCaller<Selection_Rotatez>() );
+	GlobalCommands_insert( "MirrorSelectionX", makeCallbackF( Selection_Flipx ) );
+	GlobalCommands_insert( "RotateSelectionX", makeCallbackF( Selection_Rotatex ) );
+	GlobalCommands_insert( "MirrorSelectionY", makeCallbackF( Selection_Flipy ) );
+	GlobalCommands_insert( "RotateSelectionY", makeCallbackF( Selection_Rotatey ) );
+	GlobalCommands_insert( "MirrorSelectionZ", makeCallbackF( Selection_Flipz ) );
+	GlobalCommands_insert( "RotateSelectionZ", makeCallbackF( Selection_Rotatez ) );
 
-	GlobalCommands_insert( "MirrorSelectionHorizontally", FreeCaller<Selection_FlipHorizontally>() );
-	GlobalCommands_insert( "MirrorSelectionVertically", FreeCaller<Selection_FlipVertically>() );
+	GlobalCommands_insert( "MirrorSelectionHorizontally", makeCallbackF( Selection_FlipHorizontally ) );
+	GlobalCommands_insert( "MirrorSelectionVertically", makeCallbackF( Selection_FlipVertically ) );
 
-	GlobalCommands_insert( "RotateSelectionClockwise", FreeCaller<Selection_RotateClockwise>() );
-	GlobalCommands_insert( "RotateSelectionAnticlockwise", FreeCaller<Selection_RotateAnticlockwise>() );
+	GlobalCommands_insert( "RotateSelectionClockwise", makeCallbackF( Selection_RotateClockwise ) );
+	GlobalCommands_insert( "RotateSelectionAnticlockwise", makeCallbackF( Selection_RotateAnticlockwise ) );
 }