[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [55766] trunk/blender/source: code cleanup : use bools in UI and WM code, quiet some shadow warnings, remove unused function uiEmboss()
Campbell Barton
ideasman42 at gmail.com
Thu Apr 4 04:05:12 CEST 2013
Revision: 55766
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=55766
Author: campbellbarton
Date: 2013-04-04 02:05:11 +0000 (Thu, 04 Apr 2013)
Log Message:
-----------
code cleanup: use bools in UI and WM code, quiet some shadow warnings, remove unused function uiEmboss()
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/intern/anim.c
trunk/blender/source/blender/blenkernel/intern/library.c
trunk/blender/source/blender/editors/include/UI_interface.h
trunk/blender/source/blender/editors/include/UI_interface_icons.h
trunk/blender/source/blender/editors/interface/interface.c
trunk/blender/source/blender/editors/interface/interface_draw.c
trunk/blender/source/blender/editors/interface/interface_handlers.c
trunk/blender/source/blender/editors/interface/interface_icons.c
trunk/blender/source/blender/editors/interface/interface_intern.h
trunk/blender/source/blender/editors/interface/interface_layout.c
trunk/blender/source/blender/editors/interface/interface_ops.c
trunk/blender/source/blender/editors/interface/interface_regions.c
trunk/blender/source/blender/editors/interface/interface_templates.c
trunk/blender/source/blender/editors/space_file/file_draw.c
trunk/blender/source/blender/editors/space_node/node_edit.c
trunk/blender/source/blender/editors/space_node/node_select.c
trunk/blender/source/blender/editors/space_outliner/outliner_draw.c
trunk/blender/source/blender/editors/space_view3d/view3d_ruler.c
trunk/blender/source/blender/editors/space_view3d/view3d_toolbar.c
trunk/blender/source/blender/imbuf/IMB_colormanagement.h
trunk/blender/source/blender/imbuf/intern/colormanagement.c
trunk/blender/source/blender/imbuf/intern/divers.c
trunk/blender/source/blender/makesrna/intern/rna_ui_api.c
trunk/blender/source/blender/windowmanager/WM_api.h
trunk/blender/source/blender/windowmanager/intern/wm.c
trunk/blender/source/blender/windowmanager/intern/wm_cursors.c
trunk/blender/source/blender/windowmanager/intern/wm_draw.c
trunk/blender/source/blender/windowmanager/intern/wm_event_system.c
trunk/blender/source/blender/windowmanager/intern/wm_init_exit.c
trunk/blender/source/blender/windowmanager/intern/wm_keymap.c
trunk/blender/source/blender/windowmanager/intern/wm_operators.c
trunk/blender/source/blender/windowmanager/intern/wm_window.c
trunk/blender/source/blenderplayer/bad_level_call_stubs/stubs.c
trunk/blender/source/creator/creator.c
Modified: trunk/blender/source/blender/blenkernel/intern/anim.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/anim.c 2013-04-03 20:10:08 UTC (rev 55765)
+++ trunk/blender/source/blender/blenkernel/intern/anim.c 2013-04-04 02:05:11 UTC (rev 55766)
@@ -1092,7 +1092,7 @@
/* get derived mesh */
dm_mask = CD_MASK_BAREMESH;
if (flag & DUPLILIST_FOR_RENDER)
- dm_mask |= CD_MASK_ORCO|CD_MASK_MLOOPUV;
+ dm_mask |= CD_MASK_ORCO | CD_MASK_MLOOPUV;
if (em) {
dm = editbmesh_get_derived_cage(scene, par, em, dm_mask);
Modified: trunk/blender/source/blender/blenkernel/intern/library.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/library.c 2013-04-03 20:10:08 UTC (rev 55765)
+++ trunk/blender/source/blender/blenkernel/intern/library.c 2013-04-04 02:05:11 UTC (rev 55766)
@@ -1050,6 +1050,7 @@
return BLI_findstring(lb, name, offsetof(ID, name) + 2);
}
+#if 0 /* UNUSED */
static void get_flags_for_id(ID *id, char *buf)
{
int isfake = id->flag & LIB_FAKEUSER;
@@ -1130,7 +1131,6 @@
}
}
-#if 0 /* unused */
/* used by headerbuttons.c buttons.c editobject.c editseq.c */
/* if (nr == NULL) no MAX_IDPUP, this for non-header browsing */
void IDnames_to_pupstring(const char **str, const char *title, const char *extraops, ListBase *lb, ID *link, short *nr)
Modified: trunk/blender/source/blender/editors/include/UI_interface.h
===================================================================
--- trunk/blender/source/blender/editors/include/UI_interface.h 2013-04-03 20:10:08 UTC (rev 55765)
+++ trunk/blender/source/blender/editors/include/UI_interface.h 2013-04-04 02:05:11 UTC (rev 55766)
@@ -280,7 +280,6 @@
* Functions to draw various shapes, taking theme settings into account.
* Used for code that draws its own UI style elements. */
-void uiEmboss(float x1, float y1, float x2, float y2, int sel);
void uiRoundBox(float minx, float miny, float maxx, float maxy, float rad);
void uiSetRoundBox(int type);
int uiGetRoundBox(void);
@@ -398,7 +397,7 @@
void uiBlockSetRegion(uiBlock *block, struct ARegion *region);
-void uiBlockSetButLock(uiBlock *block, int val, const char *lockstr);
+void uiBlockSetButLock(uiBlock *block, bool val, const char *lockstr);
void uiBlockClearButLock(uiBlock *block);
/* automatic aligning, horiz or verical */
@@ -448,7 +447,7 @@
void uiButClearDrawFlag(uiBut *but, int flag);
/* special button case, only draw it when used actively, for outliner etc */
-int uiButActiveOnly(const struct bContext *C, struct ARegion *ar, uiBlock *block, uiBut *but);
+bool uiButActiveOnly(const struct bContext *C, struct ARegion *ar, uiBlock *block, uiBut *but);
void uiButExecute(const struct bContext *C, uiBut *but);
@@ -621,7 +620,7 @@
uiBut *uiFindInlink(uiBlock *block, void *poin);
/* use inside searchfunc to add items */
-int uiSearchItemAdd(uiSearchItems *items, const char *name, void *poin, int iconid);
+bool uiSearchItemAdd(uiSearchItems *items, const char *name, void *poin, int iconid);
/* bfunc gets search item *poin as arg2, or if NULL the old string */
void uiButSetSearchFunc(uiBut *but, uiButSearchFunc sfunc, void *arg1, uiButHandleFunc bfunc, void *active);
/* height in pixels, it's using hardcoded values still */
@@ -770,20 +769,20 @@
struct MenuType *uiButGetMenuType(uiBut *but);
void uiLayoutSetOperatorContext(uiLayout *layout, int opcontext);
-void uiLayoutSetActive(uiLayout *layout, int active);
-void uiLayoutSetEnabled(uiLayout *layout, int enabled);
-void uiLayoutSetRedAlert(uiLayout *layout, int redalert);
-void uiLayoutSetAlignment(uiLayout *layout, int alignment);
-void uiLayoutSetKeepAspect(uiLayout *layout, int keepaspect);
+void uiLayoutSetActive(uiLayout *layout, bool active);
+void uiLayoutSetEnabled(uiLayout *layout, bool enabled);
+void uiLayoutSetRedAlert(uiLayout *layout, bool redalert);
+void uiLayoutSetAlignment(uiLayout *layout, char alignment);
+void uiLayoutSetKeepAspect(uiLayout *layout, bool keepaspect);
void uiLayoutSetScaleX(uiLayout *layout, float scale);
void uiLayoutSetScaleY(uiLayout *layout, float scale);
int uiLayoutGetOperatorContext(uiLayout *layout);
-int uiLayoutGetActive(uiLayout *layout);
-int uiLayoutGetEnabled(uiLayout *layout);
-int uiLayoutGetRedAlert(uiLayout *layout);
+bool uiLayoutGetActive(uiLayout *layout);
+bool uiLayoutGetEnabled(uiLayout *layout);
+bool uiLayoutGetRedAlert(uiLayout *layout);
int uiLayoutGetAlignment(uiLayout *layout);
-int uiLayoutGetKeepAspect(uiLayout *layout);
+bool uiLayoutGetKeepAspect(uiLayout *layout);
int uiLayoutGetWidth(uiLayout *layout);
float uiLayoutGetScaleX(uiLayout *layout);
float uiLayoutGetScaleY(uiLayout *layout);
@@ -920,7 +919,7 @@
void UI_template_fix_linking(void);
/* UI_OT_editsource helpers */
-int UI_editsource_enable_check(void);
+bool UI_editsource_enable_check(void);
void UI_editsource_active_but_test(uiBut *but);
#endif /* __UI_INTERFACE_H__ */
Modified: trunk/blender/source/blender/editors/include/UI_interface_icons.h
===================================================================
--- trunk/blender/source/blender/editors/include/UI_interface_icons.h 2013-04-03 20:10:08 UTC (rev 55765)
+++ trunk/blender/source/blender/editors/include/UI_interface_icons.h 2013-04-04 02:05:11 UTC (rev 55766)
@@ -79,6 +79,6 @@
struct PreviewImage *UI_icon_to_preview(int icon_id);
-int UI_rnaptr_icon_get(struct bContext *C, struct PointerRNA *ptr, int rnaicon, int big);
+int UI_rnaptr_icon_get(struct bContext *C, struct PointerRNA *ptr, int rnaicon, const bool big);
#endif /* __UI_INTERFACE_ICONS_H__ */
Modified: trunk/blender/source/blender/editors/interface/interface.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface.c 2013-04-03 20:10:08 UTC (rev 55765)
+++ trunk/blender/source/blender/editors/interface/interface.c 2013-04-04 02:05:11 UTC (rev 55766)
@@ -549,22 +549,22 @@
/* ************** BLOCK ENDING FUNCTION ************* */
/* NOTE: if but->poin is allocated memory for every defbut, things fail... */
-static int ui_but_equals_old(uiBut *but, uiBut *oldbut)
+static bool ui_but_equals_old(uiBut *but, uiBut *oldbut)
{
/* various properties are being compared here, hopefully sufficient
* to catch all cases, but it is simple to add more checks later */
- if (but->retval != oldbut->retval) return 0;
- if (but->rnapoin.data != oldbut->rnapoin.data) return 0;
+ if (but->retval != oldbut->retval) return false;
+ if (but->rnapoin.data != oldbut->rnapoin.data) return false;
if (but->rnaprop != oldbut->rnaprop)
- if (but->rnaindex != oldbut->rnaindex) return 0;
- if (but->func != oldbut->func) return 0;
- if (but->funcN != oldbut->funcN) return 0;
- if (oldbut->func_arg1 != oldbut && but->func_arg1 != oldbut->func_arg1) return 0;
- if (oldbut->func_arg2 != oldbut && but->func_arg2 != oldbut->func_arg2) return 0;
- if (!but->funcN && ((but->poin != oldbut->poin && (uiBut *)oldbut->poin != oldbut) || but->pointype != oldbut->pointype)) return 0;
- if (but->optype != oldbut->optype) return 0;
+ if (but->rnaindex != oldbut->rnaindex) return false;
+ if (but->func != oldbut->func) return false;
+ if (but->funcN != oldbut->funcN) return false;
+ if (oldbut->func_arg1 != oldbut && but->func_arg1 != oldbut->func_arg1) return false;
+ if (oldbut->func_arg2 != oldbut && but->func_arg2 != oldbut->func_arg2) return false;
+ if (!but->funcN && ((but->poin != oldbut->poin && (uiBut *)oldbut->poin != oldbut) || but->pointype != oldbut->pointype)) return false;
+ if (but->optype != oldbut->optype) return false;
- return 1;
+ return true;
}
/* oldbut is being inserted in new block, so we use the lines from new button, and replace button pointers */
@@ -682,37 +682,38 @@
/* needed for temporarily rename buttons, such as in outliner or file-select,
* they should keep calling uiDefButs to keep them alive */
/* returns 0 when button removed */
-int uiButActiveOnly(const bContext *C, ARegion *ar, uiBlock *block, uiBut *but)
+bool uiButActiveOnly(const bContext *C, ARegion *ar, uiBlock *block, uiBut *but)
{
uiBlock *oldblock;
uiBut *oldbut;
- int activate = FALSE, found = FALSE, isactive = FALSE;
+ bool activate = false, found = false, isactive = false;
oldblock = block->oldblock;
- if (!oldblock)
- activate = TRUE;
+ if (!oldblock) {
+ activate = true;
+ }
else {
for (oldbut = oldblock->buttons.first; oldbut; oldbut = oldbut->next) {
if (ui_but_equals_old(oldbut, but)) {
- found = TRUE;
+ found = true;
if (oldbut->active)
- isactive = TRUE;
+ isactive = true;
break;
}
}
}
- if ((activate == TRUE) || (found == FALSE)) {
+ if ((activate == true) || (found == false)) {
ui_button_activate_do((bContext *)C, ar, but);
}
- else if ((found == TRUE) && (isactive == FALSE)) {
+ else if ((found == true) && (isactive == false)) {
BLI_remlink(&block->buttons, but);
ui_free_but(C, but);
- return 0;
+ return false;
}
- return 1;
+ return true;
}
/* simulate button click */
@@ -1243,17 +1244,17 @@
/* ************************************************ */
-void uiBlockSetButLock(uiBlock *block, int val, const char *lockstr)
+void uiBlockSetButLock(uiBlock *block, bool val, const char *lockstr)
{
if (val) {
- block->lock = val ? TRUE : FALSE;
+ block->lock = val;
block->lockstr = lockstr;
}
}
void uiBlockClearButLock(uiBlock *block)
{
- block->lock = FALSE;
+ block->lock = false;
block->lockstr = NULL;
}
@@ -1392,63 +1393,63 @@
}
}
-int ui_is_but_float(uiBut *but)
+bool ui_is_but_float(uiBut *but)
{
if (but->pointype == UI_BUT_POIN_FLOAT && but->poin)
- return 1;
+ return true;
if (but->rnaprop && RNA_property_type(but->rnaprop) == PROP_FLOAT)
- return 1;
+ return true;
- return 0;
+ return false;
}
-int ui_is_but_bool(uiBut *but)
+bool ui_is_but_bool(uiBut *but)
{
if (ELEM5(but->type, TOG, TOGN, TOGR, ICONTOG, ICONTOGN))
- return 1;
+ return true;
if (but->rnaprop && RNA_property_type(but->rnaprop) == PROP_BOOLEAN)
- return 1;
+ return true;
- return 0;
+ return false;
}
-int ui_is_but_unit(uiBut *but)
+bool ui_is_but_unit(uiBut *but)
{
UnitSettings *unit = but->block->unit;
const int unit_type = uiButGetUnitType(but);
if (unit_type == PROP_UNIT_NONE)
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list