[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [50488] trunk/blender/source/blender/ editors/interface/interface_handlers.c: style cleanup
Campbell Barton
ideasman42 at gmail.com
Mon Sep 10 03:34:45 CEST 2012
Revision: 50488
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=50488
Author: campbellbarton
Date: 2012-09-10 01:34:42 +0000 (Mon, 10 Sep 2012)
Log Message:
-----------
style cleanup
Modified Paths:
--------------
trunk/blender/source/blender/editors/interface/interface_handlers.c
Modified: trunk/blender/source/blender/editors/interface/interface_handlers.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface_handlers.c 2012-09-10 01:22:04 UTC (rev 50487)
+++ trunk/blender/source/blender/editors/interface/interface_handlers.c 2012-09-10 01:34:42 UTC (rev 50488)
@@ -122,8 +122,10 @@
/* overall state */
uiHandleButtonState state;
- int cancel, escapecancel, retval;
- int applied, appliedinteractive;
+ int retval;
+ /* booleans (could be made into flags) */
+ char cancel, escapecancel;
+ char applied, appliedinteractive;
wmTimer *flashtimer;
/* edited value */
@@ -463,7 +465,7 @@
ui_apply_but_func(C, but);
data->retval = but->retval;
- data->applied = 1;
+ data->applied = TRUE;
}
static void ui_apply_but_BUTM(bContext *C, uiBut *but, uiHandleButtonData *data)
@@ -472,7 +474,7 @@
ui_apply_but_func(C, but);
data->retval = but->retval;
- data->applied = 1;
+ data->applied = TRUE;
}
static void ui_apply_but_BLOCK(bContext *C, uiBut *but, uiHandleButtonData *data)
@@ -483,7 +485,7 @@
ui_check_but(but);
ui_apply_but_func(C, but);
data->retval = but->retval;
- data->applied = 1;
+ data->applied = TRUE;
}
static void ui_apply_but_TOG(bContext *C, uiBut *but, uiHandleButtonData *data)
@@ -542,7 +544,7 @@
ui_apply_but_func(C, but);
data->retval = but->retval;
- data->applied = 1;
+ data->applied = TRUE;
}
static void ui_apply_but_ROW(bContext *C, uiBlock *block, uiBut *but, uiHandleButtonData *data)
@@ -559,7 +561,7 @@
ui_apply_but_func(C, but);
data->retval = but->retval;
- data->applied = 1;
+ data->applied = TRUE;
}
static void ui_apply_but_TEX(bContext *C, uiBut *but, uiHandleButtonData *data)
@@ -578,7 +580,7 @@
ui_apply_but_func(C, but);
data->retval = but->retval;
- data->applied = 1;
+ data->applied = TRUE;
}
static void ui_apply_but_NUM(bContext *C, uiBut *but, uiHandleButtonData *data)
@@ -588,7 +590,7 @@
data->value = ui_get_but_val(but);
}
else {
- data->cancel = 1;
+ data->cancel = TRUE;
return;
}
}
@@ -599,7 +601,7 @@
ui_apply_but_func(C, but);
data->retval = but->retval;
- data->applied = 1;
+ data->applied = TRUE;
}
static void ui_apply_but_TOG3(bContext *C, uiBut *but, uiHandleButtonData *data)
@@ -634,7 +636,7 @@
ui_check_but(but);
ui_apply_but_func(C, but);
data->retval = but->retval;
- data->applied = 1;
+ data->applied = TRUE;
}
static void ui_apply_but_VEC(bContext *C, uiBut *but, uiHandleButtonData *data)
@@ -644,21 +646,21 @@
ui_apply_but_func(C, but);
data->retval = but->retval;
- data->applied = 1;
+ data->applied = TRUE;
}
static void ui_apply_but_COLORBAND(bContext *C, uiBut *but, uiHandleButtonData *data)
{
ui_apply_but_func(C, but);
data->retval = but->retval;
- data->applied = 1;
+ data->applied = TRUE;
}
static void ui_apply_but_CURVE(bContext *C, uiBut *but, uiHandleButtonData *data)
{
ui_apply_but_func(C, but);
data->retval = but->retval;
- data->applied = 1;
+ data->applied = TRUE;
}
static void ui_apply_but_IDPOIN(bContext *C, uiBut *but, uiHandleButtonData *data)
@@ -667,7 +669,7 @@
ui_check_but(but);
ui_apply_but_func(C, but);
data->retval = but->retval;
- data->applied = 1;
+ data->applied = TRUE;
}
#ifdef WITH_INTERNATIONAL
@@ -675,7 +677,7 @@
{
ui_apply_but_func(C, but);
data->retval = but->retval;
- data->applied = 1;
+ data->applied = TRUE;
}
#endif
@@ -712,7 +714,7 @@
wmDrag *drag;
button_activate_state(C, but, BUTTON_STATE_EXIT);
- data->cancel = 1;
+ data->cancel = TRUE;
drag = WM_event_start_drag(C, but->icon, but->dragtype, but->dragpoin, ui_get_but_val(but));
if (but->imb)
@@ -731,13 +733,10 @@
uiLink *link;
uiLinkLine *line, *nline;
int a, b;
-
- but = block->buttons.first;
- while (but) {
+
+ for (but = block->buttons.first; but; but = but->next) {
if (but->type == LINK && but->link) {
- line = but->link->lines.first;
- while (line) {
-
+ for (line = but->link->lines.first; line; line = nline) {
nline = line->next;
if (line->flag & UI_SELECT) {
@@ -771,10 +770,8 @@
MEM_freeN(line);
}
- line = nline;
}
}
- but = but->next;
}
}
@@ -786,10 +783,10 @@
link = from->link;
if (link) {
- line = link->lines.first;
- while (line) {
- if (line->from == from && line->to == to) return line;
- line = line->next;
+ for (line = link->lines.first; line; line = line->next) {
+ if (line->from == from && line->to == to) {
+ return line;
+ }
}
}
return NULL;
@@ -931,35 +928,35 @@
ui_apply_but_func(C, but);
data->retval = but->retval;
}
- data->applied = 1;
+ data->applied = TRUE;
}
static void ui_apply_but_IMAGE(bContext *C, uiBut *but, uiHandleButtonData *data)
{
ui_apply_but_func(C, but);
data->retval = but->retval;
- data->applied = 1;
+ data->applied = TRUE;
}
static void ui_apply_but_HISTOGRAM(bContext *C, uiBut *but, uiHandleButtonData *data)
{
ui_apply_but_func(C, but);
data->retval = but->retval;
- data->applied = 1;
+ data->applied = TRUE;
}
static void ui_apply_but_WAVEFORM(bContext *C, uiBut *but, uiHandleButtonData *data)
{
ui_apply_but_func(C, but);
data->retval = but->retval;
- data->applied = 1;
+ data->applied = TRUE;
}
static void ui_apply_but_TRACKPREVIEW(bContext *C, uiBut *but, uiHandleButtonData *data)
{
ui_apply_but_func(C, but);
data->retval = but->retval;
- data->applied = 1;
+ data->applied = TRUE;
}
@@ -990,10 +987,12 @@
else {
/* we avoid applying interactive edits a second time
* at the end with the appliedinteractive flag */
- if (interactive)
- data->appliedinteractive = 1;
- else if (data->appliedinteractive)
+ if (interactive) {
+ data->appliedinteractive = TRUE;
+ }
+ else if (data->appliedinteractive) {
return;
+ }
}
/* ensures we are writing actual values */
@@ -1219,7 +1218,7 @@
button_activate_state(C, but, BUTTON_STATE_TEXT_EDITING);
BLI_strncpy(buf, active_data->str, UI_MAX_DRAW_STR);
WM_clipboard_text_set(active_data->str, 0);
- active_data->cancel = 1;
+ active_data->cancel = TRUE;
button_activate_state(C, but, BUTTON_STATE_EXIT);
}
else {
@@ -1792,8 +1791,8 @@
break;
case RIGHTMOUSE:
case ESCKEY:
- data->cancel = 1;
- data->escapecancel = 1;
+ data->cancel = TRUE;
+ data->escapecancel = TRUE;
button_activate_state(C, but, BUTTON_STATE_EXIT);
retval = WM_UI_HANDLER_BREAK;
break;
@@ -1819,7 +1818,7 @@
else if (inbox == 0) {
/* if searchbox, click outside will cancel */
if (data->searchbox)
- data->cancel = data->escapecancel = 1;
+ data->cancel = data->escapecancel = TRUE;
button_activate_state(C, but, BUTTON_STATE_EXIT);
retval = WM_UI_HANDLER_BREAK;
}
@@ -2155,7 +2154,7 @@
else if (data->state == BUTTON_STATE_WAIT_RELEASE) {
if (event->type == LEFTMOUSE && event->val != KM_PRESS) {
if (!(but->flag & UI_SELECT))
- data->cancel = 1;
+ data->cancel = TRUE;
button_activate_state(C, but, BUTTON_STATE_EXIT);
return WM_UI_HANDLER_BREAK;
}
@@ -2186,7 +2185,7 @@
if (but->flag & UI_BUT_IMMEDIATE)
ui_set_but_val(but, 0);
else
- data->cancel = 1;
+ data->cancel = TRUE;
button_activate_state(C, but, BUTTON_STATE_EXIT);
return WM_UI_HANDLER_BREAK;
}
@@ -2208,14 +2207,14 @@
if (WM_key_event_string(event->type)[0])
ui_set_but_val(but, event->type);
else
- data->cancel = 1;
+ data->cancel = TRUE;
button_activate_state(C, but, BUTTON_STATE_EXIT);
return WM_UI_HANDLER_BREAK;
}
else if (event->type == ESCKEY) {
- data->cancel = 1;
- data->escapecancel = 1;
+ data->cancel = TRUE;
+ data->escapecancel = TRUE;
button_activate_state(C, but, BUTTON_STATE_EXIT);
}
@@ -2241,7 +2240,7 @@
if (WM_key_event_string(event->type)[0])
ui_set_but_val(but, event->type);
else
- data->cancel = 1;
+ data->cancel = TRUE;
button_activate_state(C, but, BUTTON_STATE_EXIT);
}
@@ -2589,8 +2588,8 @@
}
else if (data->state == BUTTON_STATE_NUM_EDITING) {
if (event->type == ESCKEY) {
- data->cancel = 1;
- data->escapecancel = 1;
+ data->cancel = TRUE;
+ data->escapecancel = TRUE;
button_activate_state(C, but, BUTTON_STATE_EXIT);
}
else if (event->type == LEFTMOUSE && event->val != KM_PRESS) {
@@ -2640,7 +2639,7 @@
if (temp >= softmin && temp <= softmax)
data->value = (double)temp;
else
- data->cancel = 1;
+ data->cancel = TRUE;
button_activate_state(C, but, BUTTON_STATE_EXIT);
}
@@ -2651,7 +2650,7 @@
if (temp >= softmin && temp <= softmax)
data->value = (double)temp;
else
- data->cancel = 1;
+ data->cancel = TRUE;
button_activate_state(C, but, BUTTON_STATE_EXIT);
}
@@ -2811,8 +2810,8 @@
}
else if (data->state == BUTTON_STATE_NUM_EDITING) {
if (event->type == ESCKEY) {
- data->cancel = 1;
- data->escapecancel = 1;
+ data->cancel = TRUE;
+ data->escapecancel = TRUE;
button_activate_state(C, but, BUTTON_STATE_EXIT);
}
else if (event->type == LEFTMOUSE && event->val != KM_PRESS) {
@@ -2870,7 +2869,7 @@
if (temp >= softmin && temp <= softmax)
data->value = temp;
else
- data->cancel = 1;
+ data->cancel = TRUE;
}
else {
if (f < tempf) tempf -= 0.01f;
@@ -2879,7 +2878,7 @@
if (tempf >= softmin && tempf <= softmax)
data->value = tempf;
else
- data->cancel = 1;
+ data->cancel = TRUE;
}
button_activate_state(C, but, BUTTON_STATE_EXIT);
@@ -2928,8 +2927,8 @@
}
else if (data->state == BUTTON_STATE_NUM_EDITING) {
if (event->type == ESCKEY) {
- data->cancel = 1;
- data->escapecancel = 1;
+ data->cancel = TRUE;
+ data->escapecancel = TRUE;
button_activate_state(C, but, BUTTON_STATE_EXIT);
}
else if (event->type == LEFTMOUSE && event->val != KM_PRESS) {
@@ -3031,7 +3030,7 @@
/* outside icon quit, not needed if drag activated */
if (0 == ui_but_mouse_inside_icon(but, data->region, event)) {
button_activate_state(C, but, BUTTON_STATE_EXIT);
- data->cancel = 1;
+ data->cancel = TRUE;
return WM_UI_HANDLER_BREAK;
}
@@ -3342,8 +3341,8 @@
}
else if (data->state == BUTTON_STATE_NUM_EDITING) {
if (event->type == ESCKEY) {
- data->cancel = 1;
- data->escapecancel = 1;
+ data->cancel = TRUE;
+ data->escapecancel = TRUE;
button_activate_state(C, but, BUTTON_STATE_EXIT);
}
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list