griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Cleanup: Use reinterpret_cast instead of C-style cast

Browse Source
This commit is contained in:
Hans Goudey
2024-03-06 18:32:11 -05:00
parent ddc9dcce86
commit 8c16d06858
9 changed files with 15 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/blenkernel/intern/lib_remap.cc
View File

@@ -216,7 +216,7 @@ static int foreach_libblock_remap_callback(LibraryIDLinkCallbackData *cb_data)
const IDRemapperApplyResult expected_mapping_result = id_remapper.get_mapping_result(
*id_p, id_remapper_options, id_self);
/* Exit, when no modifications will be done; ensuring id->runtime counters won't changed. */
/* Exit when no modifications will be done, ensuring id->runtime counters won't changed. */
if (ELEM(expected_mapping_result,
ID_REMAP_RESULT_SOURCE_UNAVAILABLE,
ID_REMAP_RESULT_SOURCE_NOT_MAPPABLE))

4
source/blender/editors/space_action/space_action.cc
View File

@@ -808,8 +808,8 @@ static void action_id_remap(ScrArea * /*area*/,
{
SpaceAction *sact = (SpaceAction *)slink;
mappings.apply((ID **)&sact->action, ID_REMAP_APPLY_DEFAULT);
mappings.apply((ID **)&sact->ads.filter_grp, ID_REMAP_APPLY_DEFAULT);
mappings.apply(reinterpret_cast<ID **>(&sact->action), ID_REMAP_APPLY_DEFAULT);
mappings.apply(reinterpret_cast<ID **>(&sact->ads.filter_grp), ID_REMAP_APPLY_DEFAULT);
mappings.apply(&sact->ads.source, ID_REMAP_APPLY_DEFAULT);
}

2
source/blender/editors/space_buttons/space_buttons.cc
View File

@@ -901,7 +901,7 @@ static void buttons_id_remap(ScrArea * /*area*/,
if (sbuts->texuser) {
ButsContextTexture *ct = static_cast<ButsContextTexture *>(sbuts->texuser);
mappings.apply((ID **)&ct->texture, ID_REMAP_APPLY_DEFAULT);
mappings.apply(reinterpret_cast<ID **>(&ct->texture), ID_REMAP_APPLY_DEFAULT);
BLI_freelistN(&ct->users);
ct->user = nullptr;
}

4
source/blender/editors/space_clip/space_clip.cc
View File

@@ -1161,8 +1161,8 @@ static void clip_id_remap(ScrArea * /*area*/,
return;
}
mappings.apply((ID **)&sclip->clip, ID_REMAP_APPLY_ENSURE_REAL);
mappings.apply((ID **)&sclip->mask_info.mask, ID_REMAP_APPLY_ENSURE_REAL);
mappings.apply(reinterpret_cast<ID **>(&sclip->clip), ID_REMAP_APPLY_ENSURE_REAL);
mappings.apply(reinterpret_cast<ID **>(&sclip->mask_info.mask), ID_REMAP_APPLY_ENSURE_REAL);
}
static void clip_foreach_id(SpaceLink *space_link, LibraryForeachIDData *data)

4
source/blender/editors/space_graph/space_graph.cc
View File

@@ -821,8 +821,8 @@ static void graph_id_remap(ScrArea * /*area*/,
return;
}
mappings.apply((ID **)&sgraph->ads->filter_grp, ID_REMAP_APPLY_DEFAULT);
mappings.apply((ID **)&sgraph->ads->source, ID_REMAP_APPLY_DEFAULT);
mappings.apply(reinterpret_cast<ID **>(&sgraph->ads->filter_grp), ID_REMAP_APPLY_DEFAULT);
mappings.apply(reinterpret_cast<ID **>(&sgraph->ads->source), ID_REMAP_APPLY_DEFAULT);
}
static void graph_foreach_id(SpaceLink *space_link, LibraryForeachIDData *data)

