style cleanup: format 'for' loop macros the same as for loops, some renaming to BLI_array macros.

3 files changed, 23 insertions, 28 deletions

diff --git a/source/blender/editors/space_sequencer/sequencer_add.c b/source/blender/editors/space_sequencer/sequencer_add.c
index dfa733deac6..09d974fe4b8 100644
--- a/source/blender/editors/space_sequencer/sequencer_add.c
+++ b/source/blender/editors/space_sequencer/sequencer_add.c
@@ -188,7 +188,7 @@ static void seq_load_operator_info(SeqLoadInfo *seq_load, wmOperator *op)
 	else if (RNA_struct_find_property(op->ptr, "files")) {
 		/* used for image strip */
 		/* best guess, first images name */
-		RNA_BEGIN(op->ptr, itemptr, "files") {
+		RNA_BEGIN (op->ptr, itemptr, "files") {
 			char *name = RNA_string_get_alloc(&itemptr, "name", NULL, 0);
 			BLI_strncpy(seq_load->name, name, sizeof(seq_load->name));
 			MEM_freeN(name);
@@ -420,8 +420,7 @@ static int sequencer_add_generic_strip_exec(bContext *C, wmOperator *op, SeqLoad
 
 		BLI_split_dir_part(seq_load.path, dir_only, sizeof(dir_only));
 
-		RNA_BEGIN(op->ptr, itemptr, "files")
-		{
+		RNA_BEGIN (op->ptr, itemptr, "files") {
 			RNA_string_get(&itemptr, "name", file_only);
 			BLI_join_dirfile(seq_load.path, sizeof(seq_load.path), dir_only, file_only);
 
@@ -595,7 +594,7 @@ static int sequencer_add_image_strip_exec(bContext *C, wmOperator *op)
 	strip = seq->strip;
 	se = strip->stripdata;
 
-	RNA_BEGIN(op->ptr, itemptr, "files") {
+	RNA_BEGIN (op->ptr, itemptr, "files") {
 		char *filename = RNA_string_get_alloc(&itemptr, "name", NULL, 0);
 		BLI_strncpy(se->name, filename, sizeof(se->name));
 		MEM_freeN(filename);
diff --git a/source/blender/editors/space_sequencer/sequencer_edit.c b/source/blender/editors/space_sequencer/sequencer_edit.c
index 5bd1ba4dcf2..d2b1cccfefc 100644
--- a/source/blender/editors/space_sequencer/sequencer_edit.c
+++ b/source/blender/editors/space_sequencer/sequencer_edit.c
@@ -201,7 +201,7 @@ static void seq_proxy_build_job(const bContext *C)
 		WM_jobs_callbacks(steve, proxy_startjob, NULL, NULL, proxy_endjob);
 	}
 
-	SEQP_BEGIN(ed, seq) {
+	SEQP_BEGIN (ed, seq) {
 		if ((seq->flag & SELECT)) {
 			context = seq_proxy_rebuild_context(pj->main, pj->scene, seq);
 			link = BLI_genericNodeN(context);
@@ -461,8 +461,7 @@ void deselect_all_seq(Scene *scene)
 	
 	if (ed == NULL) return;
 
-	SEQP_BEGIN(ed, seq)
-	{
+	SEQP_BEGIN (ed, seq) {
 		seq->flag &= ~SEQ_ALLSEL;
 	}
 	SEQ_END
@@ -845,7 +844,7 @@ static int insert_gap(Scene *scene, int gap, int cfra)
 	
 	if (ed == NULL) return 0;
 
-	SEQP_BEGIN(ed, seq) {
+	SEQP_BEGIN (ed, seq) {
 		if (seq->startdisp >= cfra) {
 			seq->start += gap;
 			calc_sequence(scene, seq);
@@ -871,8 +870,7 @@ static void UNUSED_FUNCTION(touch_seq_files) (Scene * scene)
 
 	WM_cursor_wait(1);
 
-	SEQP_BEGIN(ed, seq)
-	{
+	SEQP_BEGIN (ed, seq) {
 		if (seq->flag & SELECT) {
 			if (seq->type == SEQ_MOVIE) {
 				if (seq->strip && seq->strip->stripdata) {
@@ -899,8 +897,7 @@ static void set_filter_seq(Scene *scene)
 
 	if (okee("Set Deinterlace") == 0) return;
 
-	SEQP_BEGIN(ed, seq)
-	{
+	SEQP_BEGIN (ed, seq) {
 		if (seq->flag & SELECT) {
 			if (seq->type == SEQ_MOVIE) {
 				seq->flag |= SEQ_FILTERY;
@@ -935,8 +932,7 @@ static void UNUSED_FUNCTION(seq_remap_paths) (Scene * scene)
 	if (strcmp(to, from) == 0)
 		return;
 	
-	SEQP_BEGIN(ed, seq)
-	{
+	SEQP_BEGIN (ed, seq) {
 		if (seq->flag & SELECT) {
 			if (strncmp(seq->strip->dir, from, strlen(from)) == 0) {
 				printf("found %s\n", seq->strip->dir);
@@ -1481,7 +1477,7 @@ static int sequencer_cut_exec(bContext *C, wmOperator *op)
 		BLI_movelisttolist(ed->seqbasep, &newlist);
 
 		if (cut_side != SEQ_SIDE_BOTH) {
-			SEQP_BEGIN(ed, seq) {
+			SEQP_BEGIN (ed, seq) {
 				if (cut_side == SEQ_SIDE_LEFT) {
 					if (seq->startdisp >= cut_frame) {
 						seq->flag &= ~SEQ_ALLSEL;
@@ -3014,7 +3010,7 @@ static int sequencer_change_path_exec(bContext *C, wmOperator *op)
 		}
 		seq->strip->stripdata = se = MEM_callocN(len * sizeof(StripElem), "stripelem");
 
-		RNA_BEGIN(op->ptr, itemptr, "files") {
+		RNA_BEGIN (op->ptr, itemptr, "files") {
 			char *filename = RNA_string_get_alloc(&itemptr, "name", NULL, 0);
 			BLI_strncpy(se->name, filename, sizeof(se->name));
 			MEM_freeN(filename);
diff --git a/source/blender/editors/space_sequencer/sequencer_select.c b/source/blender/editors/space_sequencer/sequencer_select.c
index 2447ca6cfbe..f326052ea60 100644
--- a/source/blender/editors/space_sequencer/sequencer_select.c
+++ b/source/blender/editors/space_sequencer/sequencer_select.c
@@ -362,7 +362,7 @@ static int sequencer_select_invoke(bContext *C, wmOperator *op, wmEvent *event)
 		deselect_all_seq(scene);
 		UI_view2d_region_to_view(v2d, event->mval[0], event->mval[1], &x, NULL);
 
-		SEQP_BEGIN(ed, seq)
+		SEQP_BEGIN (ed, seq)
 		{
 			if (x < CFRA) {
 				if (seq->enddisp < CFRA) {
@@ -940,7 +940,7 @@ static short select_grouped_type(Editing *ed, Sequence *actseq)
 	Sequence *seq;
 	short changed = FALSE;
 
-	SEQP_BEGIN(ed, seq) {
+	SEQP_BEGIN (ed, seq) {
 		if (seq->type == actseq->type) {
 			seq->flag |= SELECT;
 			changed = TRUE;
@@ -957,7 +957,7 @@ static short select_grouped_type_basic(Editing *ed, Sequence *actseq)
 	short changed = FALSE;
 	short is_sound = SEQ_IS_SOUND(actseq);
 
-	SEQP_BEGIN(ed, seq) {
+	SEQP_BEGIN (ed, seq) {
 		if (is_sound ? SEQ_IS_SOUND(seq) : !SEQ_IS_SOUND(seq)) {
 			seq->flag |= SELECT;
 			changed = TRUE;
@@ -974,7 +974,7 @@ static short select_grouped_type_effect(Editing *ed, Sequence *actseq)
 	short changed = FALSE;
 	short is_effect = SEQ_IS_EFFECT(actseq);
 
-	SEQP_BEGIN(ed, seq) {
+	SEQP_BEGIN (ed, seq) {
 		if (is_effect ? SEQ_IS_EFFECT(seq) : !SEQ_IS_EFFECT(seq)) {
 			seq->flag |= SELECT;
 			changed = TRUE;
@@ -995,7 +995,7 @@ static short select_grouped_data(Editing *ed, Sequence *actseq)
 		return changed;
 
 	if (SEQ_HAS_PATH(actseq) && dir) {
-		SEQP_BEGIN(ed, seq) {
+		SEQP_BEGIN (ed, seq) {
 			if (SEQ_HAS_PATH(seq) && seq->strip && strcmp(seq->strip->dir, dir) == 0) {
 				seq->flag |= SELECT;
 				changed = TRUE;
@@ -1005,7 +1005,7 @@ static short select_grouped_data(Editing *ed, Sequence *actseq)
 	}
 	else if (actseq->type == SEQ_SCENE) {
 		Scene *sce = actseq->scene;
-		SEQP_BEGIN(ed, seq) {
+		SEQP_BEGIN (ed, seq) {
 			if (seq->type == SEQ_SCENE && seq->scene == sce) {
 				seq->flag |= SELECT;
 				changed = TRUE;
@@ -1015,7 +1015,7 @@ static short select_grouped_data(Editing *ed, Sequence *actseq)
 	}
 	else if (actseq->type == SEQ_MOVIECLIP) {
 		MovieClip *clip = actseq->clip;
-		SEQP_BEGIN(ed, seq) {
+		SEQP_BEGIN (ed, seq) {
 			if (seq->type == SEQ_MOVIECLIP && seq->clip == clip) {
 				seq->flag |= SELECT;
 				changed = TRUE;
@@ -1037,14 +1037,14 @@ static short select_grouped_effect(Editing *ed, Sequence *actseq)
 	for (i = 0; i <= SEQ_EFFECT_MAX; i++)
 		effects[i] = FALSE;
 
-	SEQP_BEGIN(ed, seq) {
+	SEQP_BEGIN (ed, seq) {
 		if (ELEM3(actseq, seq->seq1, seq->seq2, seq->seq3)) {
 			effects[seq->type] = TRUE;
 		}
 	}
 	SEQ_END;
 
-	SEQP_BEGIN(ed, seq) {
+	SEQP_BEGIN (ed, seq) {
 		if (effects[seq->type]) {
 			if (seq->seq1) seq->seq1->flag |= SELECT;
 			if (seq->seq2) seq->seq2->flag |= SELECT;
@@ -1062,7 +1062,7 @@ static short select_grouped_time_overlap(Editing *ed, Sequence *actseq)
 	Sequence *seq;
 	short changed = FALSE;
 
-	SEQP_BEGIN(ed, seq) {
+	SEQP_BEGIN (ed, seq) {
 		if (!((seq->startdisp >= actseq->enddisp) || (seq->enddisp < actseq->startdisp))) {
 			seq->flag |= SELECT;
 			changed = TRUE;
@@ -1083,7 +1083,7 @@ static short select_grouped_effect_link(Editing *ed, Sequence *actseq)
 	int machine   = actseq->machine;
 	SeqIterator iter;
 
-	SEQP_BEGIN(ed, seq) {
+	SEQP_BEGIN (ed, seq) {
 		seq->tmp= NULL;
 	}
 	SEQ_END;
@@ -1153,7 +1153,7 @@ static int sequencer_select_grouped_exec(bContext *C, wmOperator *op)
 	}
 
 	if (extend == 0) {
-		SEQP_BEGIN(ed, seq) {
+		SEQP_BEGIN (ed, seq) {
 			seq->flag &= ~SELECT;
 			changed = TRUE;
 		}