From cc5bdf02932438e61b8fb41280d4754549a093b4 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Sun, 17 Mar 2019 10:28:08 +1100 Subject: Cleanup: rename DEPRECATED to UNUSED While the flags have been deprecated they're currently unused. Rename for clarity. --- source/blender/makesdna/DNA_userdef_types.h | 88 ++++++++++++++--------------- 1 file changed, 44 insertions(+), 44 deletions(-) (limited to 'source/blender/makesdna/DNA_userdef_types.h') diff --git a/source/blender/makesdna/DNA_userdef_types.h b/source/blender/makesdna/DNA_userdef_types.h index 9d070ecd8ec..1da28b4aa2d 100644 --- a/source/blender/makesdna/DNA_userdef_types.h +++ b/source/blender/makesdna/DNA_userdef_types.h @@ -801,32 +801,32 @@ typedef enum eUserPref_SectionFlag { /** #UserDef.flag */ typedef enum eUserPref_Flag { - USER_AUTOSAVE = (1 << 0), + USER_AUTOSAVE = (1 << 0), USER_FLAG_NUMINPUT_ADVANCED = (1 << 1), - USER_FLAG_DEPRECATED_2 = (1 << 2), /* cleared */ - USER_FLAG_DEPRECATED_3 = (1 << 3), /* cleared */ - USER_FLAG_DEPRECATED_4 = (1 << 4), /* cleared */ - USER_TRACKBALL = (1 << 5), - USER_FLAG_DEPRECATED_6 = (1 << 6), /* cleared */ - USER_FLAG_DEPRECATED_7 = (1 << 7), /* cleared */ - USER_MAT_ON_OB = (1 << 8), - USER_FLAG_DEPRECATED_9 = (1 << 9), /* cleared */ - USER_DEVELOPER_UI = (1 << 10), - USER_TOOLTIPS = (1 << 11), - USER_TWOBUTTONMOUSE = (1 << 12), - USER_NONUMPAD = (1 << 13), - USER_FLAG_DEPRECATED_14 = (1 << 14), /* cleared */ - USER_FILECOMPRESS = (1 << 15), - USER_SAVE_PREVIEWS = (1 << 16), - USER_CUSTOM_RANGE = (1 << 17), - USER_ADD_EDITMODE = (1 << 18), - USER_ADD_VIEWALIGNED = (1 << 19), - USER_RELPATHS = (1 << 20), - USER_RELEASECONFIRM = (1 << 21), - USER_SCRIPT_AUTOEXEC_DISABLE = (1 << 22), - USER_FILENOUI = (1 << 23), - USER_NONEGFRAMES = (1 << 24), - USER_TXT_TABSTOSPACES_DISABLE = (1 << 25), + USER_FLAG_UNUSED_2 = (1 << 2), /* cleared */ + USER_FLAG_UNUSED_3 = (1 << 3), /* cleared */ + USER_FLAG_UNUSED_4 = (1 << 4), /* cleared */ + USER_TRACKBALL = (1 << 5), + USER_FLAG_UNUSED_6 = (1 << 6), /* cleared */ + USER_FLAG_UNUSED_7 = (1 << 7), /* cleared */ + USER_MAT_ON_OB = (1 << 8), + USER_FLAG_UNUSED_9 = (1 << 9), /* cleared */ + USER_DEVELOPER_UI = (1 << 10), + USER_TOOLTIPS = (1 << 11), + USER_TWOBUTTONMOUSE = (1 << 12), + USER_NONUMPAD = (1 << 13), + USER_FLAG_UNUSED_14 = (1 << 14), /* cleared */ + USER_FILECOMPRESS = (1 << 15), + USER_SAVE_PREVIEWS = (1 << 16), + USER_CUSTOM_RANGE = (1 << 17), + USER_ADD_EDITMODE = (1 << 18), + USER_ADD_VIEWALIGNED = (1 << 19), + USER_RELPATHS = (1 << 20), + USER_RELEASECONFIRM = (1 << 21), + USER_SCRIPT_AUTOEXEC_DISABLE = (1 << 22), + USER_FILENOUI = (1 << 23), + USER_NONEGFRAMES = (1 << 24), + USER_TXT_TABSTOSPACES_DISABLE = (1 << 25), USER_TOOLTIPS_PYTHON = (1 << 26), } eUserPref_Flag; @@ -862,8 +862,8 @@ typedef enum eWalkNavigation_Flag { /** #UserDef.uiflag */ typedef enum eUserpref_UI_Flag { - USER_UIFLAG_DEPRECATED_0 = (1 << 0), /* cleared */ - USER_UIFLAG_DEPRECATED_1 = (1 << 1), /* cleared */ + USER_UIFLAG_UNUSED_0 = (1 << 0), /* cleared */ + USER_UIFLAG_UNUSED_1 = (1 << 1), /* cleared */ USER_WHEELZOOMDIR = (1 << 2), USER_FILTERFILEEXTS = (1 << 3), USER_DRAWVIEWINFO = (1 << 4), @@ -875,7 +875,7 @@ typedef enum eUserpref_UI_Flag { USER_MENUOPENAUTO = (1 << 9), USER_DEPTH_CURSOR = (1 << 10), USER_AUTOPERSP = (1 << 11), - USER_UIFLAG_DEPRECATED_12 = (1 << 12), /* cleared */ + USER_UIFLAG_UNUSED_12 = (1 << 12), /* cleared */ USER_GLOBALUNDO = (1 << 13), USER_ORBIT_SELECTION = (1 << 14), USER_DEPTH_NAVIGATE = (1 << 15), @@ -885,7 +885,7 @@ typedef enum eUserpref_UI_Flag { USER_CAM_LOCK_NO_PARENT = (1 << 19), USER_ZOOM_TO_MOUSEPOS = (1 << 20), USER_SHOW_FPS = (1 << 21), - USER_UIFLAG_DEPRECATED_22 = (1 << 22), /* cleared */ + USER_UIFLAG_UNUSED_22 = (1 << 22), /* cleared */ USER_MENUFIXEDORDER = (1 << 23), USER_CONTINUOUS_MOUSE = (1 << 24), USER_ZOOM_INVERT = (1 << 25), @@ -901,10 +901,10 @@ typedef enum eUserpref_UI_Flag { * * \note don't add new flags here, use 'uiflag' which has flags free. */ typedef enum eUserpref_UI_Flag2 { - USER_UIFLAG2_DEPRECATED_0 = (1 << 0), /* cleared */ - USER_REGION_OVERLAP = (1 << 1), - USER_TRACKPAD_NATURAL = (1 << 2), - USER_UIFLAG2_DEPRECATED_3 = (1 << 3), /* dirty */ + USER_UIFLAG2_UNUSED_0 = (1 << 0), /* cleared */ + USER_REGION_OVERLAP = (1 << 1), + USER_TRACKPAD_NATURAL = (1 << 2), + USER_UIFLAG2_UNUSED_3 = (1 << 3), /* dirty */ } eUserpref_UI_Flag2; typedef enum eUserpref_GPU_Flag { @@ -963,15 +963,15 @@ typedef enum eAutokey_Flag { /** #UserDef.transopts */ typedef enum eUserpref_Translation_Flags { - USER_TR_TOOLTIPS = (1 << 0), - USER_TR_IFACE = (1 << 1), - USER_TR_DEPRECATED_2 = (1 << 2), /* cleared */ - USER_TR_DEPRECATED_3 = (1 << 3), /* cleared */ - USER_TR_DEPRECATED_4 = (1 << 4), /* cleared */ - USER_DOTRANSLATE = (1 << 5), - USER_TR_DEPRECATED_6 = (1 << 6), /* cleared */ - USER_TR_DEPRECATED_7 = (1 << 7), /* cleared */ - USER_TR_NEWDATANAME = (1 << 8), + USER_TR_TOOLTIPS = (1 << 0), + USER_TR_IFACE = (1 << 1), + USER_TR_UNUSED_2 = (1 << 2), /* cleared */ + USER_TR_UNUSED_3 = (1 << 3), /* cleared */ + USER_TR_UNUSED_4 = (1 << 4), /* cleared */ + USER_DOTRANSLATE = (1 << 5), + USER_TR_UNUSED_6 = (1 << 6), /* cleared */ + USER_TR_UNUSED_7 = (1 << 7), /* cleared */ + USER_TR_NEWDATANAME = (1 << 8), } eUserpref_Translation_Flags; /** #UserDef.dupflag */ @@ -1011,8 +1011,8 @@ typedef enum eText_Draw_Options { /** Grease Pencil Settings. * #UserDef.gp_settings */ typedef enum eGP_UserdefSettings { - GP_PAINT_DEPRECATED_0 = (1 << 0), - GP_PAINT_DOSIMPLIFY = (1 << 1), + GP_PAINT_UNUSED_0 = (1 << 0), + GP_PAINT_DOSIMPLIFY = (1 << 1), } eGP_UserdefSettings; enum { -- cgit v1.2.3