[Bf-blender-cvs] [494c3ba063d] master: Cleanup: quiet warning mixing enum/int & replace NULL with nullptr
Campbell Barton
noreply at git.blender.org
Wed Jan 11 03:06:45 CET 2023
Commit: 494c3ba063d89781b085291ccebb5741bdb90ab7
Author: Campbell Barton
Date: Wed Jan 11 13:03:51 2023 +1100
Branches: master
https://developer.blender.org/rB494c3ba063d89781b085291ccebb5741bdb90ab7
Cleanup: quiet warning mixing enum/int & replace NULL with nullptr
===================================================================
M source/blender/editors/space_file/filesel.cc
M source/blender/makesrna/intern/rna_gpencil_modifier.c
===================================================================
diff --git a/source/blender/editors/space_file/filesel.cc b/source/blender/editors/space_file/filesel.cc
index 32181a9f5f6..446e5434edf 100644
--- a/source/blender/editors/space_file/filesel.cc
+++ b/source/blender/editors/space_file/filesel.cc
@@ -94,7 +94,7 @@ static void fileselect_initialize_params_common(SpaceFile *sfile, FileSelectPara
static void fileselect_ensure_updated_asset_params(SpaceFile *sfile)
{
BLI_assert(sfile->browse_mode == FILE_BROWSE_MODE_ASSETS);
- BLI_assert(sfile->op == NULL);
+ BLI_assert(sfile->op == nullptr);
FileAssetSelectParams *asset_params = sfile->asset_params;
@@ -158,11 +158,11 @@ static FileSelectParams *fileselect_ensure_updated_file_params(SpaceFile *sfile)
/* set the parameters from the operator, if it exists */
if (op) {
PropertyRNA *prop;
- const bool is_files = (RNA_struct_find_property(op->ptr, "files") != NULL);
- const bool is_filepath = (RNA_struct_find_property(op->ptr, "filepath") != NULL);
- const bool is_filename = (RNA_struct_find_property(op->ptr, "filename") != NULL);
- const bool is_directory = (RNA_struct_find_property(op->ptr, "directory") != NULL);
- const bool is_relative_path = (RNA_struct_find_property(op->ptr, "relative_path") != NULL);
+ const bool is_files = (RNA_struct_find_property(op->ptr, "files") != nullptr);
+ const bool is_filepath = (RNA_struct_find_property(op->ptr, "filepath") != nullptr);
+ const bool is_filename = (RNA_struct_find_property(op->ptr, "filename") != nullptr);
+ const bool is_directory = (RNA_struct_find_property(op->ptr, "directory") != nullptr);
+ const bool is_relative_path = (RNA_struct_find_property(op->ptr, "relative_path") != nullptr);
BLI_strncpy_utf8(
params->title, WM_operatortype_name(op->type, op->ptr), sizeof(params->title));
@@ -208,68 +208,69 @@ static FileSelectParams *fileselect_ensure_updated_file_params(SpaceFile *sfile)
params->flag |= FILE_DIRSEL_ONLY;
}
if ((prop = RNA_struct_find_property(op->ptr, "check_existing"))) {
- params->flag |= RNA_property_boolean_get(op->ptr, prop) ? FILE_CHECK_EXISTING : 0;
+ params->flag |= RNA_property_boolean_get(op->ptr, prop) ? int(FILE_CHECK_EXISTING) : 0;
}
if ((prop = RNA_struct_find_property(op->ptr, "hide_props_region"))) {
- params->flag |= RNA_property_boolean_get(op->ptr, prop) ? FILE_HIDE_TOOL_PROPS : 0;
+ params->flag |= RNA_property_boolean_get(op->ptr, prop) ? int(FILE_HIDE_TOOL_PROPS) : 0;
}
params->filter = 0;
if ((prop = RNA_struct_find_property(op->ptr, "filter_blender"))) {
- params->filter |= RNA_property_boolean_get(op->ptr, prop) ? FILE_TYPE_BLENDER : 0;
+ params->filter |= RNA_property_boolean_get(op->ptr, prop) ? int(FILE_TYPE_BLENDER) : 0;
}
if ((prop = RNA_struct_find_property(op->ptr, "filter_blenlib"))) {
- params->filter |= RNA_property_boolean_get(op->ptr, prop) ? FILE_TYPE_BLENDERLIB : 0;
+ params->filter |= RNA_property_boolean_get(op->ptr, prop) ? int(FILE_TYPE_BLENDERLIB) : 0;
}
if ((prop = RNA_struct_find_property(op->ptr, "filter_backup"))) {
- params->filter |= RNA_property_boolean_get(op->ptr, prop) ? FILE_TYPE_BLENDER_BACKUP : 0;
+ params->filter |= RNA_property_boolean_get(op->ptr, prop) ? int(FILE_TYPE_BLENDER_BACKUP) :
+ 0;
}
if ((prop = RNA_struct_find_property(op->ptr, "filter_image"))) {
- params->filter |= RNA_property_boolean_get(op->ptr, prop) ? FILE_TYPE_IMAGE : 0;
+ params->filter |= RNA_property_boolean_get(op->ptr, prop) ? int(FILE_TYPE_IMAGE) : 0;
}
if ((prop = RNA_struct_find_property(op->ptr, "filter_movie"))) {
- params->filter |= RNA_property_boolean_get(op->ptr, prop) ? FILE_TYPE_MOVIE : 0;
+ params->filter |= RNA_property_boolean_get(op->ptr, prop) ? int(FILE_TYPE_MOVIE) : 0;
}
if ((prop = RNA_struct_find_property(op->ptr, "filter_python"))) {
- params->filter |= RNA_property_boolean_get(op->ptr, prop) ? FILE_TYPE_PYSCRIPT : 0;
+ params->filter |= RNA_property_boolean_get(op->ptr, prop) ? int(FILE_TYPE_PYSCRIPT) : 0;
}
if ((prop = RNA_struct_find_property(op->ptr, "filter_font"))) {
- params->filter |= RNA_property_boolean_get(op->ptr, prop) ? FILE_TYPE_FTFONT : 0;
+ params->filter |= RNA_property_boolean_get(op->ptr, prop) ? int(FILE_TYPE_FTFONT) : 0;
}
if ((prop = RNA_struct_find_property(op->ptr, "filter_sound"))) {
- params->filter |= RNA_property_boolean_get(op->ptr, prop) ? FILE_TYPE_SOUND : 0;
+ params->filter |= RNA_property_boolean_get(op->ptr, prop) ? int(FILE_TYPE_SOUND) : 0;
}
if ((prop = RNA_struct_find_property(op->ptr, "filter_text"))) {
- params->filter |= RNA_property_boolean_get(op->ptr, prop) ? FILE_TYPE_TEXT : 0;
+ params->filter |= RNA_property_boolean_get(op->ptr, prop) ? int(FILE_TYPE_TEXT) : 0;
}
if ((prop = RNA_struct_find_property(op->ptr, "filter_archive"))) {
- params->filter |= RNA_property_boolean_get(op->ptr, prop) ? FILE_TYPE_ARCHIVE : 0;
+ params->filter |= RNA_property_boolean_get(op->ptr, prop) ? int(FILE_TYPE_ARCHIVE) : 0;
}
if ((prop = RNA_struct_find_property(op->ptr, "filter_folder"))) {
- params->filter |= RNA_property_boolean_get(op->ptr, prop) ? FILE_TYPE_FOLDER : 0;
+ params->filter |= RNA_property_boolean_get(op->ptr, prop) ? int(FILE_TYPE_FOLDER) : 0;
}
if ((prop = RNA_struct_find_property(op->ptr, "filter_btx"))) {
- params->filter |= RNA_property_boolean_get(op->ptr, prop) ? FILE_TYPE_BTX : 0;
+ params->filter |= RNA_property_boolean_get(op->ptr, prop) ? int(FILE_TYPE_BTX) : 0;
}
if ((prop = RNA_struct_find_property(op->ptr, "filter_collada"))) {
- params->filter |= RNA_property_boolean_get(op->ptr, prop) ? FILE_TYPE_COLLADA : 0;
+ params->filter |= RNA_property_boolean_get(op->ptr, prop) ? int(FILE_TYPE_COLLADA) : 0;
}
if ((prop = RNA_struct_find_property(op->ptr, "filter_alembic"))) {
- params->filter |= RNA_property_boolean_get(op->ptr, prop) ? FILE_TYPE_ALEMBIC : 0;
+ params->filter |= RNA_property_boolean_get(op->ptr, prop) ? int(FILE_TYPE_ALEMBIC) : 0;
}
if ((prop = RNA_struct_find_property(op->ptr, "filter_usd"))) {
- params->filter |= RNA_property_boolean_get(op->ptr, prop) ? FILE_TYPE_USD : 0;
+ params->filter |= RNA_property_boolean_get(op->ptr, prop) ? int(FILE_TYPE_USD) : 0;
}
if ((prop = RNA_struct_find_property(op->ptr, "filter_obj"))) {
- params->filter |= RNA_property_boolean_get(op->ptr, prop) ? FILE_TYPE_OBJECT_IO : 0;
+ params->filter |= RNA_property_boolean_get(op->ptr, prop) ? int(FILE_TYPE_OBJECT_IO) : 0;
}
if ((prop = RNA_struct_find_property(op->ptr, "filter_volume"))) {
- params->filter |= RNA_property_boolean_get(op->ptr, prop) ? FILE_TYPE_VOLUME : 0;
+ params->filter |= RNA_property_boolean_get(op->ptr, prop) ? int(FILE_TYPE_VOLUME) : 0;
}
if ((prop = RNA_struct_find_property(op->ptr, "filter_glob"))) {
/* Protection against Python scripts not setting proper size limit. */
char *tmp = RNA_property_string_get_alloc(
- op->ptr, prop, params->filter_glob, sizeof(params->filter_glob), NULL);
+ op->ptr, prop, params->filter_glob, sizeof(params->filter_glob), nullptr);
if (tmp != params->filter_glob) {
BLI_strncpy(params->filter_glob, tmp, sizeof(params->filter_glob));
MEM_freeN(tmp);
@@ -366,14 +367,14 @@ FileSelectParams *ED_fileselect_ensure_active_params(SpaceFile *sfile)
}
BLI_assert_msg(0, "Invalid browse mode set in file space.");
- return NULL;
+ return nullptr;
}
FileSelectParams *ED_fileselect_get_active_params(const SpaceFile *sfile)
{
if (!sfile) {
/* Sometimes called in poll before space type was checked. */
- return NULL;
+ return nullptr;
}
switch ((eFileBrowse_Mode)sfile->browse_mode) {
@@ -384,23 +385,23 @@ FileSelectParams *ED_fileselect_get_active_params(const SpaceFile *sfile)
}
BLI_assert_msg(0, "Invalid browse mode set in file space.");
- return NULL;
+ return nullptr;
}
FileSelectParams *ED_fileselect_get_file_params(const SpaceFile *sfile)
{
- return (sfile->browse_mode == FILE_BROWSE_MODE_FILES) ? sfile->params : NULL;
+ return (sfile->browse_mode == FILE_BROWSE_MODE_FILES) ? sfile->params : nullptr;
}
FileAssetSelectParams *ED_fileselect_get_asset_params(const SpaceFile *sfile)
{
- return (sfile->browse_mode == FILE_BROWSE_MODE_ASSETS) ? sfile->asset_params : NULL;
+ return (sfile->browse_mode == FILE_BROWSE_MODE_ASSETS) ? sfile->asset_params : nullptr;
}
bool ED_fileselect_is_local_asset_library(const SpaceFile *sfile)
{
const FileAssetSelectParams *asset_params = ED_fileselect_get_asset_params(sfile);
- if (asset_params == NULL) {
+ if (asset_params == nullptr) {
return false;
}
return asset_params->asset_library_ref.type == ASSET_LIBRARY_LOCAL;
@@ -410,7 +411,7 @@ static void fileselect_refresh_asset_params(FileAssetSelectParams *asset_params)
{
AssetLibraryReference *library = &asset_params->asset_library_ref;
FileSelectParams *base_params = &asset_params->base_params;
- bUserAssetLibrary *user_library = NULL;
+ bUserAssetLibrary *user_library = nullptr;
/* Ensure valid repository, or fall-back to local one. */
if (library->type == ASSET_LIBRARY_CUSTOM) {
@@ -461,7 +462,7 @@ bool ED_fileselect_is_asset_browser(const SpaceFile *sfile)
struct AssetLibrary *ED_fileselect_active_asset_library_get(const SpaceFile *sfile)
{
if (!ED_fileselect_is_asset_browser(sfile) || !sfile->files) {
- return NULL;
+ return nullptr;
}
return filelist_asset_library(sfile->files);
@@ -470,13 +471,13 @@ struct AssetLibrary *ED_fileselect_active_asset_library_get(const SpaceFile *sfi
struct ID *ED_fileselect_active_asset_get(const SpaceFile *sfile)
{
if (!ED_fileselect_is_asset_browser(sfile)) {
- return NULL;
+ return nullptr;
}
FileSelectParams *params = ED_fileselect_get_active_params(sfile);
const FileDirEntry *file = filelist_file(sfile->files, p
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list