[Bf-blender-cvs] [51fdf4bdfc1] master: Cleanup: discarded-qualifier warning, mixing enum/ints

[Campbell Barton]

Commit: 51fdf4bdfc13e5cec2b34030508b3caaa4a7fef8
Author: Campbell Barton
Date:   Thu May 12 14:05:45 2022 +1000
Branches: master
https://developer.blender.org/rB51fdf4bdfc13e5cec2b34030508b3caaa4a7fef8

Cleanup: discarded-qualifier warning, mixing enum/ints

===================================================================

M	source/blender/blenkernel/BKE_image.h
M	source/blender/blenkernel/intern/image.cc
M	source/blender/editors/interface/interface_utils.cc

===================================================================

diff --git a/source/blender/blenkernel/BKE_image.h b/source/blender/blenkernel/BKE_image.h
index 42d0e66cf49..25f20b82900 100644
--- a/source/blender/blenkernel/BKE_image.h
+++ b/source/blender/blenkernel/BKE_image.h
@@ -454,7 +454,7 @@ bool BKE_image_is_dirty_writable(struct Image *image, bool *r_is_writable);
 int BKE_image_sequence_guess_offset(struct Image *image);
 bool BKE_image_has_anim(struct Image *image);
 bool BKE_image_has_packedfile(const struct Image *image);
-bool BKE_image_has_filepath(struct Image *ima);
+bool BKE_image_has_filepath(const struct Image *ima);
 /**
  * Checks the image buffer changes with time (not keyframed values).
  */
diff --git a/source/blender/blenkernel/intern/image.cc b/source/blender/blenkernel/intern/image.cc
index 27de9a37728..3d894f47ae0 100644
--- a/source/blender/blenkernel/intern/image.cc
+++ b/source/blender/blenkernel/intern/image.cc
@@ -5124,7 +5124,7 @@ bool BKE_image_has_packedfile(const Image *ima)
   return (BLI_listbase_is_empty(&ima->packedfiles) == false);
 }
 
-bool BKE_image_has_filepath(Image *ima)
+bool BKE_image_has_filepath(const Image *ima)
 {
   /* This could be improved to detect cases like //../../, currently path
    * remapping empty file paths empty. */
diff --git a/source/blender/editors/interface/interface_utils.cc b/source/blender/editors/interface/interface_utils.cc
index 47ba3433a9c..e68d8f12a1f 100644
--- a/source/blender/editors/interface/interface_utils.cc
+++ b/source/blender/editors/interface/interface_utils.cc
@@ -494,7 +494,7 @@ static bool add_collection_search_item(CollItemSearch *cis,
                             cis->name,
                             cis->data,
                             cis->iconid,
-                            cis->has_sep_char ? UI_BUT_HAS_SEP_CHAR : 0,
+                            cis->has_sep_char ? (uint64_t)UI_BUT_HAS_SEP_CHAR : 0,
                             name_prefix_offset);
 }