[Bf-blender-cvs] [c67bd49] master: Code cleanup: use 'const' for arrays (editors)
Campbell Barton
noreply at git.blender.org
Sat Apr 26 16:29:43 CEST 2014
Commit: c67bd49e5607cc3db7446d4b12e1346fc9b2c83a
Author: Campbell Barton
Date: Sun Apr 27 00:22:49 2014 +1000
https://developer.blender.org/rBc67bd49e5607cc3db7446d4b12e1346fc9b2c83a
Code cleanup: use 'const' for arrays (editors)
===================================================================
M source/blender/editors/animation/anim_channels_defines.c
M source/blender/editors/animation/keyframes_draw.c
M source/blender/editors/animation/keyframes_edit.c
M source/blender/editors/animation/keyingsets.c
M source/blender/editors/armature/pose_slide.c
M source/blender/editors/curve/editcurve.c
M source/blender/editors/curve/editfont.c
M source/blender/editors/interface/interface.c
M source/blender/editors/interface/interface_handlers.c
M source/blender/editors/interface/interface_icons.c
M source/blender/editors/interface/interface_ops.c
M source/blender/editors/interface/interface_panel.c
M source/blender/editors/interface/interface_regions.c
M source/blender/editors/interface/interface_widgets.c
M source/blender/editors/interface/resources.c
M source/blender/editors/mask/mask_draw.c
M source/blender/editors/mask/mask_relationships.c
M source/blender/editors/mesh/editface.c
M source/blender/editors/mesh/editmesh_knife.c
M source/blender/editors/mesh/editmesh_tools.c
M source/blender/editors/mesh/editmesh_utils.c
M source/blender/editors/object/object_relations.c
M source/blender/editors/physics/particle_edit.c
M source/blender/editors/render/render_internal.c
M source/blender/editors/screen/glutil.c
M source/blender/editors/screen/screendump.c
M source/blender/editors/sculpt_paint/paint_hide.c
M source/blender/editors/sculpt_paint/paint_image_2d.c
M source/blender/editors/sculpt_paint/paint_image_proj.c
M source/blender/editors/sculpt_paint/paint_utils.c
M source/blender/editors/sculpt_paint/paint_vertex.c
M source/blender/editors/sculpt_paint/sculpt.c
M source/blender/editors/space_clip/clip_editor.c
M source/blender/editors/space_clip/clip_ops.c
M source/blender/editors/space_clip/tracking_ops.c
M source/blender/editors/space_clip/tracking_select.c
M source/blender/editors/space_file/file_panels.c
M source/blender/editors/space_file/filelist.c
M source/blender/editors/space_file/filesel.c
M source/blender/editors/space_graph/graph_draw.c
M source/blender/editors/space_graph/graph_edit.c
M source/blender/editors/space_image/image_ops.c
M source/blender/editors/space_info/textview.c
M source/blender/editors/space_logic/logic_window.c
M source/blender/editors/space_node/node_edit.c
M source/blender/editors/space_node/node_view.c
M source/blender/editors/space_sequencer/sequencer_scopes.c
M source/blender/editors/space_sequencer/sequencer_select.c
M source/blender/editors/space_sequencer/sequencer_view.c
M source/blender/editors/space_text/text_autocomplete.c
M source/blender/editors/space_text/text_ops.c
M source/blender/editors/space_view3d/drawarmature.c
M source/blender/editors/space_view3d/drawobject.c
M source/blender/editors/space_view3d/view3d_draw.c
M source/blender/editors/space_view3d/view3d_iterators.c
M source/blender/editors/space_view3d/view3d_select.c
M source/blender/editors/transform/transform.c
M source/blender/editors/transform/transform_conversions.c
M source/blender/editors/transform/transform_generics.c
M source/blender/editors/transform/transform_input.c
M source/blender/editors/transform/transform_ops.c
M source/blender/editors/transform/transform_snap.c
M source/blender/editors/uvedit/uvedit_ops.c
M source/blender/editors/uvedit/uvedit_smart_stitch.c
M source/blender/editors/uvedit/uvedit_unwrap_ops.c
===================================================================
diff --git a/source/blender/editors/animation/anim_channels_defines.c b/source/blender/editors/animation/anim_channels_defines.c
index 44ac78e..8fb1765 100644
--- a/source/blender/editors/animation/anim_channels_defines.c
+++ b/source/blender/editors/animation/anim_channels_defines.c
@@ -3043,7 +3043,7 @@ short ANIM_channel_setting_get(bAnimContext *ac, bAnimListElem *ale, int setting
switch (ptrsize) {
case sizeof(int): /* integer pointer for setting */
{
- int *val = (int *)ptr;
+ const int *val = (int *)ptr;
if (negflag)
return ((*val) & flag) == 0;
@@ -3052,7 +3052,7 @@ short ANIM_channel_setting_get(bAnimContext *ac, bAnimListElem *ale, int setting
}
case sizeof(short): /* short pointer for setting */
{
- short *val = (short *)ptr;
+ const short *val = (short *)ptr;
if (negflag)
return ((*val) & flag) == 0;
@@ -3061,7 +3061,7 @@ short ANIM_channel_setting_get(bAnimContext *ac, bAnimListElem *ale, int setting
}
case sizeof(char): /* char pointer for setting */
{
- char *val = (char *)ptr;
+ const char *val = (char *)ptr;
if (negflag)
return ((*val) & flag) == 0;
diff --git a/source/blender/editors/animation/keyframes_draw.c b/source/blender/editors/animation/keyframes_draw.c
index 92ffdfe..d4cf98b 100644
--- a/source/blender/editors/animation/keyframes_draw.c
+++ b/source/blender/editors/animation/keyframes_draw.c
@@ -85,7 +85,7 @@
short compare_ak_cfraPtr(void *node, void *data)
{
ActKeyColumn *ak = (ActKeyColumn *)node;
- float *cframe = data;
+ const float *cframe = data;
float val = *cframe;
if (IS_EQT(val, ak->cfra, BEZT_BINARYSEARCH_THRESH))
@@ -270,7 +270,7 @@ static void add_masklay_to_keycolumns_list(DLRBT_Tree *keys, MaskLayerShape *mas
short compare_ab_cfraPtr(void *node, void *data)
{
ActKeyBlock *ab = (ActKeyBlock *)node;
- float *cframe = data;
+ const float *cframe = data;
float val = *cframe;
if (val < ab->start)
diff --git a/source/blender/editors/animation/keyframes_edit.c b/source/blender/editors/animation/keyframes_edit.c
index 4a16035..808ed75 100644
--- a/source/blender/editors/animation/keyframes_edit.c
+++ b/source/blender/editors/animation/keyframes_edit.c
@@ -1292,7 +1292,7 @@ KeyframeEditFunc ANIM_editkeyframes_buildselmap(short mode)
/* flush selection map values to the given beztriple */
short bezt_selmap_flush(KeyframeEditData *ked, BezTriple *bezt)
{
- char *map = ked->data;
+ const char *map = ked->data;
short on = map[ked->curIndex];
/* select or deselect based on whether the map allows it or not */
diff --git a/source/blender/editors/animation/keyingsets.c b/source/blender/editors/animation/keyingsets.c
index 53ebd65..dd8433f 100644
--- a/source/blender/editors/animation/keyingsets.c
+++ b/source/blender/editors/animation/keyingsets.c
@@ -916,7 +916,7 @@ int ANIM_apply_keyingset(bContext *C, ListBase *dsources, bAction *act, KeyingSe
ReportList *reports = CTX_wm_reports(C);
KS_Path *ksp;
int kflag = 0, success = 0;
- char *groupname = NULL;
+ const char *groupname = NULL;
/* sanity checks */
if (ks == NULL)
diff --git a/source/blender/editors/armature/pose_slide.c b/source/blender/editors/armature/pose_slide.c
index 56cc5c5..375cbb0 100644
--- a/source/blender/editors/armature/pose_slide.c
+++ b/source/blender/editors/armature/pose_slide.c
@@ -300,7 +300,7 @@ static void pose_slide_apply_props(tPoseSlideOp *pso, tPChanFCurveLink *pfl)
*/
for (ld = pfl->fcurves.first; ld; ld = ld->next) {
FCurve *fcu = (FCurve *)ld->data;
- char *bPtr, *pPtr;
+ const char *bPtr, *pPtr;
if (fcu->rna_path == NULL)
continue;
diff --git a/source/blender/editors/curve/editcurve.c b/source/blender/editors/curve/editcurve.c
index 50152b0..61a9a58 100644
--- a/source/blender/editors/curve/editcurve.c
+++ b/source/blender/editors/curve/editcurve.c
@@ -897,7 +897,7 @@ static void calc_shapeKeys(Object *obedit)
}
else {
int index;
- float *curofp;
+ const float *curofp;
if (oldkey) {
if (nu->bezt) {
@@ -1111,7 +1111,7 @@ static void curve_rename_fcurves(Curve *cu, ListBase *orig_curves)
next = fcu->next;
if (!strncmp(fcu->rna_path, "splines", 7)) {
- char *ch = strchr(fcu->rna_path, '.');
+ const char *ch = strchr(fcu->rna_path, '.');
if (ch && (!strncmp(ch, ".bezier_points", 14) || !strncmp(ch, ".points", 7)))
fcurve_remove(adt, orig_curves, fcu);
diff --git a/source/blender/editors/curve/editfont.c b/source/blender/editors/curve/editfont.c
index de067d6..1bcdbad 100644
--- a/source/blender/editors/curve/editfont.c
+++ b/source/blender/editors/curve/editfont.c
@@ -1790,7 +1790,7 @@ static int font_open_exec(bContext *C, wmOperator *op)
static int open_invoke(bContext *C, wmOperator *op, const wmEvent *UNUSED(event))
{
VFont *vfont = NULL;
- char *path;
+ const char *path;
PointerRNA idptr;
PropertyPointerRNA *pprop;
@@ -1879,7 +1879,7 @@ static void undoFont_to_editFont(void *strv, void *ecu, void *UNUSED(obdata))
{
Curve *cu = (Curve *)ecu;
EditFont *ef = cu->editfont;
- char *str = strv;
+ const char *str = strv;
ef->pos = *((short *)str);
ef->len = *((short *)(str + 2));
diff --git a/source/blender/editors/interface/interface.c b/source/blender/editors/interface/interface.c
index 6e13985..1b9dfd8 100644
--- a/source/blender/editors/interface/interface.c
+++ b/source/blender/editors/interface/interface.c
@@ -1534,14 +1534,14 @@ void ui_get_but_vectorf(uiBut *but, float vec[3])
}
}
else if (but->pointype == UI_BUT_POIN_CHAR) {
- char *cp = (char *)but->poin;
+ const char *cp = (char *)but->poin;
vec[0] = ((float)cp[0]) / 255.0f;
vec[1] = ((float)cp[1]) / 255.0f;
vec[2] = ((float)cp[2]) / 255.0f;
}
else if (but->pointype == UI_BUT_POIN_FLOAT) {
- float *fp = (float *)but->poin;
+ const float *fp = (float *)but->poin;
copy_v3_v3(vec, fp);
}
else {
diff --git a/source/blender/editors/interface/interface_handlers.c b/source/blender/editors/interface/interface_handlers.c
index 380f948..10951c6 100644
--- a/source/blender/editors/interface/interface_handlers.c
+++ b/source/blender/editors/interface/interface_handlers.c
@@ -7293,7 +7293,7 @@ static int ui_handle_list_event(bContext *C, const wmEvent *event, ARegion *ar)
if (dyn_data->items_filter_neworder || dyn_data->items_filter_flags) {
/* If we have a display order different from collection order, we have some work! */
int *org_order = MEM_mallocN(dyn_data->items_shown * sizeof(int), __func__);
- int *new_order = dyn_data->items_filter_neworder;
+ const int *new_order = dyn_data->items_filter_neworder;
int i, org_idx = -1, len = dyn_data->items_len;
int current_idx = -1;
int filter_exclude = ui_list->filter_flag & UILST_FLT_EXCLUDE;
diff --git a/source/blender/editors/interface/interface_icons.c b/source/blender/editors/interface/interface_icons.c
index 0f98800..f580bd6 100644
--- a/source/blender/editors/interface/interface_icons.c
+++ b/source/blender/editors/interface/interface_icons.c
@@ -719,7 +719,7 @@ static void init_iconfile_list(struct ListBase *list)
for (i = 0; i < totfile; i++) {
if ((dir[i].type & S_IFREG)) {
- char *filename = dir[i].relname;
+ const char *filename = dir[i].relname;
if (BLI_testextensie(filename, ".png")) {
/* loading all icons on file start is overkill & slows startup
diff --git a/source/blender/editors/interface/interface_ops.c b/source/blender/editors/interface/interface_ops.c
index cef7128..316a4d3 100644
--- a/source/blender/editors/interface/interface_ops.c
+++ b/source/blender/editors/interface/interface_ops.c
@@ -659,7 +659,7 @@ static void edittranslation_find_po_file(const char *root, const char *uilng, ch
/* Now try without the second iso code part (_ES in es_ES). */
{
- char *tc = NULL;
+ const char *tc = NULL;
size_t szt = 0;
tstr[0] = '\0';
diff --git a/source/blender/editors/interface/interface_panel.c b/source/blender/editors/interface/interface_panel.c
index e9a4119..46cf822 100644
--- a/source/blender/editors/interface/interface_panel.c
+++ b/source/blender/editors/interface/interface_panel.c
@@ -227,9 +227,9 @@ Panel *uiBeginPanel(ScrArea *sa, ARegion *ar, uiBlock *block, PanelType *pt, Pan
{
Panel *patab, *palast, *panext;
const char *drawname = CTX_IFACE_(pt->translation_context, pt->label);
- char *idname = pt->idname;
- char *tabname = pt->idname;
- char *hookname = NULL;
+ const char *idname = pt->idname;
+ const char *tabname = pt->idname;
+ const char *hookname = NULL;
const bool newpanel = (pa == NULL);
int align = panel_aligned(sa, ar);
diff --git a/source/blender/editors/interface/interface_regions.c b/source/blender/editors/interface/interface_regions.c
index 3b18007..3299b7b 100644
--- a/source/blender/editors/interface/interface_regions.c
+++ b/source/blender/editors/interface/interface_regions.c
@@ -1643,7 +1643,7 @@ static void ui_warp_pointer(int x, int y)
void ui_set_but_hsv(uiBut *but)
{
float col[3];
- float *hsv = ui_block_hsv_get(but->block);
+ const float *hsv = ui_block_hsv_get(but->block);
ui_color_picker_to_rgb_v(hsv, col);
@@ -1755,7 +1755,7 @@ static void do_color_wheel_rna_cb(bContext *UNUSED(C), void *bt1, void *UNUSED(a
uiBut *but = (uiBut *)bt1;
uiPopupBlockHandle *popup = but->block->handle;
float rgb[3];
- float *hsv = ui_block_hsv_get(but->block);
+ const float *hsv = ui_block_hsv_get(but->block);
bool use_display_colorspace = ui_color_picker_use_display_colorspace(but);
ui_color_picker_to_rgb_v(hsv, rgb);
@@ -2088,7 +2088,7 @@ static unsigned int ui_popup_string_hash(const char *str)
{
/* sometimes button contains hotkey, sometimes not, strip for proper compare */
int hash;
- char *delimit = strchr(str, UI_SEP_CHAR);
+ const char *delimit = strchr(str, UI_SEP_CHAR);
if (delimit) {
hash = BLI_ghashutil_strhash_n(str, delimit - str);
diff --git a/source/blender/editors/interface/interface_widgets.c b/source/blender/editors/interface/interface_widgets.c
index 4b18898..4d2bd18 100644
--- a/source/blender/editors/interface/interface_widgets.c
+++ b/source/blender/editors/interface
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list