6
source/blender/editors/space_image/space_image.cc
View File

@@ -1017,9 +1017,9 @@ static void image_id_remap(ScrArea * /*area*/,
return;
}
mappings.apply((ID **)&simg->image, ID_REMAP_APPLY_ENSURE_REAL);
mappings.apply((ID **)&simg->gpd, ID_REMAP_APPLY_UPDATE_REFCOUNT);
mappings.apply((ID **)&simg->mask_info.mask, ID_REMAP_APPLY_ENSURE_REAL);
mappings.apply(reinterpret_cast<ID **>(&simg->image), ID_REMAP_APPLY_ENSURE_REAL);
mappings.apply(reinterpret_cast<ID **>(&simg->gpd), ID_REMAP_APPLY_UPDATE_REFCOUNT);
mappings.apply(reinterpret_cast<ID **>(&simg->mask_info.mask), ID_REMAP_APPLY_ENSURE_REAL);
}
static void image_foreach_id(SpaceLink *space_link, LibraryForeachIDData *data)

2
source/blender/editors/space_sequencer/space_sequencer.cc
View File

@@ -915,7 +915,7 @@ static void sequencer_id_remap(ScrArea * /*area*/,
const blender::bke::id::IDRemapper &mappings)
{
SpaceSeq *sseq = (SpaceSeq *)slink;
mappings.apply((ID **)&sseq->gpd, ID_REMAP_APPLY_DEFAULT);
mappings.apply(reinterpret_cast<ID **>(&sseq->gpd), ID_REMAP_APPLY_DEFAULT);
}
static void sequencer_foreach_id(SpaceLink *space_link, LibraryForeachIDData *data)

2
source/blender/editors/space_text/space_text.cc
View File

@@ -394,7 +394,7 @@ static void text_id_remap(ScrArea * /*area*/,
const blender::bke::id::IDRemapper &mappings)
{
SpaceText *stext = (SpaceText *)slink;
mappings.apply((ID **)&stext->text, ID_REMAP_APPLY_ENSURE_REAL);
mappings.apply(reinterpret_cast<ID **>(&stext->text), ID_REMAP_APPLY_ENSURE_REAL);
}
static void text_foreach_id(SpaceLink *space_link, LibraryForeachIDData *data)

5
source/blender/editors/space_view3d/space_view3d.cc
View File

@@ -2002,7 +2002,7 @@ static void space_view3d_refresh(const bContext *C, ScrArea *area)
static void view3d_id_remap_v3d_ob_centers(View3D *v3d,
const blender::bke::id::IDRemapper &mappings)
{
if (mappings.apply((ID **)&v3d->ob_center, ID_REMAP_APPLY_DEFAULT) ==
if (mappings.apply(reinterpret_cast<ID **>(&v3d->ob_center), ID_REMAP_APPLY_DEFAULT) ==
ID_REMAP_RESULT_SOURCE_UNASSIGNED)
{
/* Otherwise, bone-name may remain valid...
@@ -2017,7 +2017,7 @@ static void view3d_id_remap_v3d(ScrArea *area,
const blender::bke::id::IDRemapper &mappings,
const bool is_local)
{
if (mappings.apply((ID **)&v3d->camera, ID_REMAP_APPLY_DEFAULT) ==
if (mappings.apply(reinterpret_cast<ID **>(&v3d->camera), ID_REMAP_APPLY_DEFAULT) ==
ID_REMAP_RESULT_SOURCE_UNASSIGNED)
{
/* 3D view might be inactive, in that case needs to use slink->regionbase */
@@ -2039,7 +2039,6 @@ static void view3d_id_remap(ScrArea *area,
SpaceLink *slink,
const blender::bke::id::IDRemapper &mappings)
{
if (!mappings.contains_mappings_for_any(FILTER_ID_OB | FILTER_ID_MA | FILTER_ID_IM |
FILTER_ID_MC))
{