From 4ecc7cf14a30bc79717bfbcaaa50cef9c43a3f4c Mon Sep 17 00:00:00 2001 From: Hans Goudey Date: Sat, 26 Nov 2022 00:21:17 -0600 Subject: [PATCH] Cleanup: Move interface_intern.hh The entire interface directory is now compiled as C++ files. --- .../blender/editors/interface/CMakeLists.txt | 2 +- .../interface/eyedroppers/eyedropper_color.cc | 2 +- .../eyedroppers/eyedropper_colorband.cc | 2 +- .../eyedroppers/eyedropper_datablock.cc | 2 +- .../interface/eyedroppers/eyedropper_depth.cc | 2 +- .../eyedroppers/eyedropper_driver.cc | 4 +- .../eyedroppers/eyedropper_gpencil_color.cc | 2 +- .../eyedroppers/interface_eyedropper.cc | 2 +- source/blender/editors/interface/interface.cc | 2 +- .../editors/interface/interface_align.cc | 2 +- .../editors/interface/interface_anim.cc | 2 +- .../interface/interface_button_group.cc | 2 +- .../interface/interface_context_menu.cc | 2 +- .../editors/interface/interface_drag.cc | 2 +- .../editors/interface/interface_draw.cc | 2 +- .../editors/interface/interface_handlers.cc | 2 +- .../editors/interface/interface_icons.cc | 2 +- .../interface/interface_icons_event.cc | 2 +- ...interface_intern.h => interface_intern.hh} | 668 ++++++++---------- .../editors/interface/interface_layout.cc | 2 +- .../editors/interface/interface_ops.cc | 2 +- .../editors/interface/interface_panel.cc | 2 +- .../editors/interface/interface_query.cc | 2 +- .../interface_region_color_picker.cc | 2 +- .../editors/interface/interface_region_hud.cc | 2 +- .../interface/interface_region_menu_pie.cc | 2 +- .../interface/interface_region_menu_popup.cc | 2 +- .../interface/interface_region_popover.cc | 2 +- .../interface/interface_region_popup.cc | 2 +- .../interface/interface_region_search.cc | 2 +- .../interface/interface_region_tooltip.cc | 2 +- .../editors/interface/interface_style.cc | 2 +- .../interface_template_asset_view.cc | 2 +- .../interface/interface_template_list.cc | 2 +- .../interface_template_search_menu.cc | 2 +- .../interface_template_search_operator.cc | 2 +- .../editors/interface/interface_templates.cc | 2 +- .../editors/interface/interface_undo.cc | 2 +- .../editors/interface/interface_utils.cc | 2 +- .../editors/interface/interface_widgets.cc | 2 +- source/blender/editors/interface/resources.cc | 2 +- source/blender/editors/interface/view2d.cc | 2 +- .../blender/editors/interface/view2d_draw.cc | 2 +- .../editors/interface/views/abstract_view.cc | 2 +- .../interface/views/abstract_view_item.cc | 2 +- .../editors/interface/views/grid_view.cc | 2 +- .../editors/interface/views/interface_view.cc | 2 +- .../editors/interface/views/tree_view.cc | 2 +- .../editors/space_buttons/buttons_texture.cc | 2 +- .../blender/editors/space_node/node_draw.cc | 8 +- .../editors/space_node/node_templates.cc | 2 +- 51 files changed, 346 insertions(+), 430 deletions(-) rename source/blender/editors/interface/{interface_intern.h => interface_intern.hh} (62%) diff --git a/source/blender/editors/interface/CMakeLists.txt b/source/blender/editors/interface/CMakeLists.txt index ee6a4e3d279..e3c809b6ccd 100644 --- a/source/blender/editors/interface/CMakeLists.txt +++ b/source/blender/editors/interface/CMakeLists.txt @@ -82,7 +82,7 @@ set(SRC views/tree_view.cc eyedroppers/eyedropper_intern.hh - interface_intern.h + interface_intern.hh interface_regions_intern.hh ) diff --git a/source/blender/editors/interface/eyedroppers/eyedropper_color.cc b/source/blender/editors/interface/eyedroppers/eyedropper_color.cc index 1e68f8a7aac..7f755d54650 100644 --- a/source/blender/editors/interface/eyedroppers/eyedropper_color.cc +++ b/source/blender/editors/interface/eyedroppers/eyedropper_color.cc @@ -41,7 +41,7 @@ #include "RNA_define.h" -#include "interface_intern.h" +#include "interface_intern.hh" #include "ED_clip.h" #include "ED_image.h" diff --git a/source/blender/editors/interface/eyedroppers/eyedropper_colorband.cc b/source/blender/editors/interface/eyedroppers/eyedropper_colorband.cc index 910c62d8f18..0f0155529c9 100644 --- a/source/blender/editors/interface/eyedroppers/eyedropper_colorband.cc +++ b/source/blender/editors/interface/eyedroppers/eyedropper_colorband.cc @@ -33,7 +33,7 @@ #include "WM_api.h" #include "WM_types.h" -#include "interface_intern.h" +#include "interface_intern.hh" #include "eyedropper_intern.hh" diff --git a/source/blender/editors/interface/eyedroppers/eyedropper_datablock.cc b/source/blender/editors/interface/eyedroppers/eyedropper_datablock.cc index be5d4da5b48..81b8ca96170 100644 --- a/source/blender/editors/interface/eyedroppers/eyedropper_datablock.cc +++ b/source/blender/editors/interface/eyedroppers/eyedropper_datablock.cc @@ -39,7 +39,7 @@ #include "ED_view3d.h" #include "eyedropper_intern.hh" -#include "interface_intern.h" +#include "interface_intern.hh" /** * \note #DataDropper is only internal name to avoid confusion with other kinds of eye-droppers. diff --git a/source/blender/editors/interface/eyedroppers/eyedropper_depth.cc b/source/blender/editors/interface/eyedroppers/eyedropper_depth.cc index 0a16691575c..64d953dc764 100644 --- a/source/blender/editors/interface/eyedroppers/eyedropper_depth.cc +++ b/source/blender/editors/interface/eyedroppers/eyedropper_depth.cc @@ -39,7 +39,7 @@ #include "ED_view3d.h" #include "eyedropper_intern.hh" -#include "interface_intern.h" +#include "interface_intern.hh" /** * \note #DepthDropper is only internal name to avoid confusion with other kinds of eye-droppers. diff --git a/source/blender/editors/interface/eyedroppers/eyedropper_driver.cc b/source/blender/editors/interface/eyedroppers/eyedropper_driver.cc index eb691905c1f..b5245fae2a9 100644 --- a/source/blender/editors/interface/eyedroppers/eyedropper_driver.cc +++ b/source/blender/editors/interface/eyedroppers/eyedropper_driver.cc @@ -34,7 +34,7 @@ #include "ED_keyframing.h" #include "eyedropper_intern.hh" -#include "interface_intern.h" +#include "interface_intern.hh" struct DriverDropper { /* Destination property (i.e. where we'll add a driver) */ @@ -156,7 +156,7 @@ static int driverdropper_modal(bContext *C, wmOperator *op, const wmEvent *event } /* Modal Operator init */ -static int driverdropper_invoke(bContext *C, wmOperator *op, const wmEvent */*event*/) +static int driverdropper_invoke(bContext *C, wmOperator *op, const wmEvent * /*event*/) { /* init */ if (driverdropper_init(C, op)) { diff --git a/source/blender/editors/interface/eyedroppers/eyedropper_gpencil_color.cc b/source/blender/editors/interface/eyedroppers/eyedropper_gpencil_color.cc index e16f265dc1e..ca54fbc15c4 100644 --- a/source/blender/editors/interface/eyedroppers/eyedropper_gpencil_color.cc +++ b/source/blender/editors/interface/eyedroppers/eyedropper_gpencil_color.cc @@ -47,7 +47,7 @@ #include "DEG_depsgraph_build.h" #include "eyedropper_intern.hh" -#include "interface_intern.h" +#include "interface_intern.hh" struct EyedropperGPencil { struct ColorManagedDisplay *display; diff --git a/source/blender/editors/interface/eyedroppers/interface_eyedropper.cc b/source/blender/editors/interface/eyedroppers/interface_eyedropper.cc index db54f5c3789..b0eee560076 100644 --- a/source/blender/editors/interface/eyedroppers/interface_eyedropper.cc +++ b/source/blender/editors/interface/eyedroppers/interface_eyedropper.cc @@ -19,7 +19,7 @@ #include "WM_api.h" #include "WM_types.h" -#include "interface_intern.h" +#include "interface_intern.hh" #include "eyedropper_intern.hh" /* own include */ diff --git a/source/blender/editors/interface/interface.cc b/source/blender/editors/interface/interface.cc index 331d1581db5..4d423f989a6 100644 --- a/source/blender/editors/interface/interface.cc +++ b/source/blender/editors/interface/interface.cc @@ -73,7 +73,7 @@ #include "DEG_depsgraph_query.h" -#include "interface_intern.h" +#include "interface_intern.hh" using blender::Vector; diff --git a/source/blender/editors/interface/interface_align.cc b/source/blender/editors/interface/interface_align.cc index d7a9f3bce97..162509f3f27 100644 --- a/source/blender/editors/interface/interface_align.cc +++ b/source/blender/editors/interface/interface_align.cc @@ -14,7 +14,7 @@ #include "UI_interface.h" -#include "interface_intern.h" +#include "interface_intern.hh" #include "MEM_guardedalloc.h" diff --git a/source/blender/editors/interface/interface_anim.cc b/source/blender/editors/interface/interface_anim.cc index 58a7ac93242..aa218aa51f4 100644 --- a/source/blender/editors/interface/interface_anim.cc +++ b/source/blender/editors/interface/interface_anim.cc @@ -40,7 +40,7 @@ #include "WM_api.h" #include "WM_types.h" -#include "interface_intern.h" +#include "interface_intern.hh" static FCurve *ui_but_get_fcurve( uiBut *but, AnimData **adt, bAction **action, bool *r_driven, bool *r_special) diff --git a/source/blender/editors/interface/interface_button_group.cc b/source/blender/editors/interface/interface_button_group.cc index 2ce6fbd2147..ed9065423e4 100644 --- a/source/blender/editors/interface/interface_button_group.cc +++ b/source/blender/editors/interface/interface_button_group.cc @@ -8,7 +8,7 @@ #include "MEM_guardedalloc.h" -#include "interface_intern.h" +#include "interface_intern.hh" /* -------------------------------------------------------------------- */ /** \name Button Groups diff --git a/source/blender/editors/interface/interface_context_menu.cc b/source/blender/editors/interface/interface_context_menu.cc index da7ed892632..4032fb4539f 100644 --- a/source/blender/editors/interface/interface_context_menu.cc +++ b/source/blender/editors/interface/interface_context_menu.cc @@ -30,7 +30,7 @@ #include "UI_interface.h" -#include "interface_intern.h" +#include "interface_intern.hh" #include "RNA_access.h" #include "RNA_prototypes.h" diff --git a/source/blender/editors/interface/interface_drag.cc b/source/blender/editors/interface/interface_drag.cc index e959986d19e..462cef50317 100644 --- a/source/blender/editors/interface/interface_drag.cc +++ b/source/blender/editors/interface/interface_drag.cc @@ -8,7 +8,7 @@ #include "WM_api.h" -#include "interface_intern.h" +#include "interface_intern.hh" void UI_but_drag_set_id(uiBut *but, ID *id) { diff --git a/source/blender/editors/interface/interface_draw.cc b/source/blender/editors/interface/interface_draw.cc index ffe4443ead4..bdac2ff4ba4 100644 --- a/source/blender/editors/interface/interface_draw.cc +++ b/source/blender/editors/interface/interface_draw.cc @@ -48,7 +48,7 @@ #include "UI_interface.h" /* own include */ -#include "interface_intern.h" +#include "interface_intern.hh" static int roundboxtype = UI_CNR_ALL; diff --git a/source/blender/editors/interface/interface_handlers.cc b/source/blender/editors/interface/interface_handlers.cc index a9229983995..fdecfb4ea60 100644 --- a/source/blender/editors/interface/interface_handlers.cc +++ b/source/blender/editors/interface/interface_handlers.cc @@ -57,7 +57,7 @@ #include "BLF_api.h" -#include "interface_intern.h" +#include "interface_intern.hh" #include "RNA_access.h" #include "RNA_prototypes.h" diff --git a/source/blender/editors/interface/interface_icons.cc b/source/blender/editors/interface/interface_icons.cc index 1d0677843ff..dab9d923428 100644 --- a/source/blender/editors/interface/interface_icons.cc +++ b/source/blender/editors/interface/interface_icons.cc @@ -62,7 +62,7 @@ #include "WM_api.h" #include "WM_types.h" -#include "interface_intern.h" +#include "interface_intern.hh" #ifndef WITH_HEADLESS # define ICON_GRID_COLS 26 diff --git a/source/blender/editors/interface/interface_icons_event.cc b/source/blender/editors/interface/interface_icons_event.cc index ec3246c273c..5d8af37c55f 100644 --- a/source/blender/editors/interface/interface_icons_event.cc +++ b/source/blender/editors/interface/interface_icons_event.cc @@ -18,7 +18,7 @@ #include "UI_interface.h" -#include "interface_intern.h" +#include "interface_intern.hh" static void icon_draw_rect_input_text( const rctf *rect, const float color[4], const char *str, float font_size, float v_offset) diff --git a/source/blender/editors/interface/interface_intern.h b/source/blender/editors/interface/interface_intern.hh similarity index 62% rename from source/blender/editors/interface/interface_intern.h rename to source/blender/editors/interface/interface_intern.hh index 1b7aaad7832..1b846a97403 100644 --- a/source/blender/editors/interface/interface_intern.h +++ b/source/blender/editors/interface/interface_intern.hh @@ -15,26 +15,26 @@ #include "UI_interface.h" #include "UI_resources.h" -#ifdef __cplusplus -extern "C" { -#endif - -struct ARegion; struct AnimationEvalContext; +struct ARegion; +struct bContext; +struct bContextStore; +struct ColorManagedDisplay; struct CurveMapping; struct CurveProfile; +struct GPUBatch; struct IconTextOverlay; struct ID; struct ImBuf; struct Main; struct Scene; -struct bContext; -struct bContextStore; struct uiHandleButtonData; struct uiLayout; +struct uiListType; struct uiStyle; struct uiUndoStack_Text; struct uiWidgetColors; +struct UnitSettings; struct wmEvent; struct wmKeyConfig; struct wmOperatorType; @@ -91,7 +91,7 @@ enum { }; /** #uiBut.pie_dir */ -typedef enum RadialDirection { +enum RadialDirection { UI_RADIAL_NONE = -1, UI_RADIAL_N = 0, UI_RADIAL_NE = 1, @@ -101,7 +101,7 @@ typedef enum RadialDirection { UI_RADIAL_SW = 5, UI_RADIAL_W = 6, UI_RADIAL_NW = 7, -} RadialDirection; +}; extern const char ui_radial_dir_order[8]; extern const char ui_radial_dir_to_numpad[8]; @@ -151,7 +151,7 @@ enum { #define PIE_MAX_ITEMS 8 struct uiBut { - struct uiBut *next, *prev; + uiBut *next, *prev; /** Pointer back to the layout item holding this button. */ uiLayout *layout; @@ -201,7 +201,7 @@ struct uiBut { uiButHandleNFunc funcN; void *func_argN; - struct bContextStore *context; + bContextStore *context; uiButCompleteFunc autocomplete_func; void *autofunc_arg; @@ -242,13 +242,13 @@ struct uiBut { uiMenuStepFunc menu_step_func; /* RNA data */ - struct PointerRNA rnapoin; - struct PropertyRNA *rnaprop; + PointerRNA rnapoin; + PropertyRNA *rnaprop; int rnaindex; /* Operator data */ - struct wmOperatorType *optype; - struct PointerRNA *opptr; + wmOperatorType *optype; + PointerRNA *opptr; wmOperatorCallContext opcontext; /** When non-zero, this is the key used to activate a menu items (`a-z` always lower case). */ @@ -260,11 +260,11 @@ struct uiBut { char dragtype; short dragflag; void *dragpoin; - struct ImBuf *imb; + ImBuf *imb; float imb_scale; /** Active button data (set when the user is hovering or interacting with a button). */ - struct uiHandleButtonData *active; + uiHandleButtonData *active; /** Custom button data (borrowed, not owned). */ void *custom_data; @@ -277,36 +277,36 @@ struct uiBut { const void *pushed_state_arg; /** Little indicator (e.g., counter) displayed on top of some icons. */ - struct IconTextOverlay icon_overlay_text; + IconTextOverlay icon_overlay_text; /* pointer back */ uiBlock *block; }; /** Derived struct for #UI_BTYPE_NUM */ -typedef struct uiButNumber { +struct uiButNumber { uiBut but; float step_size; float precision; -} uiButNumber; +}; /** Derived struct for #UI_BTYPE_COLOR */ -typedef struct uiButColor { +struct uiButColor { uiBut but; bool is_pallete_color; int palette_color_index; -} uiButColor; +}; /** Derived struct for #UI_BTYPE_TAB */ -typedef struct uiButTab { +struct uiButTab { uiBut but; struct MenuType *menu; -} uiButTab; +}; /** Derived struct for #UI_BTYPE_SEARCH_MENU */ -typedef struct uiButSearch { +struct uiButSearch { uiBut but; uiButSearchCreateFn popup_create_fn; @@ -323,90 +323,90 @@ typedef struct uiButSearch { const char *item_sep_string; - struct PointerRNA rnasearchpoin; - struct PropertyRNA *rnasearchprop; + PointerRNA rnasearchpoin; + PropertyRNA *rnasearchprop; /** * The search box only provides suggestions, it does not force * the string to match one of the search items when applying. */ bool results_are_suggestions; -} uiButSearch; +}; /** Derived struct for #UI_BTYPE_DECORATOR */ -typedef struct uiButDecorator { +struct uiButDecorator { uiBut but; struct PointerRNA rnapoin; struct PropertyRNA *rnaprop; int rnaindex; -} uiButDecorator; +}; /** Derived struct for #UI_BTYPE_PROGRESS_BAR. */ -typedef struct uiButProgressbar { +struct uiButProgressbar { uiBut but; /* 0..1 range */ float progress; -} uiButProgressbar; +}; -typedef struct uiButViewItem { +struct uiButViewItem { uiBut but; /* C-Handle to the view item this button was created for. */ uiViewItemHandle *view_item; -} uiButViewItem; +}; /** Derived struct for #UI_BTYPE_HSVCUBE. */ -typedef struct uiButHSVCube { +struct uiButHSVCube { uiBut but; eButGradientType gradient_type; -} uiButHSVCube; +}; /** Derived struct for #UI_BTYPE_COLORBAND. */ -typedef struct uiButColorBand { +struct uiButColorBand { uiBut but; - struct ColorBand *edit_coba; -} uiButColorBand; + ColorBand *edit_coba; +}; /** Derived struct for #UI_BTYPE_CURVEPROFILE. */ -typedef struct uiButCurveProfile { +struct uiButCurveProfile { uiBut but; struct CurveProfile *edit_profile; -} uiButCurveProfile; +}; /** Derived struct for #UI_BTYPE_CURVE. */ -typedef struct uiButCurveMapping { +struct uiButCurveMapping { uiBut but; struct CurveMapping *edit_cumap; eButGradientType gradient_type; -} uiButCurveMapping; +}; /** Derived struct for #UI_BTYPE_HOTKEY_EVENT. */ -typedef struct uiButHotkeyEvent { +struct uiButHotkeyEvent { uiBut but; short modifier_key; -} uiButHotkeyEvent; +}; /** * Additional, superimposed icon for a button, invoking an operator. */ -typedef struct uiButExtraOpIcon { - struct uiButExtraOpIcon *next, *prev; +struct uiButExtraOpIcon { + uiButExtraOpIcon *next, *prev; BIFIconID icon; - struct wmOperatorCallParams *optype_params; + wmOperatorCallParams *optype_params; bool highlighted; bool disabled; -} uiButExtraOpIcon; +}; -typedef struct ColorPicker { +struct ColorPicker { struct ColorPicker *next, *prev; /** Color in HSV or HSL, in color picking color space. Used for HSV cube, @@ -427,11 +427,11 @@ typedef struct ColorPicker { bool use_color_lock; bool use_luminosity_lock; float luminosity_lock_value; -} ColorPicker; +}; -typedef struct ColorPickerData { +struct ColorPickerData { ListBase list; -} ColorPickerData; +}; struct PieMenuData { /** store title and icon to allow access when pie levels are created */ @@ -462,32 +462,32 @@ enum eBlockContentHints { * labels (and even their decorators) are separate buttons, but they must be searched and * highlighted together. */ -typedef struct uiButtonGroup { +struct uiButtonGroup { void *next, *prev; ListBase buttons; /* #LinkData with #uiBut data field. */ short flag; -} uiButtonGroup; +}; /* #uiButtonGroup.flag. */ -typedef enum uiButtonGroupFlag { +enum uiButtonGroupFlag { /** While this flag is set, don't create new button groups for layout item calls. */ UI_BUTTON_GROUP_LOCK = (1 << 0), /** The buttons in this group are inside a panel header. */ UI_BUTTON_GROUP_PANEL_HEADER = (1 << 1), -} uiButtonGroupFlag; +}; ENUM_OPERATORS(uiButtonGroupFlag, UI_BUTTON_GROUP_PANEL_HEADER); -typedef struct uiBlockDynamicListener { +struct uiBlockDynamicListener { struct uiBlockDynamicListener *next, *prev; void (*listener_func)(const struct wmRegionListenerParams *params); -} uiBlockDynamicListener; +}; struct uiBlock { uiBlock *next, *prev; ListBase buttons; - struct Panel *panel; + Panel *panel; uiBlock *oldblock; /** Used for `UI_butstore_*` runtime function. */ @@ -496,7 +496,7 @@ struct uiBlock { ListBase button_groups; /* #uiButtonGroup. */ ListBase layouts; - struct uiLayout *curlayout; + uiLayout *curlayout; ListBase contexts; @@ -534,10 +534,10 @@ struct uiBlock { uiBlockInteraction_CallbackData custom_interaction_callbacks; /** Custom extra event handling. */ - int (*block_event_func)(const struct bContext *C, struct uiBlock *, const struct wmEvent *); + int (*block_event_func)(const bContext *C, uiBlock *, const wmEvent *); /** Custom extra draw function for custom blocks. */ - void (*drawextra)(const struct bContext *C, void *idv, void *arg1, void *arg2, rcti *rect); + void (*drawextra)(const bContext *C, void *idv, void *arg1, void *arg2, rcti *rect); void *drawextra_arg1; void *drawextra_arg2; @@ -583,14 +583,14 @@ struct uiBlock { /** use so presets can find the operator, * across menus and from nested popups which fail for operator context. */ - struct wmOperator *ui_operator; + wmOperator *ui_operator; /** XXX hack for dynamic operator enums */ void *evil_C; /** unit system, used a lot for numeric buttons so include here * rather than fetching through the scene every time. */ - struct UnitSettings *unit; + UnitSettings *unit; /** \note only accessed by color picker templates. */ ColorPickerData color_pickers; @@ -603,62 +603,49 @@ struct uiBlock { */ char display_device[64]; - struct PieMenuData pie_data; + PieMenuData pie_data; }; -typedef struct uiSafetyRct { - struct uiSafetyRct *next, *prev; +struct uiSafetyRct { + uiSafetyRct *next, *prev; rctf parent; rctf safety; -} uiSafetyRct; +}; /* interface.c */ void ui_fontscale(float *points, float aspect); -extern void ui_block_to_region_fl(const struct ARegion *region, - uiBlock *block, - float *r_x, - float *r_y); -extern void ui_block_to_window_fl(const struct ARegion *region, - uiBlock *block, - float *x, - float *y); -extern void ui_block_to_window(const struct ARegion *region, uiBlock *block, int *x, int *y); -extern void ui_block_to_region_rctf(const struct ARegion *region, - uiBlock *block, - rctf *rct_dst, - const rctf *rct_src); -extern void ui_block_to_window_rctf(const struct ARegion *region, - uiBlock *block, - rctf *rct_dst, - const rctf *rct_src); -extern float ui_block_to_window_scale(const struct ARegion *region, uiBlock *block); +void ui_block_to_region_fl(const ARegion *region, uiBlock *block, float *r_x, float *r_y); +void ui_block_to_window_fl(const ARegion *region, uiBlock *block, float *x, float *y); +void ui_block_to_window(const ARegion *region, uiBlock *block, int *x, int *y); +void ui_block_to_region_rctf(const ARegion *region, + uiBlock *block, + rctf *rct_dst, + const rctf *rct_src); +void ui_block_to_window_rctf(const ARegion *region, + uiBlock *block, + rctf *rct_dst, + const rctf *rct_src); +float ui_block_to_window_scale(const ARegion *region, uiBlock *block); /** * For mouse cursor. */ -extern void ui_window_to_block_fl(const struct ARegion *region, - uiBlock *block, - float *x, - float *y); -extern void ui_window_to_block(const struct ARegion *region, uiBlock *block, int *x, int *y); -extern void ui_window_to_block_rctf(const struct ARegion *region, - uiBlock *block, - rctf *rct_dst, - const rctf *rct_src); -extern void ui_window_to_region(const struct ARegion *region, int *x, int *y); -extern void ui_window_to_region_rcti(const struct ARegion *region, - rcti *rect_dst, - const rcti *rct_src); -extern void ui_window_to_region_rctf(const struct ARegion *region, - rctf *rect_dst, - const rctf *rct_src); -extern void ui_region_to_window(const struct ARegion *region, int *x, int *y); +void ui_window_to_block_fl(const ARegion *region, uiBlock *block, float *x, float *y); +void ui_window_to_block(const ARegion *region, uiBlock *block, int *x, int *y); +void ui_window_to_block_rctf(const ARegion *region, + uiBlock *block, + rctf *rct_dst, + const rctf *rct_src); +void ui_window_to_region(const ARegion *region, int *x, int *y); +void ui_window_to_region_rcti(const ARegion *region, rcti *rect_dst, const rcti *rct_src); +void ui_window_to_region_rctf(const ARegion *region, rctf *rect_dst, const rctf *rct_src); +void ui_region_to_window(const ARegion *region, int *x, int *y); /** * Popups will add a margin to #ARegion.winrct for shadow, * for interactivity (point-inside tests for eg), we want the winrct without the margin added. */ -extern void ui_region_winrct_get_no_margin(const struct ARegion *region, struct rcti *r_rect); +void ui_region_winrct_get_no_margin(const ARegion *region, rcti *r_rect); /** * Reallocate the button (new address is returned) for a new button type. @@ -669,30 +656,30 @@ extern void ui_region_winrct_get_no_margin(const struct ARegion *region, struct */ uiBut *ui_but_change_type(uiBut *but, eButType new_type); -extern double ui_but_value_get(uiBut *but); -extern void ui_but_value_set(uiBut *but, double value); +double ui_but_value_get(uiBut *but); +void ui_but_value_set(uiBut *but, double value); /** * For picker, while editing HSV. */ -extern void ui_but_hsv_set(uiBut *but); +void ui_but_hsv_set(uiBut *but); /** * For buttons pointing to color for example. */ -extern void ui_but_v3_get(uiBut *but, float vec[3]); +void ui_but_v3_get(uiBut *but, float vec[3]); /** * For buttons pointing to color for example. */ -extern void ui_but_v3_set(uiBut *but, const float vec[3]); +void ui_but_v3_set(uiBut *but, const float vec[3]); -extern void ui_hsvcircle_vals_from_pos( +void ui_hsvcircle_vals_from_pos( const rcti *rect, float mx, float my, float *r_val_rad, float *r_val_dist); /** * Cursor in HSV circle, in float units -1 to 1, to map on radius. */ -extern void ui_hsvcircle_pos_from_vals( +void ui_hsvcircle_pos_from_vals( const ColorPicker *cpicker, const rcti *rect, const float *hsv, float *xpos, float *ypos); -extern void ui_hsvcube_pos_from_vals( - const struct uiButHSVCube *hsv_but, const rcti *rect, const float *hsv, float *xp, float *yp); +void ui_hsvcube_pos_from_vals( + const uiButHSVCube *hsv_but, const rcti *rect, const float *hsv, float *xp, float *yp); /** * \param float_precision: For number buttons the precision @@ -700,41 +687,39 @@ extern void ui_hsvcube_pos_from_vals( * \param use_exp_float: Use exponent representation of floats * when out of reasonable range (outside of 1e3/1e-3). */ -extern void ui_but_string_get_ex(uiBut *but, - char *str, - size_t maxlen, - int float_precision, - bool use_exp_float, - bool *r_use_exp_float) ATTR_NONNULL(1, 2); -extern void ui_but_string_get(uiBut *but, char *str, size_t maxlen) ATTR_NONNULL(); +void ui_but_string_get_ex(uiBut *but, + char *str, + size_t maxlen, + int float_precision, + bool use_exp_float, + bool *r_use_exp_float) ATTR_NONNULL(1, 2); +void ui_but_string_get(uiBut *but, char *str, size_t maxlen) ATTR_NONNULL(); /** * A version of #ui_but_string_get_ex for dynamic buffer sizes * (where #ui_but_string_get_max_length returns 0). * * \param r_str_size: size of the returned string (including terminator). */ -extern char *ui_but_string_get_dynamic(uiBut *but, int *r_str_size); +char *ui_but_string_get_dynamic(uiBut *but, int *r_str_size); /** * \param str: will be overwritten. */ -extern void ui_but_convert_to_unit_alt_name(uiBut *but, char *str, size_t maxlen) ATTR_NONNULL(); -extern bool ui_but_string_set(struct bContext *C, uiBut *but, const char *str) ATTR_NONNULL(); -extern bool ui_but_string_eval_number(struct bContext *C, - const uiBut *but, - const char *str, - double *value) ATTR_NONNULL(); -extern int ui_but_string_get_max_length(uiBut *but); +void ui_but_convert_to_unit_alt_name(uiBut *but, char *str, size_t maxlen) ATTR_NONNULL(); +bool ui_but_string_set(bContext *C, uiBut *but, const char *str) ATTR_NONNULL(); +bool ui_but_string_eval_number(bContext *C, const uiBut *but, const char *str, double *value) + ATTR_NONNULL(); +int ui_but_string_get_max_length(uiBut *but); /** * Clear & exit the active button's string.. */ -extern void ui_but_active_string_clear_and_exit(struct bContext *C, uiBut *but) ATTR_NONNULL(); +void ui_but_active_string_clear_and_exit(bContext *C, uiBut *but) ATTR_NONNULL(); /** * Use handling code to set a string for the button. Handles the case where the string is set for a * search button while the search menu is open, so the results are updated accordingly. * This is basically the same as pasting the string into the button. */ -extern void ui_but_set_string_interactive(struct bContext *C, uiBut *but, const char *value); -extern uiBut *ui_but_drag_multi_edit_get(uiBut *but); +void ui_but_set_string_interactive(bContext *C, uiBut *but, const char *value); +uiBut *ui_but_drag_multi_edit_get(uiBut *but); void ui_def_but_icon(uiBut *but, int icon, int flag); /** @@ -744,52 +729,52 @@ void ui_def_but_icon_clear(uiBut *but); void ui_but_extra_operator_icons_free(uiBut *but); -extern void ui_but_rna_menu_convert_to_panel_type(struct uiBut *but, const char *panel_type); -extern void ui_but_rna_menu_convert_to_menu_type(struct uiBut *but, const char *menu_type); -extern bool ui_but_menu_draw_as_popover(const uiBut *but); +void ui_but_rna_menu_convert_to_panel_type(uiBut *but, const char *panel_type); +void ui_but_rna_menu_convert_to_menu_type(uiBut *but, const char *menu_type); +bool ui_but_menu_draw_as_popover(const uiBut *but); void ui_but_range_set_hard(uiBut *but); void ui_but_range_set_soft(uiBut *but); -bool ui_but_context_poll_operator(struct bContext *C, struct wmOperatorType *ot, const uiBut *but); +bool ui_but_context_poll_operator(bContext *C, wmOperatorType *ot, const uiBut *but); /** * Check if the operator \a ot poll is successful with the context given by \a but (optionally). * \param but: The button that might store context. Can be NULL for convenience (e.g. if there is * no button to take context from, but we still want to poll the operator). */ -bool ui_but_context_poll_operator_ex(struct bContext *C, +bool ui_but_context_poll_operator_ex(bContext *C, const uiBut *but, - const struct wmOperatorCallParams *optype_params); + const wmOperatorCallParams *optype_params); -extern void ui_but_update(uiBut *but); -extern void ui_but_update_edited(uiBut *but); -extern PropertyScaleType ui_but_scale_type(const uiBut *but) ATTR_WARN_UNUSED_RESULT; -extern bool ui_but_is_float(const uiBut *but) ATTR_WARN_UNUSED_RESULT; -extern bool ui_but_is_bool(const uiBut *but) ATTR_WARN_UNUSED_RESULT; -extern bool ui_but_is_unit(const uiBut *but) ATTR_WARN_UNUSED_RESULT; +void ui_but_update(uiBut *but); +void ui_but_update_edited(uiBut *but); +PropertyScaleType ui_but_scale_type(const uiBut *but) ATTR_WARN_UNUSED_RESULT; +bool ui_but_is_float(const uiBut *but) ATTR_WARN_UNUSED_RESULT; +bool ui_but_is_bool(const uiBut *but) ATTR_WARN_UNUSED_RESULT; +bool ui_but_is_unit(const uiBut *but) ATTR_WARN_UNUSED_RESULT; /** * Check if this button is similar enough to be grouped with another. */ -extern bool ui_but_is_compatible(const uiBut *but_a, const uiBut *but_b) ATTR_WARN_UNUSED_RESULT; -extern bool ui_but_is_rna_valid(uiBut *but) ATTR_WARN_UNUSED_RESULT; +bool ui_but_is_compatible(const uiBut *but_a, const uiBut *but_b) ATTR_WARN_UNUSED_RESULT; +bool ui_but_is_rna_valid(uiBut *but) ATTR_WARN_UNUSED_RESULT; /** * Checks if the button supports cycling next/previous menu items (ctrl+mouse-wheel). */ -extern bool ui_but_supports_cycling(const uiBut *but) ATTR_WARN_UNUSED_RESULT; +bool ui_but_supports_cycling(const uiBut *but) ATTR_WARN_UNUSED_RESULT; /** * Check if the button is pushed, this is only meaningful for some button types. * * \return (0 == UNSELECT), (1 == SELECT), (-1 == DO-NOTHING) */ -extern int ui_but_is_pushed_ex(uiBut *but, double *value) ATTR_WARN_UNUSED_RESULT; -extern int ui_but_is_pushed(uiBut *but) ATTR_WARN_UNUSED_RESULT; +int ui_but_is_pushed_ex(uiBut *but, double *value) ATTR_WARN_UNUSED_RESULT; +int ui_but_is_pushed(uiBut *but) ATTR_WARN_UNUSED_RESULT; -void ui_but_override_flag(struct Main *bmain, uiBut *but); +void ui_but_override_flag(Main *bmain, uiBut *but); -extern void ui_block_bounds_calc(uiBlock *block); +void ui_block_bounds_calc(uiBlock *block); -extern struct ColorManagedDisplay *ui_block_cm_display_get(uiBlock *block); +ColorManagedDisplay *ui_block_cm_display_get(uiBlock *block); void ui_block_cm_to_display_space_v3(uiBlock *block, float pixel[3]); /* interface_regions.c */ @@ -801,9 +786,7 @@ struct uiKeyNavLock { int event_xy[2]; }; -typedef uiBlock *(*uiBlockHandleCreateFunc)(struct bContext *C, - struct uiPopupBlockHandle *handle, - void *arg1); +using uiBlockHandleCreateFunc = uiBlock *(*)(bContext *C, uiPopupBlockHandle *handle, void *arg1); struct uiPopupBlockCreate { uiBlockCreateFunc create_func; @@ -814,13 +797,13 @@ struct uiPopupBlockCreate { int event_xy[2]; /** Set when popup is initialized from a button. */ - struct ARegion *butregion; + ARegion *butregion; uiBut *but; }; struct uiPopupBlockHandle { /* internal */ - struct ARegion *region; + ARegion *region; /** Use only for #UI_BLOCK_MOVEMOUSE_QUIT popups. */ float towards_xy[2]; @@ -828,25 +811,25 @@ struct uiPopupBlockHandle { bool dotowards; bool popup; - void (*popup_func)(struct bContext *C, void *arg, int event); - void (*cancel_func)(struct bContext *C, void *arg); + void (*popup_func)(bContext *C, void *arg, int event); + void (*cancel_func)(bContext *C, void *arg); void *popup_arg; /** Store data for refreshing popups. */ - struct uiPopupBlockCreate popup_create_vars; + uiPopupBlockCreate popup_create_vars; /** True if we can re-create the popup using #uiPopupBlockHandle.popup_create_vars. */ bool can_refresh; bool refresh; - struct wmTimer *scrolltimer; + wmTimer *scrolltimer; float scrolloffset; - struct uiKeyNavLock keynav_state; + uiKeyNavLock keynav_state; /* for operator popups */ - struct wmOperator *popup_op; - struct ScrArea *ctx_area; - struct ARegion *ctx_region; + wmOperator *popup_op; + ScrArea *ctx_area; + ARegion *ctx_region; /* return values */ int butretval; @@ -894,44 +877,35 @@ bool ui_but_is_color_gamma(uiBut *but); void ui_scene_linear_to_perceptual_space(uiBut *but, float rgb[3]); void ui_perceptual_to_scene_linear_space(uiBut *but, float rgb[3]); -uiBlock *ui_block_func_COLOR(struct bContext *C, uiPopupBlockHandle *handle, void *arg_but); -ColorPicker *ui_block_colorpicker_create(struct uiBlock *block); +uiBlock *ui_block_func_COLOR(bContext *C, uiPopupBlockHandle *handle, void *arg_but); +ColorPicker *ui_block_colorpicker_create(uiBlock *block); /* interface_region_search.c */ /** * Search-box for string button. */ -struct ARegion *ui_searchbox_create_generic(struct bContext *C, - struct ARegion *butregion, - uiButSearch *search_but); -struct ARegion *ui_searchbox_create_operator(struct bContext *C, - struct ARegion *butregion, - uiButSearch *search_but); -struct ARegion *ui_searchbox_create_menu(struct bContext *C, - struct ARegion *butregion, - uiButSearch *search_but); +ARegion *ui_searchbox_create_generic(bContext *C, ARegion *butregion, uiButSearch *search_but); +ARegion *ui_searchbox_create_operator(bContext *C, ARegion *butregion, uiButSearch *search_but); +ARegion *ui_searchbox_create_menu(bContext *C, ARegion *butregion, uiButSearch *search_but); /** * x and y in screen-coords. */ -bool ui_searchbox_inside(struct ARegion *region, const int xy[2]) ATTR_NONNULL(1, 2); -int ui_searchbox_find_index(struct ARegion *region, const char *name); +bool ui_searchbox_inside(ARegion *region, const int xy[2]) ATTR_NONNULL(1, 2); +int ui_searchbox_find_index(ARegion *region, const char *name); /** * Region is the search box itself. */ -void ui_searchbox_update(struct bContext *C, struct ARegion *region, uiBut *but, bool reset); -int ui_searchbox_autocomplete(struct bContext *C, struct ARegion *region, uiBut *but, char *str); -bool ui_searchbox_event(struct bContext *C, - struct ARegion *region, - uiBut *but, - struct ARegion *butregion, - const struct wmEvent *event); +void ui_searchbox_update(bContext *C, ARegion *region, uiBut *but, bool reset); +int ui_searchbox_autocomplete(bContext *C, ARegion *region, uiBut *but, char *str); +bool ui_searchbox_event( + bContext *C, ARegion *region, uiBut *but, ARegion *butregion, const wmEvent *event); /** * String validated to be of correct length (but->hardmax). */ -bool ui_searchbox_apply(uiBut *but, struct ARegion *region); -void ui_searchbox_free(struct bContext *C, struct ARegion *region); +bool ui_searchbox_apply(uiBut *but, ARegion *region); +void ui_searchbox_free(bContext *C, ARegion *region); /** * XXX weak: search_func adds all partial matches. */ @@ -941,37 +915,31 @@ void ui_but_search_refresh(uiButSearch *but); int ui_but_menu_step(uiBut *but, int direction); bool ui_but_menu_step_poll(const uiBut *but); -uiBut *ui_popup_menu_memory_get(struct uiBlock *block); -void ui_popup_menu_memory_set(uiBlock *block, struct uiBut *but); +uiBut *ui_popup_menu_memory_get(uiBlock *block); +void ui_popup_menu_memory_set(uiBlock *block, uiBut *but); /** * Called for creating new popups and refreshing existing ones. */ -uiBlock *ui_popup_block_refresh(struct bContext *C, +uiBlock *ui_popup_block_refresh(bContext *C, uiPopupBlockHandle *handle, - struct ARegion *butregion, + ARegion *butregion, uiBut *but); -uiPopupBlockHandle *ui_popup_block_create(struct bContext *C, - struct ARegion *butregion, +uiPopupBlockHandle *ui_popup_block_create(bContext *C, + ARegion *butregion, uiBut *but, uiBlockCreateFunc create_func, uiBlockHandleCreateFunc handle_create_func, void *arg, uiFreeArgFunc arg_free); -uiPopupBlockHandle *ui_popup_menu_create(struct bContext *C, - struct ARegion *butregion, - uiBut *but, - uiMenuCreateFunc menu_func, - void *arg); +uiPopupBlockHandle *ui_popup_menu_create( + bContext *C, ARegion *butregion, uiBut *but, uiMenuCreateFunc menu_func, void *arg); /* interface_region_popover.c */ -uiPopupBlockHandle *ui_popover_panel_create(struct bContext *C, - struct ARegion *butregion, - uiBut *but, - uiMenuCreateFunc menu_func, - void *arg); +uiPopupBlockHandle *ui_popover_panel_create( + bContext *C, ARegion *butregion, uiBut *but, uiMenuCreateFunc menu_func, void *arg); /* interface_region_menu_pie.c */ @@ -979,9 +947,9 @@ uiPopupBlockHandle *ui_popover_panel_create(struct bContext *C, * Set up data for defining a new pie menu level and add button that invokes it. */ void ui_pie_menu_level_create(uiBlock *block, - struct wmOperatorType *ot, + wmOperatorType *ot, const char *propname, - struct IDProperty *properties, + IDProperty *properties, const EnumPropertyItem *items, int totitem, wmOperatorCallContext context, @@ -992,9 +960,9 @@ void ui_pie_menu_level_create(uiBlock *block, /** * Translate any popup regions (so we can drag them). */ -void ui_popup_translate(struct ARegion *region, const int mdiff[2]); -void ui_popup_block_free(struct bContext *C, uiPopupBlockHandle *handle); -void ui_popup_block_scrolltest(struct uiBlock *block); +void ui_popup_translate(ARegion *region, const int mdiff[2]); +void ui_popup_block_free(bContext *C, uiPopupBlockHandle *handle); +void ui_popup_block_scrolltest(uiBlock *block); /* end interface_region_*.c */ @@ -1005,25 +973,24 @@ void ui_popup_block_scrolltest(struct uiBlock *block); * * \note Could become a modal key-map. */ -extern int ui_handler_panel_region(struct bContext *C, - const struct wmEvent *event, - struct ARegion *region, - const uiBut *active_but); +int ui_handler_panel_region(bContext *C, + const wmEvent *event, + ARegion *region, + const uiBut *active_but); /** * Draw a panel integrated in buttons-window, tool/property lists etc. */ -extern void ui_draw_aligned_panel(const struct uiStyle *style, - const uiBlock *block, - const rcti *rect, - bool show_pin, - bool show_background, - bool region_search_filter_active); -void ui_panel_tag_search_filter_match(struct Panel *panel); +void ui_draw_aligned_panel(const uiStyle *style, + const uiBlock *block, + const rcti *rect, + bool show_pin, + bool show_background, + bool region_search_filter_active); +void ui_panel_tag_search_filter_match(Panel *panel); /* interface_draw.cc */ -extern void ui_draw_dropshadow( - const rctf *rct, float radius, float aspect, float alpha, int select); +void ui_draw_dropshadow(const rctf *rct, float radius, float aspect, float alpha, int select); /** * Draws in resolution of 48x4 colors. @@ -1036,41 +1003,32 @@ void ui_draw_but_TAB_outline(const rcti *rect, float rad, uchar highlight[3], uchar highlight_fade[3]); -void ui_draw_but_HISTOGRAM(struct ARegion *region, +void ui_draw_but_HISTOGRAM(ARegion *region, uiBut *but, - const struct uiWidgetColors *wcol, + const uiWidgetColors *wcol, const rcti *rect); -void ui_draw_but_WAVEFORM(struct ARegion *region, +void ui_draw_but_WAVEFORM(ARegion *region, uiBut *but, - const struct uiWidgetColors *wcol, + const uiWidgetColors *wcol, const rcti *rect); -void ui_draw_but_VECTORSCOPE(struct ARegion *region, +void ui_draw_but_VECTORSCOPE(ARegion *region, uiBut *but, - const struct uiWidgetColors *wcol, + const uiWidgetColors *wcol, const rcti *rect); -void ui_draw_but_COLORBAND(uiBut *but, const struct uiWidgetColors *wcol, const rcti *rect); -void ui_draw_but_UNITVEC(uiBut *but, - const struct uiWidgetColors *wcol, - const rcti *rect, - float radius); -void ui_draw_but_CURVE(struct ARegion *region, - uiBut *but, - const struct uiWidgetColors *wcol, - const rcti *rect); +void ui_draw_but_COLORBAND(uiBut *but, const uiWidgetColors *wcol, const rcti *rect); +void ui_draw_but_UNITVEC(uiBut *but, const uiWidgetColors *wcol, const rcti *rect, float radius); +void ui_draw_but_CURVE(ARegion *region, uiBut *but, const uiWidgetColors *wcol, const rcti *rect); /** * Draws the curve profile widget. Somewhat similar to ui_draw_but_CURVE. */ -void ui_draw_but_CURVEPROFILE(struct ARegion *region, +void ui_draw_but_CURVEPROFILE(ARegion *region, uiBut *but, - const struct uiWidgetColors *wcol, + const uiWidgetColors *wcol, const rcti *rect); -void ui_draw_but_IMAGE(struct ARegion *region, - uiBut *but, - const struct uiWidgetColors *wcol, - const rcti *rect); -void ui_draw_but_TRACKPREVIEW(struct ARegion *region, +void ui_draw_but_IMAGE(ARegion *region, uiBut *but, const uiWidgetColors *wcol, const rcti *rect); +void ui_draw_but_TRACKPREVIEW(ARegion *region, uiBut *but, - const struct uiWidgetColors *wcol, + const uiWidgetColors *wcol, const rcti *rect); /* interface_undo.c */ @@ -1080,71 +1038,60 @@ void ui_draw_but_TRACKPREVIEW(struct ARegion *region, * * \note The current state should be pushed immediately after calling this. */ -struct uiUndoStack_Text *ui_textedit_undo_stack_create(void); -void ui_textedit_undo_stack_destroy(struct uiUndoStack_Text *undo_stack); +uiUndoStack_Text *ui_textedit_undo_stack_create(); +void ui_textedit_undo_stack_destroy(uiUndoStack_Text *undo_stack); /** * Push the information in the arguments to a new state in the undo stack. * * \note Currently the total length of the undo stack is not limited. */ -void ui_textedit_undo_push(struct uiUndoStack_Text *undo_stack, - const char *text, - int cursor_index); -const char *ui_textedit_undo(struct uiUndoStack_Text *undo_stack, - int direction, - int *r_cursor_index); +void ui_textedit_undo_push(uiUndoStack_Text *undo_stack, const char *text, int cursor_index); +const char *ui_textedit_undo(uiUndoStack_Text *undo_stack, int direction, int *r_cursor_index); /* interface_handlers.cc */ -extern void ui_handle_afterfunc_add_operator(struct wmOperatorType *ot, - wmOperatorCallContext opcontext); +void ui_handle_afterfunc_add_operator(wmOperatorType *ot, wmOperatorCallContext opcontext); /** * Assumes event type is MOUSEPAN. */ -extern void ui_pan_to_scroll(const struct wmEvent *event, int *type, int *val); +void ui_pan_to_scroll(const wmEvent *event, int *type, int *val); /** * Exported to interface.c: #UI_but_active_only() * \note The region is only for the button. * The context needs to be set by the caller. */ -extern void ui_but_activate_event(struct bContext *C, struct ARegion *region, uiBut *but); +void ui_but_activate_event(bContext *C, ARegion *region, uiBut *but); /** * Simulate moving the mouse over a button (or navigating to it with arrow keys). * * exported so menus can start with a highlighted button, * even if the mouse isn't over it */ -extern void ui_but_activate_over(struct bContext *C, struct ARegion *region, uiBut *but); -extern void ui_but_execute_begin(struct bContext *C, - struct ARegion *region, - uiBut *but, - void **active_back); -extern void ui_but_execute_end(struct bContext *C, - struct ARegion *region, - uiBut *but, - void *active_back); -extern void ui_but_active_free(const struct bContext *C, uiBut *but); +void ui_but_activate_over(bContext *C, ARegion *region, uiBut *but); +void ui_but_execute_begin(bContext *C, ARegion *region, uiBut *but, void **active_back); +void ui_but_execute_end(bContext *C, ARegion *region, uiBut *but, void *active_back); +void ui_but_active_free(const bContext *C, uiBut *but); /** * In some cases we may want to update the view (#View2D) in-between layout definition and drawing. * E.g. to make sure a button is visible while editing. */ -extern void ui_but_update_view_for_active(const struct bContext *C, const uiBlock *block); -extern int ui_but_menu_direction(uiBut *but); -extern void ui_but_text_password_hide(char password_str[128], uiBut *but, bool restore); +void ui_but_update_view_for_active(const bContext *C, const uiBlock *block); +int ui_but_menu_direction(uiBut *but); +void ui_but_text_password_hide(char password_str[128], uiBut *but, bool restore); /** * Finds the pressed button in an aligned row (typically an expanded enum). * * \param direction: Use when there may be multiple buttons pressed. */ -extern uiBut *ui_but_find_select_in_enum(uiBut *but, int direction); +uiBut *ui_but_find_select_in_enum(uiBut *but, int direction); bool ui_but_is_editing(const uiBut *but); -float ui_block_calc_pie_segment(struct uiBlock *block, const float event_xy[2]); +float ui_block_calc_pie_segment(uiBlock *block, const float event_xy[2]); /* XXX, this code will shorten any allocated string to 'UI_MAX_NAME_STR' * since this is really long its unlikely to be an issue, * but this could be supported */ void ui_but_add_shortcut(uiBut *but, const char *shortcut_str, bool do_strip); -void ui_but_clipboard_free(void); +void ui_but_clipboard_free(); bool ui_but_rna_equals(const uiBut *a, const uiBut *b); bool ui_but_rna_equals_ex(const uiBut *but, const PointerRNA *ptr, @@ -1155,13 +1102,13 @@ uiBut *ui_but_find_new(uiBlock *block_new, const uiBut *but_old); #ifdef WITH_INPUT_IME void ui_but_ime_reposition(uiBut *but, int x, int y, bool complete); -struct wmIMEData *ui_but_ime_data_get(uiBut *but); +wmIMEData *ui_but_ime_data_get(uiBut *but); #endif /* interface_widgets.cc */ /* Widget shader parameters, must match the shader layout. */ -typedef struct uiWidgetBaseParameters { +struct uiWidgetBaseParameters { rctf recti, rect; float radi, rad; float facxi, facyi; @@ -1179,7 +1126,7 @@ typedef struct uiWidgetBaseParameters { float alpha_discard; float tria_type; float _pad[3]; -} uiWidgetBaseParameters; +}; enum { ROUNDBOX_TRIA_NONE = 0, @@ -1192,36 +1139,29 @@ enum { ROUNDBOX_TRIA_MAX, /* don't use */ }; -struct GPUBatch *ui_batch_roundbox_widget_get(void); -struct GPUBatch *ui_batch_roundbox_shadow_get(void); +GPUBatch *ui_batch_roundbox_widget_get(); +GPUBatch *ui_batch_roundbox_shadow_get(); -void ui_draw_menu_back(struct uiStyle *style, uiBlock *block, rcti *rect); -void ui_draw_popover_back(struct ARegion *region, - struct uiStyle *style, - uiBlock *block, - rcti *rect); +void ui_draw_menu_back(uiStyle *style, uiBlock *block, rcti *rect); +void ui_draw_popover_back(ARegion *region, uiStyle *style, uiBlock *block, rcti *rect); void ui_draw_pie_center(uiBlock *block); -const struct uiWidgetColors *ui_tooltip_get_theme(void); +const uiWidgetColors *ui_tooltip_get_theme(); void ui_draw_widget_menu_back_color(const rcti *rect, bool use_shadow, const float color[4]); void ui_draw_widget_menu_back(const rcti *rect, bool use_shadow); -void ui_draw_tooltip_background(const struct uiStyle *style, uiBlock *block, rcti *rect); +void ui_draw_tooltip_background(const uiStyle *style, uiBlock *block, rcti *rect); /** * Conversion from old to new buttons, so still messy. */ -extern void ui_draw_but(const struct bContext *C, - struct ARegion *region, - struct uiStyle *style, - uiBut *but, - rcti *rect); +void ui_draw_but(const bContext *C, ARegion *region, uiStyle *style, uiBut *but, rcti *rect); /** * Info about what the separator character separates, used to decide between different drawing * styles. E.g. we never want a shortcut string to be clipped, but other hint strings can be * clipped. */ -typedef enum { +enum uiMenuItemSeparatorType { UI_MENU_ITEM_SEPARATOR_NONE, /** Separator is used to indicate shortcut string of this item. Shortcut string will not get * clipped. */ @@ -1229,7 +1169,7 @@ typedef enum { /** Separator is used to indicate some additional hint to display for this item. Hint string will * get clipped before the normal text. */ UI_MENU_ITEM_SEPARATOR_HINT, -} uiMenuItemSeparatorType; +}; /** * Helper call to draw a menu item without a button. * @@ -1239,14 +1179,14 @@ typedef enum { * \param r_xmax: The right hand position of the text, this takes into the icon, padding and text * clipping when there is not enough room to display the full text. */ -void ui_draw_menu_item(const struct uiFontStyle *fstyle, +void ui_draw_menu_item(const uiFontStyle *fstyle, rcti *rect, const char *name, int iconid, int but_flag, uiMenuItemSeparatorType separator_type, int *r_xmax); -void ui_draw_preview_item(const struct uiFontStyle *fstyle, +void ui_draw_preview_item(const uiFontStyle *fstyle, rcti *rect, const char *name, int iconid, @@ -1256,7 +1196,7 @@ void ui_draw_preview_item(const struct uiFontStyle *fstyle, * Version of #ui_draw_preview_item() that does not draw the menu background and item text based on * state. It just draws the preview and text directly. */ -void ui_draw_preview_item_stateless(const struct uiFontStyle *fstyle, +void ui_draw_preview_item_stateless(const uiFontStyle *fstyle, rcti *rect, const char *name, int iconid, @@ -1280,12 +1220,12 @@ extern const float ui_pixel_jitter[UI_PIXEL_AA_JITTER][2]; * Called on each startup.blend read, * reading without #uiFont will create one. */ -void uiStyleInit(void); +void uiStyleInit(); /* interface_icons.cc */ -void ui_icon_ensure_deferred(const struct bContext *C, int icon_id, bool big); -int ui_id_icon_get(const struct bContext *C, struct ID *id, bool big); +void ui_icon_ensure_deferred(const bContext *C, int icon_id, bool big); +int ui_id_icon_get(const bContext *C, ID *id, bool big); /* interface_icons_event.cc */ @@ -1294,8 +1234,8 @@ void icon_draw_rect_input( /* resources.cc */ -void ui_resources_init(void); -void ui_resources_free(void); +void ui_resources_init(); +void ui_resources_free(); /* interface_layout.cc */ @@ -1322,8 +1262,8 @@ uiBut *ui_but_add_search(uiBut *but, */ void ui_layout_list_set_labels_active(uiLayout *layout); /* menu callback */ -void ui_item_menutype_func(struct bContext *C, struct uiLayout *layout, void *arg_mt); -void ui_item_paneltype_func(struct bContext *C, struct uiLayout *layout, void *arg_pt); +void ui_item_menutype_func(bContext *C, uiLayout *layout, void *arg_mt); +void ui_item_paneltype_func(bContext *C, uiLayout *layout, void *arg_pt); /* interface_button_group.cc */ @@ -1340,12 +1280,12 @@ void ui_block_free_button_groups(uiBlock *block); void ui_but_drag_free(uiBut *but); bool ui_but_drag_is_draggable(const uiBut *but); -void ui_but_drag_start(struct bContext *C, uiBut *but); +void ui_but_drag_start(bContext *C, uiBut *but); /* interface_align.cc */ bool ui_but_can_align(const uiBut *but) ATTR_WARN_UNUSED_RESULT; -int ui_but_align_opposite_to_area_align_get(const struct ARegion *region) ATTR_WARN_UNUSED_RESULT; +int ui_but_align_opposite_to_area_align_get(const ARegion *region) ATTR_WARN_UNUSED_RESULT; /** * Compute the alignment of all 'align groups' of buttons in given block. * @@ -1353,13 +1293,13 @@ int ui_but_align_opposite_to_area_align_get(const struct ARegion *region) ATTR_W * i.e. alignment of buttons should be OK regardless of order in which * they are added to the block. */ -void ui_block_align_calc(uiBlock *block, const struct ARegion *region); +void ui_block_align_calc(uiBlock *block, const ARegion *region); /* interface_anim.c */ -void ui_but_anim_flag(uiBut *but, const struct AnimationEvalContext *anim_eval_context); -void ui_but_anim_copy_driver(struct bContext *C); -void ui_but_anim_paste_driver(struct bContext *C); +void ui_but_anim_flag(uiBut *but, const AnimationEvalContext *anim_eval_context); +void ui_but_anim_copy_driver(bContext *C); +void ui_but_anim_paste_driver(bContext *C); /** * \a str can be NULL to only perform check if \a but has an expression at all. * \return if button has an expression. @@ -1370,9 +1310,9 @@ bool ui_but_anim_expression_set(uiBut *but, const char *str); * Create new expression for button (i.e. a "scripted driver"), if it can be created. */ bool ui_but_anim_expression_create(uiBut *but, const char *str); -void ui_but_anim_autokey(struct bContext *C, uiBut *but, struct Scene *scene, float cfra); +void ui_but_anim_autokey(bContext *C, uiBut *but, Scene *scene, float cfra); -void ui_but_anim_decorate_cb(struct bContext *C, void *arg_but, void *arg_dummy); +void ui_but_anim_decorate_cb(bContext *C, void *arg_but, void *arg_dummy); void ui_but_anim_decorate_update_from_flag(uiButDecorator *but); /* interface_query.c */ @@ -1397,41 +1337,37 @@ bool ui_but_is_cursor_warp(const uiBut *but) ATTR_WARN_UNUSED_RESULT; bool ui_but_contains_pt(const uiBut *but, float mx, float my) ATTR_WARN_UNUSED_RESULT; bool ui_but_contains_rect(const uiBut *but, const rctf *rect); bool ui_but_contains_point_px_icon(const uiBut *but, - struct ARegion *region, - const struct wmEvent *event) ATTR_WARN_UNUSED_RESULT; -bool ui_but_contains_point_px(const uiBut *but, const struct ARegion *region, const int xy[2]) + ARegion *region, + const wmEvent *event) ATTR_WARN_UNUSED_RESULT; +bool ui_but_contains_point_px(const uiBut *but, const ARegion *region, const int xy[2]) ATTR_NONNULL(1, 2, 3) ATTR_WARN_UNUSED_RESULT; -uiBut *ui_list_find_mouse_over(const struct ARegion *region, - const struct wmEvent *event) ATTR_WARN_UNUSED_RESULT; -uiBut *ui_list_find_from_row(const struct ARegion *region, - const uiBut *row_but) ATTR_WARN_UNUSED_RESULT; -uiBut *ui_list_row_find_mouse_over(const struct ARegion *region, const int xy[2]) +uiBut *ui_list_find_mouse_over(const ARegion *region, + const wmEvent *event) ATTR_WARN_UNUSED_RESULT; +uiBut *ui_list_find_from_row(const ARegion *region, const uiBut *row_but) ATTR_WARN_UNUSED_RESULT; +uiBut *ui_list_row_find_mouse_over(const ARegion *region, const int xy[2]) ATTR_NONNULL(1, 2) ATTR_WARN_UNUSED_RESULT; -uiBut *ui_list_row_find_from_index(const struct ARegion *region, +uiBut *ui_list_row_find_from_index(const ARegion *region, int index, uiBut *listbox) ATTR_WARN_UNUSED_RESULT; -uiBut *ui_view_item_find_mouse_over(const struct ARegion *region, const int xy[2]) - ATTR_NONNULL(1, 2); -uiBut *ui_view_item_find_active(const struct ARegion *region); +uiBut *ui_view_item_find_mouse_over(const ARegion *region, const int xy[2]) ATTR_NONNULL(1, 2); +uiBut *ui_view_item_find_active(const ARegion *region); -typedef bool (*uiButFindPollFn)(const uiBut *but, const void *customdata); +using uiButFindPollFn = bool (*)(const uiBut *but, const void *customdata); /** * x and y are only used in case event is NULL. */ -uiBut *ui_but_find_mouse_over_ex(const struct ARegion *region, +uiBut *ui_but_find_mouse_over_ex(const ARegion *region, const int xy[2], bool labeledit, bool for_tooltip, const uiButFindPollFn find_poll, const void *find_custom_data) ATTR_NONNULL(1, 2) ATTR_WARN_UNUSED_RESULT; -uiBut *ui_but_find_mouse_over(const struct ARegion *region, - const struct wmEvent *event) ATTR_WARN_UNUSED_RESULT; -uiBut *ui_but_find_rect_over(const struct ARegion *region, - const rcti *rect_px) ATTR_WARN_UNUSED_RESULT; +uiBut *ui_but_find_mouse_over(const ARegion *region, const wmEvent *event) ATTR_WARN_UNUSED_RESULT; +uiBut *ui_but_find_rect_over(const ARegion *region, const rcti *rect_px) ATTR_WARN_UNUSED_RESULT; -uiBut *ui_list_find_mouse_over_ex(const struct ARegion *region, const int xy[2]) +uiBut *ui_list_find_mouse_over_ex(const ARegion *region, const int xy[2]) ATTR_NONNULL(1, 2) ATTR_WARN_UNUSED_RESULT; bool ui_but_contains_password(const uiBut *but) ATTR_WARN_UNUSED_RESULT; @@ -1452,76 +1388,68 @@ bool ui_block_is_popover(const uiBlock *block) ATTR_WARN_UNUSED_RESULT; bool ui_block_is_pie_menu(const uiBlock *block) ATTR_WARN_UNUSED_RESULT; bool ui_block_is_popup_any(const uiBlock *block) ATTR_WARN_UNUSED_RESULT; -uiBlock *ui_block_find_mouse_over_ex(const struct ARegion *region, const int xy[2], bool only_clip) +uiBlock *ui_block_find_mouse_over_ex(const ARegion *region, const int xy[2], bool only_clip) ATTR_NONNULL(1, 2); -uiBlock *ui_block_find_mouse_over(const struct ARegion *region, - const struct wmEvent *event, - bool only_clip); +uiBlock *ui_block_find_mouse_over(const ARegion *region, const wmEvent *event, bool only_clip); -uiBut *ui_region_find_first_but_test_flag(struct ARegion *region, - int flag_include, - int flag_exclude); -uiBut *ui_region_find_active_but(struct ARegion *region) ATTR_WARN_UNUSED_RESULT; -bool ui_region_contains_point_px(const struct ARegion *region, const int xy[2]) +uiBut *ui_region_find_first_but_test_flag(ARegion *region, int flag_include, int flag_exclude); +uiBut *ui_region_find_active_but(ARegion *region) ATTR_WARN_UNUSED_RESULT; +bool ui_region_contains_point_px(const ARegion *region, const int xy[2]) ATTR_NONNULL(1, 2) ATTR_WARN_UNUSED_RESULT; -bool ui_region_contains_rect_px(const struct ARegion *region, const rcti *rect_px); +bool ui_region_contains_rect_px(const ARegion *region, const rcti *rect_px); /** * Check if the cursor is over any popups. */ -struct ARegion *ui_screen_region_find_mouse_over_ex(struct bScreen *screen, const int xy[2]) - ATTR_NONNULL(1, 2); -struct ARegion *ui_screen_region_find_mouse_over(struct bScreen *screen, - const struct wmEvent *event); +ARegion *ui_screen_region_find_mouse_over_ex(bScreen *screen, const int xy[2]) ATTR_NONNULL(1, 2); +ARegion *ui_screen_region_find_mouse_over(bScreen *screen, const wmEvent *event); /* interface_context_menu.cc */ -bool ui_popup_context_menu_for_button(struct bContext *C, uiBut *but, const struct wmEvent *event); +bool ui_popup_context_menu_for_button(bContext *C, uiBut *but, const wmEvent *event); /** * menu to show when right clicking on the panel header */ -void ui_popup_context_menu_for_panel(struct bContext *C, - struct ARegion *region, - struct Panel *panel); +void ui_popup_context_menu_for_panel(bContext *C, ARegion *region, Panel *panel); /* interface_eyedropper.c */ -struct wmKeyMap *eyedropper_modal_keymap(struct wmKeyConfig *keyconf); -struct wmKeyMap *eyedropper_colorband_modal_keymap(struct wmKeyConfig *keyconf); +wmKeyMap *eyedropper_modal_keymap(wmKeyConfig *keyconf); +wmKeyMap *eyedropper_colorband_modal_keymap(wmKeyConfig *keyconf); /* interface_eyedropper_color.c */ -void UI_OT_eyedropper_color(struct wmOperatorType *ot); +void UI_OT_eyedropper_color(wmOperatorType *ot); /* interface_eyedropper_colorband.c */ -void UI_OT_eyedropper_colorramp(struct wmOperatorType *ot); -void UI_OT_eyedropper_colorramp_point(struct wmOperatorType *ot); +void UI_OT_eyedropper_colorramp(wmOperatorType *ot); +void UI_OT_eyedropper_colorramp_point(wmOperatorType *ot); /* interface_eyedropper_datablock.c */ -void UI_OT_eyedropper_id(struct wmOperatorType *ot); +void UI_OT_eyedropper_id(wmOperatorType *ot); /* interface_eyedropper_depth.c */ -void UI_OT_eyedropper_depth(struct wmOperatorType *ot); +void UI_OT_eyedropper_depth(wmOperatorType *ot); /* interface_eyedropper_driver.c */ -void UI_OT_eyedropper_driver(struct wmOperatorType *ot); +void UI_OT_eyedropper_driver(wmOperatorType *ot); /* interface_eyedropper_gpencil_color.c */ -void UI_OT_eyedropper_gpencil_color(struct wmOperatorType *ot); +void UI_OT_eyedropper_gpencil_color(wmOperatorType *ot); /* interface_template_asset_view.cc */ -struct uiListType *UI_UL_asset_view(void); +uiListType *UI_UL_asset_view(); /** * For use with #ui_rna_collection_search_update_fn. */ -typedef struct uiRNACollectionSearch { +struct uiRNACollectionSearch { PointerRNA target_ptr; PropertyRNA *target_prop; @@ -1533,23 +1461,22 @@ typedef struct uiRNACollectionSearch { uiButStore *butstore; /* Block has to be stored for freeing butstore (uiBut.block doesn't work with undo). */ uiBlock *butstore_block; -} uiRNACollectionSearch; +}; void ui_rna_collection_search_update_fn( - const struct bContext *C, void *arg, const char *str, uiSearchItems *items, bool is_first); + const bContext *C, void *arg, const char *str, uiSearchItems *items, bool is_first); /* interface_ops.c */ -bool ui_jump_to_target_button_poll(struct bContext *C); +bool ui_jump_to_target_button_poll(bContext *C); /* interface_queries.c */ -void ui_interface_tag_script_reload_queries(void); +void ui_interface_tag_script_reload_queries(); /* interface_view.cc */ -void ui_block_free_views(struct uiBlock *block); -void ui_block_views_listen(const uiBlock *block, - const struct wmRegionListenerParams *listener_params); +void ui_block_free_views(uiBlock *block); +void ui_block_views_listen(const uiBlock *block, const wmRegionListenerParams *listener_params); uiViewHandle *ui_block_view_find_matching_in_old_block(const uiBlock *new_block, const uiViewHandle *new_view); @@ -1558,14 +1485,7 @@ uiButViewItem *ui_block_view_find_matching_view_item_but_in_old_block( /* interface_templates.cc */ -struct uiListType *UI_UL_cache_file_layers(void); +uiListType *UI_UL_cache_file_layers(); -struct ID *ui_template_id_liboverride_hierarchy_make(struct bContext *C, - struct Main *bmain, - struct ID *owner_id, - struct ID *id, - const char **r_undo_push_label); - -#ifdef __cplusplus -} -#endif +ID *ui_template_id_liboverride_hierarchy_make( + bContext *C, Main *bmain, ID *owner_id, ID *id, const char **r_undo_push_label); diff --git a/source/blender/editors/interface/interface_layout.cc b/source/blender/editors/interface/interface_layout.cc index 41b60670f74..7da849c2a60 100644 --- a/source/blender/editors/interface/interface_layout.cc +++ b/source/blender/editors/interface/interface_layout.cc @@ -40,7 +40,7 @@ #include "WM_api.h" #include "WM_types.h" -#include "interface_intern.h" +#include "interface_intern.hh" /* Show an icon button after each RNA button to use to quickly set keyframes, * this is a way to display animation/driven/override status, see T54951. */ diff --git a/source/blender/editors/interface/interface_ops.cc b/source/blender/editors/interface/interface_ops.cc index 1b576583291..8385835d0b6 100644 --- a/source/blender/editors/interface/interface_ops.cc +++ b/source/blender/editors/interface/interface_ops.cc @@ -48,7 +48,7 @@ #include "UI_interface.h" -#include "interface_intern.h" +#include "interface_intern.hh" #include "WM_api.h" #include "WM_types.h" diff --git a/source/blender/editors/interface/interface_panel.cc b/source/blender/editors/interface/interface_panel.cc index 05b6ecf29d5..c924d758caa 100644 --- a/source/blender/editors/interface/interface_panel.cc +++ b/source/blender/editors/interface/interface_panel.cc @@ -48,7 +48,7 @@ #include "GPU_matrix.h" #include "GPU_state.h" -#include "interface_intern.h" +#include "interface_intern.hh" /* -------------------------------------------------------------------- */ /** \name Defines & Structs diff --git a/source/blender/editors/interface/interface_query.cc b/source/blender/editors/interface/interface_query.cc index 7ff6acee945..5ef9fdb3acf 100644 --- a/source/blender/editors/interface/interface_query.cc +++ b/source/blender/editors/interface/interface_query.cc @@ -19,7 +19,7 @@ #include "RNA_access.h" -#include "interface_intern.h" +#include "interface_intern.hh" #include "WM_api.h" #include "WM_types.h" diff --git a/source/blender/editors/interface/interface_region_color_picker.cc b/source/blender/editors/interface/interface_region_color_picker.cc index 8b28e9fece1..b1dc306afb8 100644 --- a/source/blender/editors/interface/interface_region_color_picker.cc +++ b/source/blender/editors/interface/interface_region_color_picker.cc @@ -34,7 +34,7 @@ #include "IMB_colormanagement.h" -#include "interface_intern.h" +#include "interface_intern.hh" enum ePickerType { PICKER_TYPE_RGB = 0, diff --git a/source/blender/editors/interface/interface_region_hud.cc b/source/blender/editors/interface/interface_region_hud.cc index 9c13a776db0..0aa3bcbdd8c 100644 --- a/source/blender/editors/interface/interface_region_hud.cc +++ b/source/blender/editors/interface/interface_region_hud.cc @@ -36,7 +36,7 @@ #include "ED_undo.h" #include "GPU_framebuffer.h" -#include "interface_intern.h" +#include "interface_intern.hh" /* -------------------------------------------------------------------- */ /** \name Utilities diff --git a/source/blender/editors/interface/interface_region_menu_pie.cc b/source/blender/editors/interface/interface_region_menu_pie.cc index f443dd43a3a..1205136ab68 100644 --- a/source/blender/editors/interface/interface_region_menu_pie.cc +++ b/source/blender/editors/interface/interface_region_menu_pie.cc @@ -36,7 +36,7 @@ #include "ED_screen.h" -#include "interface_intern.h" +#include "interface_intern.hh" #include "interface_regions_intern.hh" /* -------------------------------------------------------------------- */ diff --git a/source/blender/editors/interface/interface_region_menu_popup.cc b/source/blender/editors/interface/interface_region_menu_popup.cc index 8fd6731d2ec..c02b1399868 100644 --- a/source/blender/editors/interface/interface_region_menu_popup.cc +++ b/source/blender/editors/interface/interface_region_menu_popup.cc @@ -39,7 +39,7 @@ #include "ED_screen.h" -#include "interface_intern.h" +#include "interface_intern.hh" #include "interface_regions_intern.hh" /* -------------------------------------------------------------------- */ diff --git a/source/blender/editors/interface/interface_region_popover.cc b/source/blender/editors/interface/interface_region_popover.cc index 431571c1376..adc7f111d6b 100644 --- a/source/blender/editors/interface/interface_region_popover.cc +++ b/source/blender/editors/interface/interface_region_popover.cc @@ -45,7 +45,7 @@ #include "UI_interface.h" -#include "interface_intern.h" +#include "interface_intern.hh" #include "interface_regions_intern.hh" /* -------------------------------------------------------------------- */ diff --git a/source/blender/editors/interface/interface_region_popup.cc b/source/blender/editors/interface/interface_region_popup.cc index e574cb30b23..520c3e9dc82 100644 --- a/source/blender/editors/interface/interface_region_popup.cc +++ b/source/blender/editors/interface/interface_region_popup.cc @@ -30,7 +30,7 @@ #include "ED_screen.h" -#include "interface_intern.h" +#include "interface_intern.hh" #include "interface_regions_intern.hh" /* -------------------------------------------------------------------- */ diff --git a/source/blender/editors/interface/interface_region_search.cc b/source/blender/editors/interface/interface_region_search.cc index 8def878c6af..f4de5b6009d 100644 --- a/source/blender/editors/interface/interface_region_search.cc +++ b/source/blender/editors/interface/interface_region_search.cc @@ -41,7 +41,7 @@ #include "ED_screen.h" #include "GPU_state.h" -#include "interface_intern.h" +#include "interface_intern.hh" #include "interface_regions_intern.hh" #define MENU_BORDER int(0.3f * U.widget_unit) diff --git a/source/blender/editors/interface/interface_region_tooltip.cc b/source/blender/editors/interface/interface_region_tooltip.cc index 2a06267d90b..f0c01efa06f 100644 --- a/source/blender/editors/interface/interface_region_tooltip.cc +++ b/source/blender/editors/interface/interface_region_tooltip.cc @@ -52,7 +52,7 @@ #include "ED_screen.h" -#include "interface_intern.h" +#include "interface_intern.hh" #include "interface_regions_intern.hh" #define UI_TIP_PAD_FAC 1.3f diff --git a/source/blender/editors/interface/interface_style.cc b/source/blender/editors/interface/interface_style.cc index 9493f40548d..5d8914b1f96 100644 --- a/source/blender/editors/interface/interface_style.cc +++ b/source/blender/editors/interface/interface_style.cc @@ -30,7 +30,7 @@ #include "ED_datafiles.h" -#include "interface_intern.h" +#include "interface_intern.hh" #ifdef WIN32 # include "BLI_math_base.h" /* M_PI */ diff --git a/source/blender/editors/interface/interface_template_asset_view.cc b/source/blender/editors/interface/interface_template_asset_view.cc index 9a3f7800c64..2256c7ce148 100644 --- a/source/blender/editors/interface/interface_template_asset_view.cc +++ b/source/blender/editors/interface/interface_template_asset_view.cc @@ -28,7 +28,7 @@ #include "WM_api.h" #include "WM_types.h" -#include "interface_intern.h" +#include "interface_intern.hh" struct AssetViewListData { AssetLibraryReference asset_library_ref; diff --git a/source/blender/editors/interface/interface_template_list.cc b/source/blender/editors/interface/interface_template_list.cc index 2b581f187a6..d5803e603f1 100644 --- a/source/blender/editors/interface/interface_template_list.cc +++ b/source/blender/editors/interface/interface_template_list.cc @@ -30,7 +30,7 @@ #include "WM_api.h" -#include "interface_intern.h" +#include "interface_intern.hh" /** * The validated data that was passed to #uiTemplateList (typically through Python). diff --git a/source/blender/editors/interface/interface_template_search_menu.cc b/source/blender/editors/interface/interface_template_search_menu.cc index 38a7e025572..54213bdc5c3 100644 --- a/source/blender/editors/interface/interface_template_search_menu.cc +++ b/source/blender/editors/interface/interface_template_search_menu.cc @@ -47,7 +47,7 @@ #include "WM_types.h" #include "UI_interface.h" -#include "interface_intern.h" +#include "interface_intern.hh" /* For key-map item access. */ #include "wm_event_system.h" diff --git a/source/blender/editors/interface/interface_template_search_operator.cc b/source/blender/editors/interface/interface_template_search_operator.cc index 58f44de5278..c31b35c5a9a 100644 --- a/source/blender/editors/interface/interface_template_search_operator.cc +++ b/source/blender/editors/interface/interface_template_search_operator.cc @@ -28,7 +28,7 @@ #include "WM_types.h" #include "UI_interface.h" -#include "interface_intern.h" +#include "interface_intern.hh" /* -------------------------------------------------------------------- */ /** \name Operator Search Template Implementation diff --git a/source/blender/editors/interface/interface_templates.cc b/source/blender/editors/interface/interface_templates.cc index 7a909f6a775..ece2939bc0b 100644 --- a/source/blender/editors/interface/interface_templates.cc +++ b/source/blender/editors/interface/interface_templates.cc @@ -84,7 +84,7 @@ #include "UI_interface.h" #include "UI_interface_icons.h" #include "UI_view2d.h" -#include "interface_intern.h" +#include "interface_intern.hh" #include "PIL_time.h" diff --git a/source/blender/editors/interface/interface_undo.cc b/source/blender/editors/interface/interface_undo.cc index ec54b695cf7..05fbb46bcee 100644 --- a/source/blender/editors/interface/interface_undo.cc +++ b/source/blender/editors/interface/interface_undo.cc @@ -15,7 +15,7 @@ #include "MEM_guardedalloc.h" -#include "interface_intern.h" +#include "interface_intern.hh" /* -------------------------------------------------------------------- */ /** \name Text Field Undo Stack diff --git a/source/blender/editors/interface/interface_utils.cc b/source/blender/editors/interface/interface_utils.cc index 423eefce3f3..157ffa6f02c 100644 --- a/source/blender/editors/interface/interface_utils.cc +++ b/source/blender/editors/interface/interface_utils.cc @@ -40,7 +40,7 @@ #include "WM_api.h" #include "WM_types.h" -#include "interface_intern.h" +#include "interface_intern.hh" /*************************** RNA Utilities ******************************/ diff --git a/source/blender/editors/interface/interface_widgets.cc b/source/blender/editors/interface/interface_widgets.cc index a4afecbd54a..08bbb5c81d0 100644 --- a/source/blender/editors/interface/interface_widgets.cc +++ b/source/blender/editors/interface/interface_widgets.cc @@ -32,7 +32,7 @@ #include "UI_interface_icons.h" #include "UI_view2d.h" -#include "interface_intern.h" +#include "interface_intern.hh" #include "GPU_batch.h" #include "GPU_batch_presets.h" diff --git a/source/blender/editors/interface/resources.cc b/source/blender/editors/interface/resources.cc index 0801330f27a..74590dccec4 100644 --- a/source/blender/editors/interface/resources.cc +++ b/source/blender/editors/interface/resources.cc @@ -34,7 +34,7 @@ #include "UI_interface_icons.h" #include "GPU_framebuffer.h" -#include "interface_intern.h" +#include "interface_intern.hh" /* be sure to keep 'bThemeState' in sync */ static bThemeState g_theme_state = { diff --git a/source/blender/editors/interface/view2d.cc b/source/blender/editors/interface/view2d.cc index bb660d6bf7d..51a3bd008af 100644 --- a/source/blender/editors/interface/view2d.cc +++ b/source/blender/editors/interface/view2d.cc @@ -43,7 +43,7 @@ #include "UI_interface.h" #include "UI_view2d.h" -#include "interface_intern.h" +#include "interface_intern.hh" static void ui_view2d_curRect_validate_resize(View2D *v2d, bool resize); diff --git a/source/blender/editors/interface/view2d_draw.cc b/source/blender/editors/interface/view2d_draw.cc index a8d6d6c78de..837d7de1c86 100644 --- a/source/blender/editors/interface/view2d_draw.cc +++ b/source/blender/editors/interface/view2d_draw.cc @@ -33,7 +33,7 @@ #include "UI_interface.h" #include "UI_view2d.h" -#include "interface_intern.h" +#include "interface_intern.hh" /* Compute display grid resolution ********************************************************/ diff --git a/source/blender/editors/interface/views/abstract_view.cc b/source/blender/editors/interface/views/abstract_view.cc index 077c76a08f1..301302d818a 100644 --- a/source/blender/editors/interface/views/abstract_view.cc +++ b/source/blender/editors/interface/views/abstract_view.cc @@ -4,7 +4,7 @@ * \ingroup edinterface */ -#include "interface_intern.h" +#include "interface_intern.hh" #include "UI_abstract_view.hh" diff --git a/source/blender/editors/interface/views/abstract_view_item.cc b/source/blender/editors/interface/views/abstract_view_item.cc index 101cb66bfa9..5e59591dd96 100644 --- a/source/blender/editors/interface/views/abstract_view_item.cc +++ b/source/blender/editors/interface/views/abstract_view_item.cc @@ -12,7 +12,7 @@ #include "WM_api.h" #include "UI_interface.h" -#include "interface_intern.h" +#include "interface_intern.hh" #include "UI_abstract_view.hh" diff --git a/source/blender/editors/interface/views/grid_view.cc b/source/blender/editors/interface/views/grid_view.cc index ee2fa87b1dc..87fe0b4f608 100644 --- a/source/blender/editors/interface/views/grid_view.cc +++ b/source/blender/editors/interface/views/grid_view.cc @@ -12,7 +12,7 @@ #include "WM_types.h" #include "UI_interface.h" -#include "interface_intern.h" +#include "interface_intern.hh" #include "UI_grid_view.hh" diff --git a/source/blender/editors/interface/views/interface_view.cc b/source/blender/editors/interface/views/interface_view.cc index 71974b4d2f9..9b77f3132e8 100644 --- a/source/blender/editors/interface/views/interface_view.cc +++ b/source/blender/editors/interface/views/interface_view.cc @@ -27,7 +27,7 @@ #include "ED_screen.h" -#include "interface_intern.h" +#include "interface_intern.hh" #include "UI_interface.hh" diff --git a/source/blender/editors/interface/views/tree_view.cc b/source/blender/editors/interface/views/tree_view.cc index 43fdf741ac5..4fc256d0ffa 100644 --- a/source/blender/editors/interface/views/tree_view.cc +++ b/source/blender/editors/interface/views/tree_view.cc @@ -11,7 +11,7 @@ #include "BLT_translation.h" -#include "interface_intern.h" +#include "interface_intern.hh" #include "UI_interface.h" diff --git a/source/blender/editors/space_buttons/buttons_texture.cc b/source/blender/editors/space_buttons/buttons_texture.cc index fbce4f300eb..478d55e5376 100644 --- a/source/blender/editors/space_buttons/buttons_texture.cc +++ b/source/blender/editors/space_buttons/buttons_texture.cc @@ -51,7 +51,7 @@ #include "WM_api.h" #include "WM_types.h" -#include "../interface/interface_intern.h" +#include "../interface/interface_intern.hh" #include "buttons_intern.h" /* own include */ diff --git a/source/blender/editors/space_node/node_draw.cc b/source/blender/editors/space_node/node_draw.cc index 67adf3865be..96550944b9a 100644 --- a/source/blender/editors/space_node/node_draw.cc +++ b/source/blender/editors/space_node/node_draw.cc @@ -77,6 +77,8 @@ #include "FN_field.hh" #include "FN_field_cpp_type.hh" +#include "../interface/interface_intern.hh" /* TODO: Remove */ + #include "node_intern.hh" /* own include */ namespace geo_log = blender::nodes::geo_eval_log; @@ -84,12 +86,6 @@ namespace geo_log = blender::nodes::geo_eval_log; using blender::GPointer; using blender::Vector; -extern "C" { -/* XXX interface.h */ -extern void ui_draw_dropshadow( - const rctf *rct, float radius, float aspect, float alpha, int select); -} - /** * This is passed to many functions which draw the node editor. */ diff --git a/source/blender/editors/space_node/node_templates.cc b/source/blender/editors/space_node/node_templates.cc index 0027a965267..18c6e49c8a2 100644 --- a/source/blender/editors/space_node/node_templates.cc +++ b/source/blender/editors/space_node/node_templates.cc @@ -32,7 +32,7 @@ #include "NOD_socket.h" #include "NOD_socket_declarations.hh" -#include "../interface/interface_intern.h" /* XXX bad level */ +#include "../interface/interface_intern.hh" /* XXX bad level */ #include "UI_interface.h" #include "ED_node.h" /* own include */