From e1a145c234c4d1cede0fcd49a8bdc6905c93f35f Mon Sep 17 00:00:00 2001 From: Garux Date: Tue, 19 May 2020 21:40:52 +0300 Subject: [PATCH] remove excess (GdkModifierType) casts --- radiant/brushmanip.cpp | 22 +++++++------- radiant/camwindow.cpp | 14 ++++----- radiant/clippertool.cpp | 4 +-- radiant/entity.cpp | 6 ++-- radiant/filters.cpp | 34 ++++++++++----------- radiant/mainframe.cpp | 62 +++++++++++++++++++-------------------- radiant/patchdialog.cpp | 6 ++-- radiant/patchmanip.cpp | 22 +++++++------- radiant/select.cpp | 2 +- radiant/surfacedialog.cpp | 4 +-- radiant/texwindow.cpp | 2 +- radiant/xywindow.cpp | 4 +-- 12 files changed, 91 insertions(+), 91 deletions(-) diff --git a/radiant/brushmanip.cpp b/radiant/brushmanip.cpp index 2d7d9af3..1e4186e9 100644 --- a/radiant/brushmanip.cpp +++ b/radiant/brushmanip.cpp @@ -1505,8 +1505,8 @@ void Texdef_ToggleMoveVLock(){ void Brush_registerCommands(){ - GlobalToggles_insert( "TogTexLock", FreeCaller(), ToggleItem::AddCallbackCaller( g_texdef_movelock_item ), Accelerator( 'T', (GdkModifierType)GDK_SHIFT_MASK ) ); - GlobalToggles_insert( "TogTexVertexLock", FreeCaller(), ToggleItem::AddCallbackCaller( g_texdef_moveVlock_item ), accelerator_null() ); + GlobalToggles_insert( "TogTexLock", FreeCaller(), ToggleItem::AddCallbackCaller( g_texdef_movelock_item ), Accelerator( 'T', GDK_SHIFT_MASK ) ); + GlobalToggles_insert( "TogTexVertexLock", FreeCaller(), ToggleItem::AddCallbackCaller( g_texdef_moveVlock_item ) ); GlobalCommands_insert( "BrushPrism", BrushPrefab::SetCaller( g_brushprism ) ); GlobalCommands_insert( "BrushCone", BrushPrefab::SetCaller( g_brushcone ) ); @@ -1514,16 +1514,16 @@ void Brush_registerCommands(){ GlobalCommands_insert( "BrushRock", BrushPrefab::SetCaller( g_brushrock ) ); GlobalCommands_insert( "BrushIcosahedron", BrushPrefab::SetCaller( g_brushicosahedron ) ); - GlobalCommands_insert( "Brush3Sided", BrushMakeSided::SetCaller( g_brushmakesided3 ), Accelerator( '3', (GdkModifierType)GDK_CONTROL_MASK ) ); - GlobalCommands_insert( "Brush4Sided", BrushMakeSided::SetCaller( g_brushmakesided4 ), Accelerator( '4', (GdkModifierType)GDK_CONTROL_MASK ) ); - GlobalCommands_insert( "Brush5Sided", BrushMakeSided::SetCaller( g_brushmakesided5 ), Accelerator( '5', (GdkModifierType)GDK_CONTROL_MASK ) ); - GlobalCommands_insert( "Brush6Sided", BrushMakeSided::SetCaller( g_brushmakesided6 ), Accelerator( '6', (GdkModifierType)GDK_CONTROL_MASK ) ); - GlobalCommands_insert( "Brush7Sided", BrushMakeSided::SetCaller( g_brushmakesided7 ), Accelerator( '7', (GdkModifierType)GDK_CONTROL_MASK ) ); - GlobalCommands_insert( "Brush8Sided", BrushMakeSided::SetCaller( g_brushmakesided8 ), Accelerator( '8', (GdkModifierType)GDK_CONTROL_MASK ) ); - GlobalCommands_insert( "Brush9Sided", BrushMakeSided::SetCaller( g_brushmakesided9 ), Accelerator( '9', (GdkModifierType)GDK_CONTROL_MASK ) ); + GlobalCommands_insert( "Brush3Sided", BrushMakeSided::SetCaller( g_brushmakesided3 ), Accelerator( '3', GDK_CONTROL_MASK ) ); + GlobalCommands_insert( "Brush4Sided", BrushMakeSided::SetCaller( g_brushmakesided4 ), Accelerator( '4', GDK_CONTROL_MASK ) ); + GlobalCommands_insert( "Brush5Sided", BrushMakeSided::SetCaller( g_brushmakesided5 ), Accelerator( '5', GDK_CONTROL_MASK ) ); + GlobalCommands_insert( "Brush6Sided", BrushMakeSided::SetCaller( g_brushmakesided6 ), Accelerator( '6', GDK_CONTROL_MASK ) ); + GlobalCommands_insert( "Brush7Sided", BrushMakeSided::SetCaller( g_brushmakesided7 ), Accelerator( '7', GDK_CONTROL_MASK ) ); + GlobalCommands_insert( "Brush8Sided", BrushMakeSided::SetCaller( g_brushmakesided8 ), Accelerator( '8', GDK_CONTROL_MASK ) ); + GlobalCommands_insert( "Brush9Sided", BrushMakeSided::SetCaller( g_brushmakesided9 ), Accelerator( '9', GDK_CONTROL_MASK ) ); - GlobalCommands_insert( "MakeDetail", FreeCaller(), Accelerator( 'D', (GdkModifierType)GDK_MOD1_MASK ) ); - GlobalCommands_insert( "MakeStructural", FreeCaller(), Accelerator( 'S', (GdkModifierType)GDK_MOD1_MASK ) ); + GlobalCommands_insert( "MakeDetail", FreeCaller(), Accelerator( 'D', GDK_MOD1_MASK ) ); + GlobalCommands_insert( "MakeStructural", FreeCaller(), Accelerator( 'S', GDK_MOD1_MASK ) ); } void Brush_constructMenu( GtkMenu* menu ){ diff --git a/radiant/camwindow.cpp b/radiant/camwindow.cpp index b2a4baa3..610078a3 100644 --- a/radiant/camwindow.cpp +++ b/radiant/camwindow.cpp @@ -2555,9 +2555,9 @@ void CamWnd_Construct(){ GlobalCommands_insert( "CenterView", FreeCaller(), Accelerator( GDK_KEY_End ) ); GlobalCommands_insert( "CameraFocusOnSelected", FreeCaller(), Accelerator( GDK_KEY_Tab ) ); - GlobalToggles_insert( "ToggleCubicClip", FreeCaller(), ToggleItem::AddCallbackCaller( g_getfarclip_item ), Accelerator( '\\', (GdkModifierType)GDK_CONTROL_MASK ) ); - GlobalCommands_insert( "CubicClipZoomIn", FreeCaller(), Accelerator( '[', (GdkModifierType)GDK_CONTROL_MASK ) ); - GlobalCommands_insert( "CubicClipZoomOut", FreeCaller(), Accelerator( ']', (GdkModifierType)GDK_CONTROL_MASK ) ); + GlobalToggles_insert( "ToggleCubicClip", FreeCaller(), ToggleItem::AddCallbackCaller( g_getfarclip_item ), Accelerator( '\\', GDK_CONTROL_MASK ) ); + GlobalCommands_insert( "CubicClipZoomIn", FreeCaller(), Accelerator( '[', GDK_CONTROL_MASK ) ); + GlobalCommands_insert( "CubicClipZoomOut", FreeCaller(), Accelerator( ']', GDK_CONTROL_MASK ) ); GlobalCommands_insert( "UpFloor", FreeCaller(), Accelerator( GDK_KEY_Prior ) ); GlobalCommands_insert( "DownFloor", FreeCaller(), Accelerator( GDK_KEY_Next ) ); @@ -2570,11 +2570,11 @@ void CamWnd_Construct(){ GlobalCommands_insert( "TogglePreview", FreeCaller(), Accelerator( GDK_KEY_F3 ) ); } - GlobalCommands_insert( "CameraModeNext", FreeCaller(), Accelerator( '}', (GdkModifierType)GDK_SHIFT_MASK ) ); - GlobalCommands_insert( "CameraModePrev", FreeCaller(), Accelerator( '{', (GdkModifierType)GDK_SHIFT_MASK ) ); + GlobalCommands_insert( "CameraModeNext", FreeCaller(), Accelerator( '}', GDK_SHIFT_MASK ) ); + GlobalCommands_insert( "CameraModePrev", FreeCaller(), Accelerator( '{', GDK_SHIFT_MASK ) ); - GlobalCommands_insert( "CameraSpeedInc", FreeCaller(), Accelerator( GDK_KEY_KP_Add, (GdkModifierType)GDK_SHIFT_MASK ) ); - GlobalCommands_insert( "CameraSpeedDec", FreeCaller(), Accelerator( GDK_KEY_KP_Subtract, (GdkModifierType)GDK_SHIFT_MASK ) ); + GlobalCommands_insert( "CameraSpeedInc", FreeCaller(), Accelerator( GDK_KEY_KP_Add, GDK_SHIFT_MASK ) ); + GlobalCommands_insert( "CameraSpeedDec", FreeCaller(), Accelerator( GDK_KEY_KP_Subtract, GDK_SHIFT_MASK ) ); GlobalShortcuts_insert( "CameraForward", Accelerator( GDK_KEY_Up ) ); GlobalShortcuts_insert( "CameraBack", Accelerator( GDK_KEY_Down ) ); diff --git a/radiant/clippertool.cpp b/radiant/clippertool.cpp index a99d967a..99c0a2a6 100644 --- a/radiant/clippertool.cpp +++ b/radiant/clippertool.cpp @@ -197,8 +197,8 @@ void Clipper_registerPreferencesPage(){ void Clipper_registerCommands(){ GlobalCommands_insert( "ClipperClip", FreeCaller(), Accelerator( GDK_KEY_Return ) ); - GlobalCommands_insert( "ClipperSplit", FreeCaller(), Accelerator( GDK_KEY_Return, (GdkModifierType)GDK_SHIFT_MASK ) ); - GlobalCommands_insert( "ClipperFlip", FreeCaller(), Accelerator( GDK_KEY_Return, (GdkModifierType)GDK_CONTROL_MASK ) ); + GlobalCommands_insert( "ClipperSplit", FreeCaller(), Accelerator( GDK_KEY_Return, GDK_SHIFT_MASK ) ); + GlobalCommands_insert( "ClipperFlip", FreeCaller(), Accelerator( GDK_KEY_Return, GDK_CONTROL_MASK ) ); } SignalHandlerId ClipperTool_boundsChanged; diff --git a/radiant/entity.cpp b/radiant/entity.cpp index f6d41bde..1fd7a178 100644 --- a/radiant/entity.cpp +++ b/radiant/entity.cpp @@ -729,10 +729,10 @@ void Entity_registerShortcuts(){ void Entity_Construct(){ GlobalCommands_insert( "EntityColorSet", FreeCaller(), Accelerator( 'K' ) ); GlobalCommands_insert( "EntityColorNormalize", FreeCaller() ); - GlobalCommands_insert( "EntitiesConnect", FreeCaller(), Accelerator( 'K', (GdkModifierType)GDK_CONTROL_MASK ) ); + GlobalCommands_insert( "EntitiesConnect", FreeCaller(), Accelerator( 'K', GDK_CONTROL_MASK ) ); if ( g_pGameDescription->mGameType == "nexuiz" || g_pGameDescription->mGameType == "q1" ) - GlobalCommands_insert( "EntitiesKillConnect", FreeCaller(), Accelerator( 'K', (GdkModifierType)GDK_SHIFT_MASK ) ); - GlobalCommands_insert( "EntityMovePrimitivesToLast", FreeCaller(), Accelerator( 'M', (GdkModifierType)GDK_CONTROL_MASK ) ); + GlobalCommands_insert( "EntitiesKillConnect", FreeCaller(), Accelerator( 'K', GDK_SHIFT_MASK ) ); + GlobalCommands_insert( "EntityMovePrimitivesToLast", FreeCaller(), Accelerator( 'M', GDK_CONTROL_MASK ) ); GlobalCommands_insert( "EntityMovePrimitivesToFirst", FreeCaller() ); GlobalCommands_insert( "EntityUngroup", FreeCaller() ); GlobalCommands_insert( "EntityUngroupPrimitives", FreeCaller() ); diff --git a/radiant/filters.cpp b/radiant/filters.cpp index b232b791..840e5515 100644 --- a/radiant/filters.cpp +++ b/radiant/filters.cpp @@ -222,36 +222,36 @@ void ConstructFilters(){ GlobalCommands_insert( "InvertFilters", FreeCaller() ); GlobalCommands_insert( "ResetFilters", FreeCaller() ); - 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', GDK_MOD1_MASK ) ); + add_filter_command( EXCLUDE_ENT, "FilterEntities", Accelerator( '2', GDK_MOD1_MASK ) ); if ( g_pGameDescription->mGameType == "doom3" ) { - add_filter_command( EXCLUDE_VISPORTALS, "FilterVisportals", Accelerator( '3', (GdkModifierType)GDK_MOD1_MASK ) ); + add_filter_command( EXCLUDE_VISPORTALS, "FilterVisportals", Accelerator( '3', GDK_MOD1_MASK ) ); } else { - add_filter_command( EXCLUDE_AREAPORTALS, "FilterAreaportals", Accelerator( '3', (GdkModifierType)GDK_MOD1_MASK ) ); + add_filter_command( EXCLUDE_AREAPORTALS, "FilterAreaportals", Accelerator( '3', GDK_MOD1_MASK ) ); } - add_filter_command( EXCLUDE_TRANSLUCENT, "FilterTranslucent", Accelerator( '4', (GdkModifierType)GDK_MOD1_MASK ) ); - add_filter_command( EXCLUDE_LIQUIDS, "FilterLiquids", Accelerator( '5', (GdkModifierType)GDK_MOD1_MASK ) ); - add_filter_command( EXCLUDE_CAULK, "FilterCaulk", Accelerator( '6', (GdkModifierType)GDK_MOD1_MASK ) ); - add_filter_command( EXCLUDE_CLIP, "FilterClips", Accelerator( '7', (GdkModifierType)GDK_MOD1_MASK ) ); - add_filter_command( EXCLUDE_PATHS, "FilterPaths", Accelerator( '8', (GdkModifierType)GDK_MOD1_MASK ) ); + add_filter_command( EXCLUDE_TRANSLUCENT, "FilterTranslucent", Accelerator( '4', GDK_MOD1_MASK ) ); + add_filter_command( EXCLUDE_LIQUIDS, "FilterLiquids", Accelerator( '5', GDK_MOD1_MASK ) ); + add_filter_command( EXCLUDE_CAULK, "FilterCaulk", Accelerator( '6', GDK_MOD1_MASK ) ); + add_filter_command( EXCLUDE_CLIP, "FilterClips", Accelerator( '7', GDK_MOD1_MASK ) ); + add_filter_command( EXCLUDE_PATHS, "FilterPaths", Accelerator( '8', GDK_MOD1_MASK ) ); if ( g_pGameDescription->mGameType != "doom3" ) { - add_filter_command( EXCLUDE_CLUSTERPORTALS, "FilterClusterportals", Accelerator( '9', (GdkModifierType)GDK_MOD1_MASK ) ); + add_filter_command( EXCLUDE_CLUSTERPORTALS, "FilterClusterportals", Accelerator( '9', GDK_MOD1_MASK ) ); } - add_filter_command( EXCLUDE_LIGHTS, "FilterLights", Accelerator( '0', (GdkModifierType)GDK_MOD1_MASK ) ); + add_filter_command( EXCLUDE_LIGHTS, "FilterLights", Accelerator( '0', GDK_MOD1_MASK ) ); add_filter_command( EXCLUDE_STRUCTURAL, "FilterStructural", Accelerator( 'D', (GdkModifierType)( GDK_SHIFT_MASK | GDK_CONTROL_MASK ) ) ); if ( g_pGameDescription->mGameType != "doom3" ) { add_filter_command( EXCLUDE_LIGHTGRID, "FilterLightgrid", accelerator_null() ); } - add_filter_command( EXCLUDE_CURVES, "FilterPatches", Accelerator( 'P', (GdkModifierType)GDK_CONTROL_MASK ) ); - add_filter_command( EXCLUDE_DETAILS, "FilterDetails", Accelerator( 'D', (GdkModifierType)GDK_CONTROL_MASK ) ); - add_filter_command( EXCLUDE_HINTSSKIPS, "FilterHintsSkips", Accelerator( 'H', (GdkModifierType)GDK_CONTROL_MASK ) ); - add_filter_command( EXCLUDE_MODELS, "FilterModels", Accelerator( 'M', (GdkModifierType)GDK_SHIFT_MASK ) ); + add_filter_command( EXCLUDE_CURVES, "FilterPatches", Accelerator( 'P', GDK_CONTROL_MASK ) ); + add_filter_command( EXCLUDE_DETAILS, "FilterDetails", Accelerator( 'D', GDK_CONTROL_MASK ) ); + add_filter_command( EXCLUDE_HINTSSKIPS, "FilterHintsSkips", Accelerator( 'H', GDK_CONTROL_MASK ) ); + add_filter_command( EXCLUDE_MODELS, "FilterModels", Accelerator( 'M', GDK_SHIFT_MASK ) ); add_filter_command( EXCLUDE_TRIGGERS, "FilterTriggers", Accelerator( 'T', (GdkModifierType)( GDK_SHIFT_MASK | GDK_CONTROL_MASK ) ) ); if ( g_pGameDescription->mGameType != "doom3" ) { - add_filter_command( EXCLUDE_BOTCLIP, "FilterBotClips", Accelerator( 'M', (GdkModifierType)GDK_MOD1_MASK ) ); - add_filter_command( EXCLUDE_DECALS, "FilterDecals", Accelerator( 'D', (GdkModifierType)GDK_SHIFT_MASK ) ); + add_filter_command( EXCLUDE_BOTCLIP, "FilterBotClips", Accelerator( 'M', GDK_MOD1_MASK ) ); + add_filter_command( EXCLUDE_DECALS, "FilterDecals", Accelerator( 'D', GDK_SHIFT_MASK ) ); } add_filter_command( EXCLUDE_FUNC_GROUPS, "FilterFuncGroups", accelerator_null() ); diff --git a/radiant/mainframe.cpp b/radiant/mainframe.cpp index 20b99e4b..6919320e 100644 --- a/radiant/mainframe.cpp +++ b/radiant/mainframe.cpp @@ -3576,9 +3576,9 @@ void MainFrame_Construct(){ GlobalCommands_insert( "OpenManual", FreeCaller(), Accelerator( GDK_KEY_F1 ) ); GlobalCommands_insert( "NewMap", FreeCaller() ); - GlobalCommands_insert( "OpenMap", FreeCaller(), Accelerator( 'O', (GdkModifierType)GDK_CONTROL_MASK ) ); + GlobalCommands_insert( "OpenMap", FreeCaller(), Accelerator( 'O', GDK_CONTROL_MASK ) ); GlobalCommands_insert( "ImportMap", FreeCaller() ); - GlobalCommands_insert( "SaveMap", FreeCaller(), Accelerator( 'S', (GdkModifierType)GDK_CONTROL_MASK ) ); + GlobalCommands_insert( "SaveMap", FreeCaller(), Accelerator( 'S', GDK_CONTROL_MASK ) ); GlobalCommands_insert( "SaveMapAs", FreeCaller() ); GlobalCommands_insert( "SaveSelected", FreeCaller() ); GlobalCommands_insert( "SaveRegion", FreeCaller() ); @@ -3587,25 +3587,25 @@ void MainFrame_Construct(){ GlobalCommands_insert( "CheckForUpdate", FreeCaller() ); GlobalCommands_insert( "Exit", FreeCaller() ); - GlobalCommands_insert( "Undo", FreeCaller(), Accelerator( 'Z', (GdkModifierType)GDK_CONTROL_MASK ) ); - GlobalCommands_insert( "Redo", FreeCaller(), Accelerator( 'Y', (GdkModifierType)GDK_CONTROL_MASK ) ); - GlobalCommands_insert( "Copy", FreeCaller(), Accelerator( 'C', (GdkModifierType)GDK_CONTROL_MASK ) ); - GlobalCommands_insert( "Paste", FreeCaller(), Accelerator( 'V', (GdkModifierType)GDK_CONTROL_MASK ) ); - GlobalCommands_insert( "PasteToCamera", FreeCaller(), Accelerator( 'V', (GdkModifierType)GDK_SHIFT_MASK ) ); + GlobalCommands_insert( "Undo", FreeCaller(), Accelerator( 'Z', GDK_CONTROL_MASK ) ); + GlobalCommands_insert( "Redo", FreeCaller(), Accelerator( 'Y', GDK_CONTROL_MASK ) ); + GlobalCommands_insert( "Copy", FreeCaller(), Accelerator( 'C', GDK_CONTROL_MASK ) ); + GlobalCommands_insert( "Paste", FreeCaller(), Accelerator( 'V', GDK_CONTROL_MASK ) ); + GlobalCommands_insert( "PasteToCamera", FreeCaller(), Accelerator( 'V', GDK_SHIFT_MASK ) ); GlobalCommands_insert( "MoveToCamera", FreeCaller(), Accelerator( 'V', (GdkModifierType)( GDK_SHIFT_MASK | GDK_CONTROL_MASK ) ) ); GlobalCommands_insert( "CloneSelection", FreeCaller(), Accelerator( GDK_KEY_space ) ); - GlobalCommands_insert( "CloneSelectionAndMakeUnique", FreeCaller(), Accelerator( GDK_KEY_space, (GdkModifierType)GDK_SHIFT_MASK ) ); + GlobalCommands_insert( "CloneSelectionAndMakeUnique", FreeCaller(), Accelerator( GDK_KEY_space, GDK_SHIFT_MASK ) ); GlobalCommands_insert( "DeleteSelection2", FreeCaller(), Accelerator( GDK_KEY_BackSpace ) ); GlobalCommands_insert( "DeleteSelection", FreeCaller(), Accelerator( 'Z' ) ); - GlobalCommands_insert( "RepeatTransforms", FreeCaller(), Accelerator( 'R', (GdkModifierType)GDK_CONTROL_MASK ) ); + GlobalCommands_insert( "RepeatTransforms", FreeCaller(), Accelerator( 'R', GDK_CONTROL_MASK ) ); // GlobalCommands_insert( "ParentSelection", FreeCaller() ); GlobalCommands_insert( "UnSelectSelection2", FreeCaller(), Accelerator( GDK_KEY_Escape ) ); GlobalCommands_insert( "UnSelectSelection", FreeCaller(), Accelerator( 'C' ) ); GlobalCommands_insert( "InvertSelection", FreeCaller(), Accelerator( 'I' ) ); GlobalCommands_insert( "SelectInside", FreeCaller() ); GlobalCommands_insert( "SelectTouching", FreeCaller() ); - GlobalCommands_insert( "ExpandSelectionToPrimitives", FreeCaller(), Accelerator( 'E', (GdkModifierType)GDK_CONTROL_MASK ) ); - GlobalCommands_insert( "ExpandSelectionToEntities", FreeCaller(), Accelerator( 'E', (GdkModifierType)GDK_SHIFT_MASK ) ); + GlobalCommands_insert( "ExpandSelectionToPrimitives", FreeCaller(), Accelerator( 'E', GDK_CONTROL_MASK ) ); + GlobalCommands_insert( "ExpandSelectionToEntities", FreeCaller(), Accelerator( 'E', GDK_SHIFT_MASK ) ); GlobalCommands_insert( "SelectConnectedEntities", FreeCaller(), Accelerator( 'E', (GdkModifierType)( GDK_SHIFT_MASK | GDK_CONTROL_MASK ) ) ); GlobalCommands_insert( "Preferences", FreeCaller(), Accelerator( 'P' ) ); @@ -3614,7 +3614,7 @@ void MainFrame_Construct(){ GlobalCommands_insert( "ToggleModelBrowser", FreeCaller(), Accelerator( '/' ) ); GlobalCommands_insert( "EntityList", FreeCaller(), Accelerator( 'L' ) ); -// GlobalCommands_insert( "ShowHidden", FreeCaller(), Accelerator( 'H', (GdkModifierType)GDK_SHIFT_MASK ) ); +// GlobalCommands_insert( "ShowHidden", FreeCaller(), Accelerator( 'H', GDK_SHIFT_MASK ) ); // GlobalCommands_insert( "HideSelected", FreeCaller(), Accelerator( 'H' ) ); Select_registerCommands(); @@ -3622,7 +3622,7 @@ void MainFrame_Construct(){ GlobalToggles_insert( "DragEdges", FreeCaller(), ToggleItem::AddCallbackCaller( g_edgeMode_button ), Accelerator( 'E' ) ); GlobalToggles_insert( "DragFaces", FreeCaller(), ToggleItem::AddCallbackCaller( g_faceMode_button ), Accelerator( 'F' ) ); - GlobalCommands_insert( "ArbitraryRotation", FreeCaller(), Accelerator( 'R', (GdkModifierType)GDK_SHIFT_MASK ) ); + GlobalCommands_insert( "ArbitraryRotation", FreeCaller(), Accelerator( 'R', GDK_SHIFT_MASK ) ); GlobalCommands_insert( "ArbitraryScale", FreeCaller(), Accelerator( 'S', (GdkModifierType)( GDK_SHIFT_MASK | GDK_CONTROL_MASK ) ) ); GlobalCommands_insert( "BuildMenuCustomize", FreeCaller() ); @@ -3669,36 +3669,36 @@ void MainFrame_Construct(){ GlobalCommands_insert( "MaximizeView", FreeCaller(), Accelerator( GDK_KEY_F12 ) ); - GlobalCommands_insert( "CSGSubtract", FreeCaller(), Accelerator( 'U', (GdkModifierType)GDK_SHIFT_MASK ) ); + GlobalCommands_insert( "CSGSubtract", FreeCaller(), Accelerator( 'U', GDK_SHIFT_MASK ) ); GlobalCommands_insert( "CSGMerge", FreeCaller() ); - GlobalCommands_insert( "CSGWrapMerge", FreeCaller(), Accelerator( 'U', (GdkModifierType)GDK_CONTROL_MASK ) ); + GlobalCommands_insert( "CSGWrapMerge", FreeCaller(), Accelerator( 'U', GDK_CONTROL_MASK ) ); GlobalCommands_insert( "CSGroom", FreeCaller() ); GlobalCommands_insert( "CSGTool", FreeCaller() ); Grid_registerCommands(); - GlobalCommands_insert( "SnapToGrid", FreeCaller(), Accelerator( 'G', (GdkModifierType)GDK_CONTROL_MASK ) ); + GlobalCommands_insert( "SnapToGrid", FreeCaller(), Accelerator( 'G', GDK_CONTROL_MASK ) ); - GlobalCommands_insert( "SelectAllOfType", FreeCaller(), Accelerator( 'A', (GdkModifierType)GDK_SHIFT_MASK ) ); + GlobalCommands_insert( "SelectAllOfType", FreeCaller(), Accelerator( 'A', GDK_SHIFT_MASK ) ); - GlobalCommands_insert( "TexRotateClock", FreeCaller(), Accelerator( GDK_KEY_Next, (GdkModifierType)GDK_SHIFT_MASK ) ); - GlobalCommands_insert( "TexRotateCounter", FreeCaller(), Accelerator( GDK_KEY_Prior, (GdkModifierType)GDK_SHIFT_MASK ) ); - GlobalCommands_insert( "TexScaleUp", FreeCaller(), Accelerator( GDK_KEY_Up, (GdkModifierType)GDK_CONTROL_MASK ) ); - GlobalCommands_insert( "TexScaleDown", FreeCaller(), Accelerator( GDK_KEY_Down, (GdkModifierType)GDK_CONTROL_MASK ) ); - GlobalCommands_insert( "TexScaleLeft", FreeCaller(), Accelerator( GDK_KEY_Left, (GdkModifierType)GDK_CONTROL_MASK ) ); - GlobalCommands_insert( "TexScaleRight", FreeCaller(), Accelerator( GDK_KEY_Right, (GdkModifierType)GDK_CONTROL_MASK ) ); - GlobalCommands_insert( "TexShiftUp", FreeCaller(), Accelerator( GDK_KEY_Up, (GdkModifierType)GDK_SHIFT_MASK ) ); - GlobalCommands_insert( "TexShiftDown", FreeCaller(), Accelerator( GDK_KEY_Down, (GdkModifierType)GDK_SHIFT_MASK ) ); - GlobalCommands_insert( "TexShiftLeft", FreeCaller(), Accelerator( GDK_KEY_Left, (GdkModifierType)GDK_SHIFT_MASK ) ); - GlobalCommands_insert( "TexShiftRight", FreeCaller(), Accelerator( GDK_KEY_Right, (GdkModifierType)GDK_SHIFT_MASK ) ); + GlobalCommands_insert( "TexRotateClock", FreeCaller(), Accelerator( GDK_KEY_Next, GDK_SHIFT_MASK ) ); + GlobalCommands_insert( "TexRotateCounter", FreeCaller(), Accelerator( GDK_KEY_Prior, GDK_SHIFT_MASK ) ); + GlobalCommands_insert( "TexScaleUp", FreeCaller(), Accelerator( GDK_KEY_Up, GDK_CONTROL_MASK ) ); + GlobalCommands_insert( "TexScaleDown", FreeCaller(), Accelerator( GDK_KEY_Down, GDK_CONTROL_MASK ) ); + GlobalCommands_insert( "TexScaleLeft", FreeCaller(), Accelerator( GDK_KEY_Left, GDK_CONTROL_MASK ) ); + GlobalCommands_insert( "TexScaleRight", FreeCaller(), Accelerator( GDK_KEY_Right, GDK_CONTROL_MASK ) ); + GlobalCommands_insert( "TexShiftUp", FreeCaller(), Accelerator( GDK_KEY_Up, GDK_SHIFT_MASK ) ); + GlobalCommands_insert( "TexShiftDown", FreeCaller(), Accelerator( GDK_KEY_Down, GDK_SHIFT_MASK ) ); + GlobalCommands_insert( "TexShiftLeft", FreeCaller(), Accelerator( GDK_KEY_Left, GDK_SHIFT_MASK ) ); + GlobalCommands_insert( "TexShiftRight", FreeCaller(), Accelerator( GDK_KEY_Right, GDK_SHIFT_MASK ) ); GlobalCommands_insert( "MoveSelectionDOWN", FreeCaller(), Accelerator( GDK_KEY_KP_Subtract ) ); GlobalCommands_insert( "MoveSelectionUP", FreeCaller(), Accelerator( GDK_KEY_KP_Add ) ); - GlobalCommands_insert( "SelectNudgeLeft", FreeCaller(), Accelerator( GDK_KEY_Left, (GdkModifierType)GDK_MOD1_MASK ) ); - GlobalCommands_insert( "SelectNudgeRight", FreeCaller(), Accelerator( GDK_KEY_Right, (GdkModifierType)GDK_MOD1_MASK ) ); - GlobalCommands_insert( "SelectNudgeUp", FreeCaller(), Accelerator( GDK_KEY_Up, (GdkModifierType)GDK_MOD1_MASK ) ); - GlobalCommands_insert( "SelectNudgeDown", FreeCaller(), Accelerator( GDK_KEY_Down, (GdkModifierType)GDK_MOD1_MASK ) ); + GlobalCommands_insert( "SelectNudgeLeft", FreeCaller(), Accelerator( GDK_KEY_Left, GDK_MOD1_MASK ) ); + GlobalCommands_insert( "SelectNudgeRight", FreeCaller(), Accelerator( GDK_KEY_Right, GDK_MOD1_MASK ) ); + GlobalCommands_insert( "SelectNudgeUp", FreeCaller(), Accelerator( GDK_KEY_Up, GDK_MOD1_MASK ) ); + GlobalCommands_insert( "SelectNudgeDown", FreeCaller(), Accelerator( GDK_KEY_Down, GDK_MOD1_MASK ) ); Patch_registerCommands(); XYShow_registerCommands(); diff --git a/radiant/patchdialog.cpp b/radiant/patchdialog.cpp index 725829de..d4e9a516 100644 --- a/radiant/patchdialog.cpp +++ b/radiant/patchdialog.cpp @@ -544,11 +544,11 @@ static void OnSpinChanged( GtkAdjustment *adj, gpointer data ){ } static gint OnDialogKey( GtkWidget* widget, GdkEventKey* event, gpointer data ){ - if ( event->keyval == GDK_Return ) { + if ( event->keyval == GDK_KEY_Return ) { OnApply( 0, 0 ); return TRUE; } - else if ( event->keyval == GDK_Escape ) { + else if ( event->keyval == GDK_KEY_Escape ) { g_PatchInspector.GetPatchInfo(); return TRUE; } @@ -1149,7 +1149,7 @@ void PatchInspector_SelectionChanged( const Selectable& selectable ){ void PatchInspector_Construct(){ - GlobalCommands_insert( "PatchInspector", FreeCaller(), Accelerator( 'S', (GdkModifierType)GDK_SHIFT_MASK ) ); + GlobalCommands_insert( "PatchInspector", FreeCaller(), Accelerator( 'S', GDK_SHIFT_MASK ) ); GlobalPreferenceSystem().registerPreference( "PatchWnd", WindowPositionTrackerImportStringCaller( g_PatchInspector.m_position_tracker ), WindowPositionTrackerExportStringCaller( g_PatchInspector.m_position_tracker ) ); GlobalPreferenceSystem().registerPreference( "SI_PatchTexdef_Scale1", FloatImportStringCaller( g_pi_globals.scale[0] ), FloatExportStringCaller( g_pi_globals.scale[0] ) ); diff --git a/radiant/patchmanip.cpp b/radiant/patchmanip.cpp index 64833761..bc2e7801 100644 --- a/radiant/patchmanip.cpp +++ b/radiant/patchmanip.cpp @@ -840,8 +840,8 @@ void PatchPreferences_construct(){ void Patch_registerCommands(){ GlobalCommands_insert( "InvertCurveTextureX", FreeCaller(), Accelerator( 'I', (GdkModifierType)( GDK_SHIFT_MASK | GDK_CONTROL_MASK ) ) ); - GlobalCommands_insert( "InvertCurveTextureY", FreeCaller(), Accelerator( 'I', (GdkModifierType)GDK_SHIFT_MASK ) ); - GlobalCommands_insert( "NaturalizePatch", FreeCaller(), Accelerator( 'N', (GdkModifierType)GDK_CONTROL_MASK ) ); + GlobalCommands_insert( "InvertCurveTextureY", FreeCaller(), Accelerator( 'I', GDK_SHIFT_MASK ) ); + GlobalCommands_insert( "NaturalizePatch", FreeCaller(), Accelerator( 'N', GDK_CONTROL_MASK ) ); GlobalCommands_insert( "PatchCylinder", FreeCaller() ); // GlobalCommands_insert( "PatchDenseCylinder", FreeCaller() ); // GlobalCommands_insert( "PatchVeryDenseCylinder", FreeCaller() ); @@ -855,28 +855,28 @@ void Patch_registerCommands(){ // GlobalCommands_insert( "PatchSquareEndcap", FreeCaller() ); GlobalCommands_insert( "PatchCone", FreeCaller() ); GlobalCommands_insert( "PatchSphere", FreeCaller() ); - GlobalCommands_insert( "SimplePatchMesh", FreeCaller(), Accelerator( 'P', (GdkModifierType)GDK_SHIFT_MASK ) ); + GlobalCommands_insert( "SimplePatchMesh", FreeCaller(), Accelerator( 'P', GDK_SHIFT_MASK ) ); GlobalCommands_insert( "PatchInsertFirstColumn", FreeCaller(), Accelerator( GDK_KEY_KP_Add, (GdkModifierType)( GDK_SHIFT_MASK | GDK_CONTROL_MASK ) ) ); GlobalCommands_insert( "PatchInsertLastColumn", FreeCaller() ); - GlobalCommands_insert( "PatchInsertFirstRow", FreeCaller(), Accelerator( GDK_KEY_KP_Add, (GdkModifierType)GDK_CONTROL_MASK ) ); + GlobalCommands_insert( "PatchInsertFirstRow", FreeCaller(), Accelerator( GDK_KEY_KP_Add, GDK_CONTROL_MASK ) ); GlobalCommands_insert( "PatchInsertLastRow", FreeCaller() ); GlobalCommands_insert( "PatchDeleteFirstColumn", FreeCaller() ); GlobalCommands_insert( "PatchDeleteLastColumn", FreeCaller(), Accelerator( GDK_KEY_KP_Subtract, (GdkModifierType)( GDK_SHIFT_MASK | GDK_CONTROL_MASK ) ) ); GlobalCommands_insert( "PatchDeleteFirstRow", FreeCaller() ); - GlobalCommands_insert( "PatchDeleteLastRow", FreeCaller(), Accelerator( GDK_KEY_KP_Subtract, (GdkModifierType)GDK_CONTROL_MASK ) ); - GlobalCommands_insert( "InvertCurve", FreeCaller(), Accelerator( 'I', (GdkModifierType)GDK_CONTROL_MASK ) ); - //GlobalCommands_insert( "RedisperseRows", FreeCaller(), Accelerator( 'E', (GdkModifierType)GDK_CONTROL_MASK ) ); + GlobalCommands_insert( "PatchDeleteLastRow", FreeCaller(), Accelerator( GDK_KEY_KP_Subtract, GDK_CONTROL_MASK ) ); + GlobalCommands_insert( "InvertCurve", FreeCaller(), Accelerator( 'I', GDK_CONTROL_MASK ) ); + //GlobalCommands_insert( "RedisperseRows", FreeCaller(), Accelerator( 'E', GDK_CONTROL_MASK ) ); GlobalCommands_insert( "RedisperseRows", FreeCaller() ); //GlobalCommands_insert( "RedisperseCols", FreeCaller(), Accelerator( 'E', (GdkModifierType)( GDK_SHIFT_MASK | GDK_CONTROL_MASK ) ) ); GlobalCommands_insert( "RedisperseCols", FreeCaller() ); - GlobalCommands_insert( "SmoothRows", FreeCaller(), Accelerator( 'W', (GdkModifierType)GDK_CONTROL_MASK ) ); + GlobalCommands_insert( "SmoothRows", FreeCaller(), Accelerator( 'W', GDK_CONTROL_MASK ) ); GlobalCommands_insert( "SmoothCols", FreeCaller(), Accelerator( 'W', (GdkModifierType)( GDK_SHIFT_MASK | GDK_CONTROL_MASK ) ) ); GlobalCommands_insert( "MatrixTranspose", FreeCaller(), Accelerator( 'M', (GdkModifierType)( GDK_SHIFT_MASK | GDK_CONTROL_MASK ) ) ); - GlobalCommands_insert( "CapCurrentCurve", FreeCaller(), Accelerator( 'C', (GdkModifierType)GDK_SHIFT_MASK ) ); + GlobalCommands_insert( "CapCurrentCurve", FreeCaller(), Accelerator( 'C', GDK_SHIFT_MASK ) ); // GlobalCommands_insert( "MakeOverlayPatch", FreeCaller(), Accelerator( 'Y' ) ); -// GlobalCommands_insert( "ClearPatchOverlays", FreeCaller(), Accelerator( 'L', (GdkModifierType)GDK_CONTROL_MASK ) ); +// GlobalCommands_insert( "ClearPatchOverlays", FreeCaller(), Accelerator( 'L', GDK_CONTROL_MASK ) ); GlobalCommands_insert( "PatchDeform", FreeCaller() ); - GlobalCommands_insert( "PatchThicken", FreeCaller(), Accelerator( 'T', (GdkModifierType)GDK_CONTROL_MASK ) ); + GlobalCommands_insert( "PatchThicken", FreeCaller(), Accelerator( 'T', GDK_CONTROL_MASK ) ); } void Patch_constructToolbar( GtkToolbar* toolbar ){ diff --git a/radiant/select.cpp b/radiant/select.cpp index a3032d28..f6f64a88 100644 --- a/radiant/select.cpp +++ b/radiant/select.cpp @@ -1071,7 +1071,7 @@ void Selection_RotateAnticlockwise(){ void Select_registerCommands(){ - GlobalCommands_insert( "ShowHidden", FreeCaller(), Accelerator( 'H', (GdkModifierType)GDK_SHIFT_MASK ) ); + GlobalCommands_insert( "ShowHidden", FreeCaller(), Accelerator( 'H', GDK_SHIFT_MASK ) ); GlobalToggles_insert( "HideSelected", FreeCaller(), ToggleItem::AddCallbackCaller( g_hidden_item ), Accelerator( 'H' ) ); GlobalCommands_insert( "MirrorSelectionX", FreeCaller() ); diff --git a/radiant/surfacedialog.cpp b/radiant/surfacedialog.cpp index 324e4528..2c38ba6b 100644 --- a/radiant/surfacedialog.cpp +++ b/radiant/surfacedialog.cpp @@ -1835,8 +1835,8 @@ void SurfaceInspector_registerPreferencesPage(){ } void SurfaceInspector_registerCommands(){ - GlobalCommands_insert( "TextureReset/Cap", FreeCaller(), Accelerator( 'N', (GdkModifierType)GDK_SHIFT_MASK ) ); - GlobalCommands_insert( "FitTexture", FreeCaller(), Accelerator( 'F', (GdkModifierType)GDK_CONTROL_MASK ) ); + GlobalCommands_insert( "TextureReset/Cap", FreeCaller(), Accelerator( 'N', GDK_SHIFT_MASK ) ); + GlobalCommands_insert( "FitTexture", FreeCaller(), Accelerator( 'F', GDK_CONTROL_MASK ) ); GlobalCommands_insert( "FitTextureWidth", FreeCaller() ); GlobalCommands_insert( "FitTextureHeight", FreeCaller() ); GlobalCommands_insert( "FitTextureWidthOnly", FreeCaller() ); diff --git a/radiant/texwindow.cpp b/radiant/texwindow.cpp index 53c2918c..6dbf8b38 100644 --- a/radiant/texwindow.cpp +++ b/radiant/texwindow.cpp @@ -2752,7 +2752,7 @@ void TextureBrowser_Construct(){ GlobalCommands_insert( "PasteTag", FreeCaller() ); GlobalCommands_insert( "RefreshShaders", FreeCaller() ); GlobalToggles_insert( "ShowInUse", FreeCaller(), ToggleItem::AddCallbackCaller( g_TextureBrowser.m_hideunused_item ), Accelerator( 'U' ) ); - GlobalCommands_insert( "ShowAllTextures", FreeCaller(), Accelerator( 'A', (GdkModifierType)GDK_CONTROL_MASK ) ); + GlobalCommands_insert( "ShowAllTextures", FreeCaller(), Accelerator( 'A', GDK_CONTROL_MASK ) ); GlobalCommands_insert( "ToggleTextures", FreeCaller(), Accelerator( 'T' ) ); GlobalToggles_insert( "ToggleShowShaders", FreeCaller(), ToggleItem::AddCallbackCaller( g_TextureBrowser.m_showshaders_item ) ); GlobalToggles_insert( "ToggleShowTextures", FreeCaller(), ToggleItem::AddCallbackCaller( g_TextureBrowser.m_showtextures_item ) ); diff --git a/radiant/xywindow.cpp b/radiant/xywindow.cpp index e007f2b6..d857f5ed 100644 --- a/radiant/xywindow.cpp +++ b/radiant/xywindow.cpp @@ -2435,7 +2435,7 @@ typedef FreeCaller1 MSAAExportCaller; void XYShow_registerCommands(){ GlobalToggles_insert( "ShowSize2d", FreeCaller(), ToggleItem::AddCallbackCaller( g_show_size_item ), Accelerator( 'J' ) ); - GlobalToggles_insert( "ToggleCrosshairs", FreeCaller(), ToggleItem::AddCallbackCaller( g_show_crosshair_item ), Accelerator( 'X', (GdkModifierType)GDK_SHIFT_MASK ) ); + GlobalToggles_insert( "ToggleCrosshairs", FreeCaller(), ToggleItem::AddCallbackCaller( g_show_crosshair_item ), Accelerator( 'X', GDK_SHIFT_MASK ) ); GlobalToggles_insert( "ToggleGrid", FreeCaller(), ToggleItem::AddCallbackCaller( g_show_grid_item ), Accelerator( '0' ) ); GlobalToggles_insert( "ShowAngles", FreeCaller(), ToggleItem::AddCallbackCaller( g_show_angles ) ); @@ -2490,7 +2490,7 @@ void XYWindow_Construct(){ GlobalToggles_insert( "ToggleView", ToggleShown::ToggleCaller( g_xy_top_shown ), ToggleItem::AddCallbackCaller( g_xy_top_shown.m_item ) ); GlobalToggles_insert( "ToggleSideView", ToggleShown::ToggleCaller( g_yz_side_shown ), ToggleItem::AddCallbackCaller( g_yz_side_shown.m_item ) ); GlobalToggles_insert( "ToggleFrontView", ToggleShown::ToggleCaller( g_xz_front_shown ), ToggleItem::AddCallbackCaller( g_xz_front_shown.m_item ) ); - GlobalCommands_insert( "NextView", FreeCaller(), Accelerator( GDK_KEY_Tab, (GdkModifierType)GDK_CONTROL_MASK ) ); + GlobalCommands_insert( "NextView", FreeCaller(), Accelerator( GDK_KEY_Tab, GDK_CONTROL_MASK ) ); GlobalCommands_insert( "ZoomIn", FreeCaller(), Accelerator( GDK_KEY_Delete ) ); GlobalCommands_insert( "ZoomOut", FreeCaller(), Accelerator( GDK_KEY_Insert ) ); GlobalCommands_insert( "ViewTop", FreeCaller(), Accelerator( GDK_KEY_KP_7 ) );