Cleanup: various non-functional C++ changes

This commit is contained in:
Campbell Barton 2023-08-05 12:32:59 +10:00
parent 7f34ad736a
commit 9ea8477c23
17 changed files with 52 additions and 48 deletions

View File

@ -577,7 +577,7 @@ GPUMaterial *ShaderModule::material_shader_get(::Material *blender_mat,
}
GPUMaterial *ShaderModule::world_shader_get(::World *blender_world,
struct bNodeTree *nodetree,
bNodeTree *nodetree,
eMaterialPipeline pipeline_type)
{
bool is_volume = (pipeline_type == MAT_PIPE_VOLUME);

View File

@ -60,7 +60,7 @@ struct SubsurfaceModule {
pass->bind_ubo("sss_buf", data_);
}
GPUTexture **transmittance_tx_get(void)
GPUTexture **transmittance_tx_get()
{
return &transmittance_tx_;
}

View File

@ -122,8 +122,8 @@ void ED_armature_bones_flip_names(Main *bmain,
/* `armature_ops.cc` */
void ED_operatortypes_armature(void);
void ED_operatormacros_armature(void);
void ED_operatortypes_armature();
void ED_operatormacros_armature();
void ED_keymap_armature(wmKeyConfig *keyconf);
/* `armature_relations.cc` */

View File

@ -153,4 +153,4 @@ void ED_clip_view_lock_state_store(const bContext *C, ClipViewLockState *state);
void ED_clip_view_lock_state_restore_no_jump(const bContext *C, const ClipViewLockState *state);
/* `clip_ops.cc` */
void ED_operatormacros_clip(void);
void ED_operatormacros_clip();

View File

@ -132,7 +132,7 @@ bool ED_fileselect_layout_isect_rect(const FileLayout *layout,
rcti *r_dst);
void ED_fileselect_layout_tilepos(const FileLayout *layout, int tile, int *x, int *y);
void ED_operatormacros_file(void);
void ED_operatormacros_file();
void ED_fileselect_clear(wmWindowManager *wm, SpaceFile *sfile);
@ -241,7 +241,7 @@ enum FSMenuInsert {
FS_INSERT_NO_VALIDATE = (1 << 4),
};
FSMenu *ED_fsmenu_get(void);
FSMenu *ED_fsmenu_get();
FSMenuEntry *ED_fsmenu_get_category(FSMenu *fsmenu, FSMenuCategory category);
void ED_fsmenu_set_category(FSMenu *fsmenu, FSMenuCategory category, FSMenuEntry *fsm_head);

View File

@ -40,9 +40,12 @@ void ED_gizmotypes_snap_3d();
/* `gizmo_library_presets.cc` */
void ED_gizmo_draw_preset_box(const wmGizmo *gz, const float mat[4][4], int select_id);
void ED_gizmo_draw_preset_arrow(const wmGizmo *gz, const float mat[4][4], int axis, int select_id);
void ED_gizmo_draw_preset_circle(const wmGizmo *gz,
void ED_gizmo_draw_preset_box(const struct wmGizmo *gz, const float mat[4][4], int select_id);
void ED_gizmo_draw_preset_arrow(const struct wmGizmo *gz,
const float mat[4][4],
int axis,
int select_id);
void ED_gizmo_draw_preset_circle(const struct wmGizmo *gz,
const float mat[4][4],
int axis,
int select_id);
@ -78,13 +81,13 @@ enum {
*
* \note Needs to be called before #WM_gizmo_target_property_def_rna!
*/
void ED_gizmo_arrow3d_set_ui_range(wmGizmo *gz, float min, float max);
void ED_gizmo_arrow3d_set_ui_range(struct wmGizmo *gz, float min, float max);
/**
* Define a custom factor for arrow min/max distance.
*
* \note Needs to be called before #WM_gizmo_target_property_def_rna!
*/
void ED_gizmo_arrow3d_set_range_fac(wmGizmo *gz, float range_fac);
void ED_gizmo_arrow3d_set_range_fac(struct wmGizmo *gz, float range_fac);
/* -------------------------------------------------------------------- */
/* Cage Gizmo */
@ -235,14 +238,15 @@ enum {
/* `snap3d_gizmo.cc` */
SnapObjectContext *ED_gizmotypes_snap_3d_context_ensure(Scene *scene, wmGizmo *gz);
struct SnapObjectContext *ED_gizmotypes_snap_3d_context_ensure(struct Scene *scene,
struct wmGizmo *gz);
void ED_gizmotypes_snap_3d_flag_set(wmGizmo *gz, int flag);
void ED_gizmotypes_snap_3d_flag_set(struct wmGizmo *gz, int flag);
bool ED_gizmotypes_snap_3d_is_enabled(const wmGizmo *gz);
bool ED_gizmotypes_snap_3d_is_enabled(const struct wmGizmo *gz);
void ED_gizmotypes_snap_3d_data_get(const bContext *C,
wmGizmo *gz,
void ED_gizmotypes_snap_3d_data_get(const struct bContext *C,
struct wmGizmo *gz,
float r_loc[3],
float r_nor[3],
int r_elem_index[3],

View File

@ -114,6 +114,6 @@ void draw_masklay_channel(AnimKeylistDrawList *draw_list,
float yscale_fac,
int saction_flag);
AnimKeylistDrawList *ED_keylist_draw_list_create(void);
AnimKeylistDrawList *ED_keylist_draw_list_create();
void ED_keylist_draw_list_flush(AnimKeylistDrawList *draw_list, View2D *v2d);
void ED_keylist_draw_list_free(AnimKeylistDrawList *draw_list);

View File

@ -322,7 +322,7 @@ void ANIM_keyingset_info_unregister(Main *bmain, KeyingSetInfo *ksi);
/* cleanup on exit */
/* --------------- */
void ANIM_keyingset_infos_exit(void);
void ANIM_keyingset_infos_exit();
/* -------- */
@ -491,20 +491,20 @@ bool ANIM_remove_driver(
* Clear copy-paste buffer for drivers.
* \note This function frees any MEM_calloc'ed copy/paste buffer data.
*/
void ANIM_drivers_copybuf_free(void);
void ANIM_drivers_copybuf_free();
/**
* Clear copy-paste buffer for driver variable sets.
* \note This function frees any MEM_calloc'ed copy/paste buffer data.
*/
void ANIM_driver_vars_copybuf_free(void);
void ANIM_driver_vars_copybuf_free();
/* -------- */
/**
* Returns whether there is a driver in the copy/paste buffer to paste.
*/
bool ANIM_driver_can_paste(void);
bool ANIM_driver_can_paste();
/**
* \brief Main Driver Management API calls.
@ -528,7 +528,7 @@ bool ANIM_paste_driver(
/**
* Checks if there are driver variables in the copy/paste buffer.
*/
bool ANIM_driver_vars_can_paste(void);
bool ANIM_driver_vars_can_paste();
/**
* Copy the given driver's variables to the buffer.

View File

@ -49,9 +49,9 @@ bool ED_maskedit_mask_visible_splines_poll(bContext *C);
void ED_mask_deselect_all(const bContext *C);
void ED_operatortypes_mask(void);
void ED_operatortypes_mask();
void ED_keymap_mask(wmKeyConfig *keyconf);
void ED_operatormacros_mask(void);
void ED_operatormacros_mask();
/* `mask_query.cc` */
@ -168,9 +168,9 @@ void ED_masklayer_frames_duplicate(MaskLayer *mask_layer);
void ED_masklayer_snap_frames(MaskLayer *mask_layer, Scene *scene, short mode);
#if 0
void free_gpcopybuf(void);
void copy_gpdata(void);
void paste_gpdata(void);
void free_gpcopybuf();
void copy_gpdata();
void paste_gpdata();
void mirror_masklayer_frames( MaskLayer *mask_layer, short mode);
#endif

View File

@ -474,7 +474,7 @@ void UI_SetTheme(int spacetype, int regionid);
/**
* Get current theme.
*/
bTheme *UI_GetTheme(void);
bTheme *UI_GetTheme();
/**
* For the rare case we need to temp swap in a different theme (off-screen render).
@ -485,7 +485,7 @@ void UI_Theme_Restore(bThemeState *theme_state);
/**
* Return shadow width outside menus and popups.
*/
int UI_ThemeMenuShadowWidth(void);
int UI_ThemeMenuShadowWidth();
/**
* Only for buttons in theme editor!

View File

@ -6,10 +6,10 @@
* \ingroup spfile
*/
#include <math.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <cmath>
#include <cstdio>
#include <cstdlib>
#include <cstring>
#include "MEM_guardedalloc.h"
@ -42,7 +42,7 @@ struct FSMenu {
static FSMenu *g_fsmenu = nullptr;
FSMenu *ED_fsmenu_get(void)
FSMenu *ED_fsmenu_get()
{
if (!g_fsmenu) {
g_fsmenu = MEM_cnew<FSMenu>(__func__);

View File

@ -6,10 +6,10 @@
* \ingroup spfile
*/
#include <math.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <cmath>
#include <cstdio>
#include <cstdlib>
#include <cstring>
#include "MEM_guardedalloc.h"

View File

@ -1321,8 +1321,8 @@ void MOD_lineart_chain_split_angle(LineartData *ld, float angle_threshold_rad)
new_ec->chain.first = eci;
new_ec->chain.last = ec->chain.last;
ec->chain.last = eci->prev;
((LineartEdgeChainItem *)ec->chain.last)->next = 0;
eci->prev = 0;
((LineartEdgeChainItem *)ec->chain.last)->next = nullptr;
eci->prev = nullptr;
/* End the previous one. */
lineart_chain_append_point(ld,

View File

@ -159,9 +159,9 @@ class GLBackend : public GPUBackend {
}
/* Render Frame Coordination */
void render_begin(void) override{};
void render_end(void) override{};
void render_step(void) override{};
void render_begin() override{};
void render_end() override{};
void render_step() override{};
bool debug_capture_begin();
void debug_capture_end();

View File

@ -58,7 +58,7 @@ class VKContext : public Context, NonCopyable {
const VKVertexAttributeObject &vertex_attribute_object);
void sync_backbuffer();
static VKContext *get(void)
static VKContext *get()
{
return static_cast<VKContext *>(Context::get());
}

View File

@ -37,8 +37,8 @@ class VKImmediate : public Immediate, VKResourceTracker<VKBuffer> {
VKImmediate();
virtual ~VKImmediate();
uchar *begin(void) override;
void end(void) override;
uchar *begin() override;
void end() override;
friend class VKVertexAttributeObject;

View File

@ -101,7 +101,7 @@ const EnumPropertyItem rna_enum_attribute_domain_point_face_curve_items[] = {
{ATTR_DOMAIN_POINT, "POINT", 0, "Point", "Attribute on point"},
{ATTR_DOMAIN_FACE, "FACE", 0, "Face", "Attribute on mesh faces"},
{ATTR_DOMAIN_CURVE, "CURVE", 0, "Spline", "Attribute on spline"},
{0, NULL, 0, NULL, NULL},
{0, nullptr, 0, nullptr, nullptr},
};
const EnumPropertyItem rna_enum_attribute_domain_without_corner_items[] = {