[Bf-blender-cvs] [6450f380acc] temp-ui-cpp: Cleanup: Move more interface files to C++
Hans Goudey
noreply at git.blender.org
Sat Apr 2 22:07:43 CEST 2022
Commit: 6450f380acc6e1ded72ff8372adcd79dd486abc0
Author: Hans Goudey
Date: Sat Apr 2 15:07:36 2022 -0500
Branches: temp-ui-cpp
https://developer.blender.org/rB6450f380acc6e1ded72ff8372adcd79dd486abc0
Cleanup: Move more interface files to C++
===================================================================
M source/blender/editors/include/UI_interface.h
M source/blender/editors/interface/CMakeLists.txt
M source/blender/editors/interface/interface_intern.h
R093 source/blender/editors/interface/interface_region_color_picker.c source/blender/editors/interface/interface_region_color_picker.cc
R088 source/blender/editors/interface/interface_region_hud.c source/blender/editors/interface/interface_region_hud.cc
R093 source/blender/editors/interface/interface_region_menu_pie.c source/blender/editors/interface/interface_region_menu_pie.cc
R088 source/blender/editors/interface/interface_region_menu_popup.c source/blender/editors/interface/interface_region_menu_popup.cc
R088 source/blender/editors/interface/interface_region_popover.c source/blender/editors/interface/interface_region_popover.cc
R096 source/blender/editors/interface/interface_region_popup.c source/blender/editors/interface/interface_region_popup.cc
R089 source/blender/editors/interface/interface_regions.c source/blender/editors/interface/interface_regions.cc
R093 source/blender/editors/interface/interface_style.c source/blender/editors/interface/interface_style.cc
R089 source/blender/editors/interface/interface_utils.c source/blender/editors/interface/interface_utils.cc
===================================================================
diff --git a/source/blender/editors/include/UI_interface.h b/source/blender/editors/include/UI_interface.h
index 74797f91046..a4508cb5b6d 100644
--- a/source/blender/editors/include/UI_interface.h
+++ b/source/blender/editors/include/UI_interface.h
@@ -634,7 +634,7 @@ uiPopupMenu *UI_popup_menu_begin_ex(struct bContext *C,
* Set the whole structure to work.
*/
void UI_popup_menu_end(struct bContext *C, struct uiPopupMenu *pup);
-bool UI_popup_menu_end_or_cancel(struct bContext *C, struct uiPopupMenu *head);
+bool UI_popup_menu_end_or_cancel(struct bContext *C, struct uiPopupMenu *pup);
struct uiLayout *UI_popup_menu_layout(uiPopupMenu *pup);
void UI_popup_menu_reports(struct bContext *C, struct ReportList *reports) ATTR_NONNULL();
@@ -1595,13 +1595,15 @@ typedef enum {
} eButLabelAlign;
/* Return info for uiDefAutoButsRNA */
-typedef enum {
+typedef enum eAutoPropButsReturn {
/* Returns when no buttons were added */
UI_PROP_BUTS_NONE_ADDED = 1 << 0,
/* Returned when any property failed the custom check callback (check_prop) */
UI_PROP_BUTS_ANY_FAILED_CHECK = 1 << 1,
} eAutoPropButsReturn;
+ENUM_OPERATORS(eAutoPropButsReturn, UI_PROP_BUTS_ANY_FAILED_CHECK);
+
uiBut *uiDefAutoButR(uiBlock *block,
struct PointerRNA *ptr,
struct PropertyRNA *prop,
diff --git a/source/blender/editors/interface/CMakeLists.txt b/source/blender/editors/interface/CMakeLists.txt
index e298d595294..a1ee5c38838 100644
--- a/source/blender/editors/interface/CMakeLists.txt
+++ b/source/blender/editors/interface/CMakeLists.txt
@@ -47,16 +47,16 @@ set(SRC
interface_ops.c
interface_panel.c
interface_query.cc
- interface_region_color_picker.c
- interface_region_hud.c
- interface_region_menu_pie.c
- interface_region_menu_popup.c
- interface_region_popover.c
- interface_region_popup.c
+ interface_region_color_picker.cc
+ interface_region_hud.cc
+ interface_region_menu_pie.cc
+ interface_region_menu_popup.cc
+ interface_region_popover.cc
+ interface_region_popup.cc
interface_region_search.cc
interface_region_tooltip.c
- interface_regions.c
- interface_style.c
+ interface_regions.cc
+ interface_style.cc
interface_template_asset_view.cc
interface_template_attribute_search.cc
interface_template_list.cc
@@ -64,7 +64,7 @@ set(SRC
interface_template_search_operator.c
interface_templates.c
interface_undo.c
- interface_utils.c
+ interface_utils.cc
interface_view.cc
interface_widgets.c
resources.c
diff --git a/source/blender/editors/interface/interface_intern.h b/source/blender/editors/interface/interface_intern.h
index ddea37e8dfe..e619b14fb69 100644
--- a/source/blender/editors/interface/interface_intern.h
+++ b/source/blender/editors/interface/interface_intern.h
@@ -954,7 +954,7 @@ void ui_pie_menu_level_create(uiBlock *block,
const EnumPropertyItem *items,
int totitem,
wmOperatorCallContext context,
- int flag);
+ wmOperatorCallContext flag);
/* interface_region_popup.c */
diff --git a/source/blender/editors/interface/interface_region_color_picker.c b/source/blender/editors/interface/interface_region_color_picker.cc
similarity index 93%
rename from source/blender/editors/interface/interface_region_color_picker.c
rename to source/blender/editors/interface/interface_region_color_picker.cc
index 9fb6f538191..ab0a6039cdc 100644
--- a/source/blender/editors/interface/interface_region_color_picker.c
+++ b/source/blender/editors/interface/interface_region_color_picker.cc
@@ -7,9 +7,9 @@
* Color Picker Region & Color Utils
*/
-#include <stdarg.h>
-#include <stdlib.h>
-#include <string.h>
+#include <cstdarg>
+#include <cstdlib>
+#include <cstring>
#include "MEM_guardedalloc.h"
@@ -168,7 +168,7 @@ static void ui_color_picker_update_hsv(ColorPicker *cpicker,
void ui_but_hsv_set(uiBut *but)
{
float rgb_perceptual[3];
- ColorPicker *cpicker = but->custom_data;
+ ColorPicker *cpicker = static_cast<ColorPicker *>(but->custom_data);
float *hsv_perceptual = cpicker->hsv_perceptual;
ui_color_picker_hsv_to_rgb(hsv_perceptual, rgb_perceptual);
@@ -255,7 +255,8 @@ static void ui_colorpicker_rgba_update_cb(bContext *UNUSED(C), void *bt1, void *
if (prop) {
RNA_property_float_get_array(&ptr, prop, rgb_scene_linear);
- ui_update_color_picker_buts_rgb(but, but->block, but->custom_data, rgb_scene_linear);
+ ui_update_color_picker_buts_rgb(
+ but, but->block, static_cast<ColorPicker *>(but->custom_data), rgb_scene_linear);
}
if (popup) {
@@ -268,7 +269,7 @@ static void ui_colorpicker_hsv_update_cb(bContext *UNUSED(C), void *bt1, void *U
uiBut *but = (uiBut *)bt1;
uiPopupBlockHandle *popup = but->block->handle;
float rgb_scene_linear[3];
- ColorPicker *cpicker = but->custom_data;
+ ColorPicker *cpicker = static_cast<ColorPicker *>(but->custom_data);
ui_color_picker_hsv_to_rgb(cpicker->hsv_scene_linear, rgb_scene_linear);
ui_update_color_picker_buts_rgb(but, but->block, cpicker, rgb_scene_linear);
@@ -282,7 +283,7 @@ static void ui_colorpicker_hex_rna_cb(bContext *UNUSED(C), void *bt1, void *hexc
{
uiBut *but = (uiBut *)bt1;
uiPopupBlockHandle *popup = but->block->handle;
- ColorPicker *cpicker = but->custom_data;
+ ColorPicker *cpicker = static_cast<ColorPicker *>(but->custom_data);
char *hexcol = (char *)hexcl;
float rgb[3];
@@ -307,7 +308,7 @@ static void ui_popup_close_cb(bContext *UNUSED(C), void *bt1, void *UNUSED(arg))
uiPopupBlockHandle *popup = but->block->handle;
if (popup) {
- ColorPicker *cpicker = but->custom_data;
+ ColorPicker *cpicker = static_cast<ColorPicker *>(but->custom_data);
BLI_assert(cpicker->is_init);
popup->menuretval = (equals_v3v3(cpicker->hsv_perceptual, cpicker->hsv_perceptual_init) ?
UI_RETURN_CANCEL :
@@ -315,7 +316,7 @@ static void ui_popup_close_cb(bContext *UNUSED(C), void *bt1, void *UNUSED(arg))
}
}
-static void ui_colorpicker_hide_reveal(uiBlock *block, enum ePickerType colormode)
+static void ui_colorpicker_hide_reveal(uiBlock *block, ePickerType colormode)
{
/* tag buttons */
LISTBASE_FOREACH (uiBut *, bt, &block->buttons) {
@@ -337,9 +338,9 @@ static void ui_colorpicker_hide_reveal(uiBlock *block, enum ePickerType colormod
static void ui_colorpicker_create_mode_cb(bContext *UNUSED(C), void *bt1, void *UNUSED(arg))
{
- uiBut *bt = bt1;
+ uiBut *bt = static_cast<uiBut *>(bt1);
const short colormode = ui_but_value_get(bt);
- ui_colorpicker_hide_reveal(bt->block, colormode);
+ ui_colorpicker_hide_reveal(bt->block, (ePickerType)colormode);
}
#define PICKER_H (7.5f * U.widget_unit)
@@ -374,7 +375,7 @@ static void ui_colorpicker_circle(uiBlock *block,
0.0,
0,
TIP_("Color"));
- UI_but_func_set(bt, ui_colorpicker_rgba_update_cb, bt, NULL);
+ UI_but_func_set(bt, ui_colorpicker_rgba_update_cb, bt, nullptr);
bt->custom_data = cpicker;
/* value */
@@ -396,7 +397,7 @@ static void ui_colorpicker_circle(uiBlock *block,
0,
"Lightness");
hsv_but->gradient_type = UI_GRAD_L_ALT;
- UI_but_func_set(&hsv_but->but, ui_colorpicker_rgba_update_cb, &hsv_but->but, NULL);
+ UI_but_func_set(&hsv_but->but, ui_colorpicker_rgba_update_cb, &hsv_but->but, nullptr);
}
else {
hsv_but = (uiButHSVCube *)uiDefButR_prop(block,
@@ -416,7 +417,7 @@ static void ui_colorpicker_circle(uiBlock *block,
0,
TIP_("Value"));
hsv_but->gradient_type = UI_GRAD_V_ALT;
- UI_but_func_set(&hsv_but->but, ui_colorpicker_rgba_update_cb, &hsv_but->but, NULL);
+ UI_but_func_set(&hsv_but->but, ui_colorpicker_rgba_update_cb, &hsv_but->but, nullptr);
}
hsv_but->but.custom_data = cpicker;
}
@@ -449,7 +450,7 @@ static void ui_colorpicker_square(uiBlock *block,
0,
TIP_("Color"));
hsv_but->gradient_type = type;
- UI_but_func_set(&hsv_but->but, ui_colorpicker_rgba_update_cb, &hsv_but->but, NULL);
+ UI_but_func_set(&hsv_but->but, ui_colorpicker_rgba_update_cb, &hsv_but->but, nullptr);
hsv_but->but.custom_data = cpicker;
/* value */
@@ -469,8 +470,8 @@ static void ui_colorpicker_square(uiBlock *block,
0,
0,
TIP_("Value"));
- hsv_but->gradient_type = type + 3;
- UI_but_func_set(&hsv_but->but, ui_colorpicker_rgba_update_cb, &hsv_but->but, NULL);
+ hsv_but->gradient_type = (eButGradientType)(type + 3);
+ UI_but_func_set(&hsv_but->but, ui_colorpicker_rgba_update_cb, &hsv_but->but, nullptr);
hsv_but->but.custom_data = cpicker;
}
@@ -547,7 +548,7 @@ static void ui_block_colorpicker(uiBlock *block,
"");
UI_but_flag_disable(bt, UI_BUT_UNDO);
UI_but_drawflag_disable(bt, UI_BUT_TEXT_LEFT);
- UI_but_func_set(bt, ui_colorpicker_create_mode_cb, bt, NULL);
+ UI_but_func_set(bt, ui_colorpicker_create_mode_cb, bt, nullptr);
bt->custom_data = cpicker;
bt = uiDefButC(block,
UI_BTYPE_ROW,
@@ -565,7 +566,7 @@ static void ui_block_colorpicker(uiBlock *block,
"");
UI_but_flag_disable(bt, UI_BUT_UNDO);
UI_but_drawflag_disable(bt, UI_BUT_TEXT_LEFT);
- UI_but_func_set(bt, ui_colorpicker_create_mode_cb, bt, NULL);
+ UI_but_func_set(bt, ui_colorpicker_create_mode_cb, bt, nullptr);
bt->custom_data = cpicker;
bt = uiDefButC(block,
UI_BTYPE_ROW,
@@ -583,7 +584,7 @@ static void ui_block_colorpicker(uiBlock *block,
"");
UI_but_flag_disable(bt, UI_BUT_UNDO);
UI_but_drawflag_disable(bt, UI_BUT_TEXT_LEFT);
- UI_but_func_set(bt, ui_colorpicker_create_mode_cb, bt, NULL);
+ UI_but_func_set(bt, ui_colorpicker_create_mode_cb, bt, nullptr);
bt->custom_data = cpicker;
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list