[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [56001] trunk/blender/source/blender: code cleanup: use `const char` for args and replace wm_keyconfig_list_find () -> BLI_findstring()

Campbell Barton ideasman42 at gmail.com
Sat Apr 13 06:28:12 CEST 2013


Revision: 56001
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=56001
Author:   campbellbarton
Date:     2013-04-13 04:28:04 +0000 (Sat, 13 Apr 2013)
Log Message:
-----------
code cleanup: use `const char` for args and replace wm_keyconfig_list_find() -> BLI_findstring()

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/BKE_sequencer.h
    trunk/blender/source/blender/blenkernel/intern/seqmodifier.c
    trunk/blender/source/blender/editors/armature/armature_add.c
    trunk/blender/source/blender/editors/armature/armature_naming.c
    trunk/blender/source/blender/editors/curve/editcurve.c
    trunk/blender/source/blender/editors/object/object_vgroup.c
    trunk/blender/source/blender/windowmanager/intern/wm_keymap.c

Modified: trunk/blender/source/blender/blenkernel/BKE_sequencer.h
===================================================================
--- trunk/blender/source/blender/blenkernel/BKE_sequencer.h	2013-04-13 03:07:49 UTC (rev 56000)
+++ trunk/blender/source/blender/blenkernel/BKE_sequencer.h	2013-04-13 04:28:04 UTC (rev 56001)
@@ -409,7 +409,7 @@
 void BKE_sequence_modifier_clear(struct Sequence *seq);
 void BKE_sequence_modifier_free(struct SequenceModifierData *smd);
 void BKE_sequence_modifier_unique_name(struct Sequence *seq, struct SequenceModifierData *smd);
-struct SequenceModifierData *BKE_sequence_modifier_find_by_name(struct Sequence *seq, char *name);
+struct SequenceModifierData *BKE_sequence_modifier_find_by_name(struct Sequence *seq, const char *name);
 struct ImBuf *BKE_sequence_modifier_apply_stack(SeqRenderData context, struct Sequence *seq, struct ImBuf *ibuf, int cfra);
 void BKE_sequence_modifier_list_copy(struct Sequence *seqn, struct Sequence *seq);
 

Modified: trunk/blender/source/blender/blenkernel/intern/seqmodifier.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/seqmodifier.c	2013-04-13 03:07:49 UTC (rev 56000)
+++ trunk/blender/source/blender/blenkernel/intern/seqmodifier.c	2013-04-13 04:28:04 UTC (rev 56001)
@@ -578,7 +578,7 @@
 	               offsetof(SequenceModifierData, name), sizeof(smd->name));
 }
 
-SequenceModifierData *BKE_sequence_modifier_find_by_name(Sequence *seq, char *name)
+SequenceModifierData *BKE_sequence_modifier_find_by_name(Sequence *seq, const char *name)
 {
 	return BLI_findstring(&(seq->modifiers), name, offsetof(SequenceModifierData, name));
 }

Modified: trunk/blender/source/blender/editors/armature/armature_add.c
===================================================================
--- trunk/blender/source/blender/editors/armature/armature_add.c	2013-04-13 03:07:49 UTC (rev 56000)
+++ trunk/blender/source/blender/editors/armature/armature_add.c	2013-04-13 04:28:04 UTC (rev 56001)
@@ -279,7 +279,7 @@
 }
 
 
-static EditBone *get_named_editbone(ListBase *edbo, char *name)
+static EditBone *get_named_editbone(ListBase *edbo, const char *name)
 {
 	EditBone  *eBone;
 

Modified: trunk/blender/source/blender/editors/armature/armature_naming.c
===================================================================
--- trunk/blender/source/blender/editors/armature/armature_naming.c	2013-04-13 03:07:49 UTC (rev 56000)
+++ trunk/blender/source/blender/editors/armature/armature_naming.c	2013-04-13 04:28:04 UTC (rev 56001)
@@ -104,7 +104,7 @@
 }
 
 /* helper call for armature_bone_rename */
-static void constraint_bone_name_fix(Object *ob, ListBase *conlist, char *oldname, char *newname)
+static void constraint_bone_name_fix(Object *ob, ListBase *conlist, const char *oldname, const char *newname)
 {
 	bConstraint *curcon;
 	bConstraintTarget *ct;

Modified: trunk/blender/source/blender/editors/curve/editcurve.c
===================================================================
--- trunk/blender/source/blender/editors/curve/editcurve.c	2013-04-13 03:07:49 UTC (rev 56000)
+++ trunk/blender/source/blender/editors/curve/editcurve.c	2013-04-13 04:28:04 UTC (rev 56001)
@@ -1028,7 +1028,8 @@
 	return ad && (ad->action || ad->drivers.first);
 }
 
-static void fcurve_path_rename(AnimData *adt, char *orig_rna_path, char *rna_path, ListBase *orig_curves, ListBase *curves)
+static void fcurve_path_rename(AnimData *adt, const char *orig_rna_path, char *rna_path,
+                               ListBase *orig_curves, ListBase *curves)
 {
 	FCurve *fcu, *nfcu, *nextfcu;
 	int len = strlen(orig_rna_path);

Modified: trunk/blender/source/blender/editors/object/object_vgroup.c
===================================================================
--- trunk/blender/source/blender/editors/object/object_vgroup.c	2013-04-13 03:07:49 UTC (rev 56000)
+++ trunk/blender/source/blender/editors/object/object_vgroup.c	2013-04-13 04:28:04 UTC (rev 56001)
@@ -3479,7 +3479,7 @@
 	return name_array;
 }
 
-static int vgroup_do_remap(Object *ob, char *name_array, wmOperator *op)
+static int vgroup_do_remap(Object *ob, const char *name_array, wmOperator *op)
 {
 	MDeformVert *dvert = NULL;
 	bDeformGroup *def;
@@ -3489,7 +3489,7 @@
 	int *sort_map_update = MEM_mallocN(sizeof(int) * (defbase_tot + 1), "sort vgroups");
 	int *sort_map = sort_map_update + 1;
 
-	char *name;
+	const char *name;
 	int i;
 
 	name = name_array;

Modified: trunk/blender/source/blender/windowmanager/intern/wm_keymap.c
===================================================================
--- trunk/blender/source/blender/windowmanager/intern/wm_keymap.c	2013-04-13 03:07:49 UTC (rev 56000)
+++ trunk/blender/source/blender/windowmanager/intern/wm_keymap.c	2013-04-13 04:28:04 UTC (rev 56001)
@@ -220,23 +220,12 @@
 	MEM_freeN(keyconf);
 }
 
-static wmKeyConfig *wm_keyconfig_list_find(ListBase *lb, char *idname)
-{
-	wmKeyConfig *kc;
-
-	for (kc = lb->first; kc; kc = kc->next)
-		if (0 == strncmp(idname, kc->idname, KMAP_MAX_NAME))
-			return kc;
-	
-	return NULL;
-}
-
 static wmKeyConfig *WM_keyconfig_active(wmWindowManager *wm)
 {
 	wmKeyConfig *keyconf;
 
 	/* first try from preset */
-	keyconf = wm_keyconfig_list_find(&wm->keyconfigs, U.keyconfigstr);
+	keyconf = BLI_findstring(&wm->keyconfigs, U.keyconfigstr, offsetof(wmKeyConfig, idname));
 	if (keyconf)
 		return keyconf;
 	




More information about the Bf-blender-cvs mailing list