diff options
author | Campbell Barton <ideasman42@gmail.com> | 2013-04-04 06:05:11 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2013-04-04 06:05:11 +0400 |
commit | 7bbaf4853ae81344761fceac90b08785520c18d0 (patch) | |
tree | fdfb403a573188312e43bf134a13c9a2e0d36e7e /source/blender/windowmanager | |
parent | 47fffc86bc94318aa34f50c035c99cfe8c7bad42 (diff) |
code cleanup: use bools in UI and WM code, quiet some shadow warnings, remove unused function uiEmboss()
Diffstat (limited to 'source/blender/windowmanager')
-rw-r--r-- | source/blender/windowmanager/WM_api.h | 24 | ||||
-rw-r--r-- | source/blender/windowmanager/intern/wm.c | 4 | ||||
-rw-r--r-- | source/blender/windowmanager/intern/wm_cursors.c | 2 | ||||
-rw-r--r-- | source/blender/windowmanager/intern/wm_draw.c | 4 | ||||
-rw-r--r-- | source/blender/windowmanager/intern/wm_event_system.c | 14 | ||||
-rw-r--r-- | source/blender/windowmanager/intern/wm_init_exit.c | 7 | ||||
-rw-r--r-- | source/blender/windowmanager/intern/wm_keymap.c | 2 | ||||
-rw-r--r-- | source/blender/windowmanager/intern/wm_operators.c | 12 | ||||
-rw-r--r-- | source/blender/windowmanager/intern/wm_window.c | 6 |
9 files changed, 38 insertions, 37 deletions
diff --git a/source/blender/windowmanager/WM_api.h b/source/blender/windowmanager/WM_api.h index 25c8c5db0a1..2af513cebe6 100644 --- a/source/blender/windowmanager/WM_api.h +++ b/source/blender/windowmanager/WM_api.h @@ -70,7 +70,7 @@ typedef struct wmJob wmJob; void WM_init_state_size_set (int stax, int stay, int sizx, int sizy); void WM_init_state_fullscreen_set(void); void WM_init_state_normal_set(void); -void WM_init_native_pixels(int do_it); +void WM_init_native_pixels(bool do_it); void WM_init (struct bContext *C, int argc, const char **argv); void WM_exit_ext (struct bContext *C, const short do_python); @@ -87,7 +87,7 @@ __attribute__((noreturn)) #endif ; -int WM_init_game (struct bContext *C); +bool WM_init_game (struct bContext *C); void WM_init_splash (struct bContext *C); @@ -106,7 +106,7 @@ int WM_window_pixels_y (struct wmWindow *win); void WM_window_open_temp (struct bContext *C, struct rcti *position, int type); /* returns true if draw method is triple buffer */ -int WM_is_draw_triple(struct wmWindow *win); +bool WM_is_draw_triple(struct wmWindow *win); @@ -118,7 +118,7 @@ void WM_autosave_init(struct wmWindowManager *wm); void WM_cursor_set (struct wmWindow *win, int curs); void WM_cursor_modal (struct wmWindow *win, int curs); void WM_cursor_restore (struct wmWindow *win); -void WM_cursor_wait (int val); +void WM_cursor_wait (bool val); void WM_cursor_grab_enable(struct wmWindow *win, int wrap, int hide, int bounds[4]); void WM_cursor_grab_disable(struct wmWindow *win, int mouse_ungrab_xy[2]); void WM_cursor_time (struct wmWindow *win, int nr); @@ -204,7 +204,7 @@ void WM_operator_free (struct wmOperator *op); void WM_operator_stack_clear(struct wmWindowManager *wm); void WM_operator_handlers_clear(wmWindowManager *wm, struct wmOperatorType *ot); -struct wmOperatorType *WM_operatortype_find(const char *idnamem, int quiet); +struct wmOperatorType *WM_operatortype_find(const char *idnamem, bool quiet); struct GHashIterator *WM_operatortype_iter(void); void WM_operatortype_append(void (*opfunc)(struct wmOperatorType *)); void WM_operatortype_append_ptr(void (*opfunc)(struct wmOperatorType *, void *), void *userdata); @@ -225,8 +225,8 @@ int WM_operator_name_call (struct bContext *C, const char *opstring, short con int WM_operator_call_py(struct bContext *C, struct wmOperatorType *ot, short context, struct PointerRNA *properties, struct ReportList *reports, short is_undo); void WM_operator_properties_alloc(struct PointerRNA **ptr, struct IDProperty **properties, const char *opstring); /* used for keymap and macro items */ -void WM_operator_properties_sanitize(struct PointerRNA *ptr, const short no_context); /* make props context sensitive or not */ -int WM_operator_properties_default(struct PointerRNA *ptr, const int do_update); +void WM_operator_properties_sanitize(struct PointerRNA *ptr, const bool no_context); /* make props context sensitive or not */ +int WM_operator_properties_default(struct PointerRNA *ptr, const bool do_update); void WM_operator_properties_reset(struct wmOperator *op); void WM_operator_properties_create(struct PointerRNA *ptr, const char *opstring); void WM_operator_properties_create_ptr(struct PointerRNA *ptr, struct wmOperatorType *ot); @@ -239,11 +239,11 @@ void WM_operator_properties_mouse_select(struct wmOperatorType *ot); void WM_operator_properties_gesture_straightline(struct wmOperatorType *ot, bool cursor); void WM_operator_properties_select_all(struct wmOperatorType *ot); -int WM_operator_check_ui_enabled(const struct bContext *C, const char *idname); +bool WM_operator_check_ui_enabled(const struct bContext *C, const char *idname); wmOperator *WM_operator_last_redo(const struct bContext *C); -int WM_operator_last_properties_init(struct wmOperator *op); -int WM_operator_last_properties_store(struct wmOperator *op); +bool WM_operator_last_properties_init(struct wmOperator *op); +bool WM_operator_last_properties_store(struct wmOperator *op); /* MOVE THIS SOMEWHERE ELSE */ #define SEL_TOGGLE 0 @@ -269,14 +269,14 @@ void WM_operator_py_idname(char *to, const char *from); /* *************** uilist types ******************** */ void WM_uilisttype_init(void); -struct uiListType *WM_uilisttype_find(const char *idname, int quiet); +struct uiListType *WM_uilisttype_find(const char *idname, bool quiet); int WM_uilisttype_add(struct uiListType *ult); void WM_uilisttype_freelink(struct uiListType *ult); void WM_uilisttype_free(void); /* *************** menu types ******************** */ void WM_menutype_init(void); -struct MenuType *WM_menutype_find(const char *idname, int quiet); +struct MenuType *WM_menutype_find(const char *idname, bool quiet); int WM_menutype_add(struct MenuType *mt); void WM_menutype_freelink(struct MenuType *mt); void WM_menutype_free(void); diff --git a/source/blender/windowmanager/intern/wm.c b/source/blender/windowmanager/intern/wm.c index 29e0fcf302f..f7b7aa87cf8 100644 --- a/source/blender/windowmanager/intern/wm.c +++ b/source/blender/windowmanager/intern/wm.c @@ -179,7 +179,7 @@ void WM_operator_handlers_clear(wmWindowManager *wm, wmOperatorType *ot) static GHash *uilisttypes_hash = NULL; -uiListType *WM_uilisttype_find(const char *idname, int quiet) +uiListType *WM_uilisttype_find(const char *idname, bool quiet) { uiListType *ult; @@ -234,7 +234,7 @@ void WM_uilisttype_free(void) static GHash *menutypes_hash = NULL; -MenuType *WM_menutype_find(const char *idname, int quiet) +MenuType *WM_menutype_find(const char *idname, bool quiet) { MenuType *mt; diff --git a/source/blender/windowmanager/intern/wm_cursors.c b/source/blender/windowmanager/intern/wm_cursors.c index 2e15d6158e8..f8081cb8012 100644 --- a/source/blender/windowmanager/intern/wm_cursors.c +++ b/source/blender/windowmanager/intern/wm_cursors.c @@ -164,7 +164,7 @@ void WM_cursor_restore(wmWindow *win) } /* to allow usage all over, we do entire WM */ -void WM_cursor_wait(int val) +void WM_cursor_wait(bool val) { if (!G.background) { wmWindowManager *wm = G.main->wm.first; diff --git a/source/blender/windowmanager/intern/wm_draw.c b/source/blender/windowmanager/intern/wm_draw.c index 173a8237c02..1e3c2479e66 100644 --- a/source/blender/windowmanager/intern/wm_draw.c +++ b/source/blender/windowmanager/intern/wm_draw.c @@ -769,12 +769,12 @@ static int wm_automatic_draw_method(wmWindow *win) return win->drawmethod; } -int WM_is_draw_triple(wmWindow *win) +bool WM_is_draw_triple(wmWindow *win) { /* function can get called before this variable is set in drawing code below */ if (win->drawmethod != U.wmdrawmethod) win->drawmethod = U.wmdrawmethod; - return USER_DRAW_TRIPLE == wm_automatic_draw_method(win); + return (USER_DRAW_TRIPLE == wm_automatic_draw_method(win)); } void wm_tag_redraw_overlay(wmWindow *win, ARegion *ar) diff --git a/source/blender/windowmanager/intern/wm_event_system.c b/source/blender/windowmanager/intern/wm_event_system.c index 6c129ec0a92..d7b642fc5cf 100644 --- a/source/blender/windowmanager/intern/wm_event_system.c +++ b/source/blender/windowmanager/intern/wm_event_system.c @@ -796,10 +796,10 @@ static void wm_region_mouse_co(bContext *C, wmEvent *event) } } -#if 1 /* disabling for 2.63 release, since we keep getting reports some menu items are leaving props undefined */ -int WM_operator_last_properties_init(wmOperator *op) +#if 1 /* may want to disable operator remembering previous state for testing */ +bool WM_operator_last_properties_init(wmOperator *op) { - int change = FALSE; + bool change = false; if (op->type->last_properties) { PropertyRNA *iterprop; @@ -825,7 +825,7 @@ int WM_operator_last_properties_init(wmOperator *op) idp_dst->flag |= IDP_FLAG_GHOST; IDP_ReplaceInGroup(op->properties, idp_dst); - change = TRUE; + change = true; } } } @@ -836,7 +836,7 @@ int WM_operator_last_properties_init(wmOperator *op) return change; } -int WM_operator_last_properties_store(wmOperator *op) +bool WM_operator_last_properties_store(wmOperator *op) { if (op->type->last_properties) { IDP_FreeProperty(op->type->last_properties); @@ -849,10 +849,10 @@ int WM_operator_last_properties_store(wmOperator *op) printf("%s: storing properties for '%s'\n", __func__, op->type->idname); } op->type->last_properties = IDP_CopyProperty(op->properties); - return TRUE; + return true; } else { - return FALSE; + return false; } } diff --git a/source/blender/windowmanager/intern/wm_init_exit.c b/source/blender/windowmanager/intern/wm_init_exit.c index 193af2f92c6..16afad88069 100644 --- a/source/blender/windowmanager/intern/wm_init_exit.c +++ b/source/blender/windowmanager/intern/wm_init_exit.c @@ -248,7 +248,7 @@ void WM_init_splash(bContext *C) } } -int WM_init_game(bContext *C) +bool WM_init_game(bContext *C) { wmWindowManager *wm = CTX_wm_manager(C); wmWindow *win; @@ -318,7 +318,7 @@ int WM_init_game(bContext *C) sound_exit(); - return 1; + return true; } else { ReportTimerInfo *rti; @@ -333,8 +333,9 @@ int WM_init_game(bContext *C) rti = MEM_callocN(sizeof(ReportTimerInfo), "ReportTimerInfo"); wm->reports.reporttimer->customdata = rti; + + return false; } - return 0; } /* free strings of open recent files */ diff --git a/source/blender/windowmanager/intern/wm_keymap.c b/source/blender/windowmanager/intern/wm_keymap.c index 20e715c18d0..ff711c5ca4d 100644 --- a/source/blender/windowmanager/intern/wm_keymap.c +++ b/source/blender/windowmanager/intern/wm_keymap.c @@ -958,7 +958,7 @@ static wmKeyMapItem *wm_keymap_item_find( RNA_pointer_create(NULL, ot->srna, properties_default, &opptr); - if (WM_operator_properties_default(&opptr, TRUE)) { + if (WM_operator_properties_default(&opptr, true)) { found = wm_keymap_item_find_props(C, opname, opcontext, properties_default, 0, hotkey, keymap_r); } diff --git a/source/blender/windowmanager/intern/wm_operators.c b/source/blender/windowmanager/intern/wm_operators.c index b4a4e4612e3..d0f258dc375 100644 --- a/source/blender/windowmanager/intern/wm_operators.c +++ b/source/blender/windowmanager/intern/wm_operators.c @@ -115,7 +115,7 @@ static GHash *global_ops_hash = NULL; /* ************ operator API, exported ********** */ -wmOperatorType *WM_operatortype_find(const char *idname, int quiet) +wmOperatorType *WM_operatortype_find(const char *idname, bool quiet) { if (idname[0]) { wmOperatorType *ot; @@ -779,7 +779,7 @@ void WM_operator_properties_alloc(PointerRNA **ptr, IDProperty **properties, con } -void WM_operator_properties_sanitize(PointerRNA *ptr, const short no_context) +void WM_operator_properties_sanitize(PointerRNA *ptr, const bool no_context) { RNA_STRUCT_BEGIN(ptr, prop) { @@ -815,7 +815,7 @@ void WM_operator_properties_sanitize(PointerRNA *ptr, const short no_context) * \note, theres nothing specific to operators here. * this could be made a general function. */ -int WM_operator_properties_default(PointerRNA *ptr, const int do_update) +int WM_operator_properties_default(PointerRNA *ptr, const bool do_update) { int is_change = FALSE; RNA_STRUCT_BEGIN(ptr, prop) @@ -831,7 +831,7 @@ int WM_operator_properties_default(PointerRNA *ptr, const int do_update) break; } default: - if ((do_update == FALSE) || (RNA_property_is_set(ptr, prop) == FALSE)) { + if ((do_update == false) || (RNA_property_is_set(ptr, prop) == FALSE)) { if (RNA_property_reset(ptr, prop, -1)) { is_change = 1; } @@ -964,7 +964,7 @@ static void operator_enum_search_cb(const struct bContext *C, void *arg_ot, cons for (item = item_array; item->identifier; item++) { /* note: need to give the index rather than the identifier because the enum can be freed */ if (BLI_strcasestr(item->name, str)) - if (0 == uiSearchItemAdd(items, item->name, SET_INT_IN_POINTER(item->value), 0)) + if (false == uiSearchItemAdd(items, item->name, SET_INT_IN_POINTER(item->value), 0)) break; } @@ -1226,7 +1226,7 @@ int WM_operator_winactive(bContext *C) } /* return FALSE, if the UI should be disabled */ -int WM_operator_check_ui_enabled(const bContext *C, const char *idname) +bool WM_operator_check_ui_enabled(const bContext *C, const char *idname) { wmWindowManager *wm = CTX_wm_manager(C); Scene *scene = CTX_data_scene(C); diff --git a/source/blender/windowmanager/intern/wm_window.c b/source/blender/windowmanager/intern/wm_window.c index 53698ca7e9e..70cb10476d7 100644 --- a/source/blender/windowmanager/intern/wm_window.c +++ b/source/blender/windowmanager/intern/wm_window.c @@ -97,8 +97,8 @@ static struct WMInitStruct { int windowstate; WinOverrideFlag override_flag; - int native_pixels; -} wm_init_state = {0, 0, 0, 0, GHOST_kWindowStateNormal, 0, 1}; + bool native_pixels; +} wm_init_state = {0, 0, 0, 0, GHOST_kWindowStateNormal, 0, true}; /* ******** win open & close ************ */ @@ -1332,7 +1332,7 @@ void WM_init_state_normal_set(void) wm_init_state.override_flag |= WIN_OVERRIDE_WINSTATE; } -void WM_init_native_pixels(int do_it) +void WM_init_native_pixels(bool do_it) { wm_init_state.native_pixels = do_it; } |