[Bf-blender-cvs] [2fdec36] input_method_editor_partial_support: cleanup: picky edits

[Campbell Barton]

Commit: 2fdec3684aa0a00049a71d909ccee7432aea1eb5
Author: Campbell Barton
Date:   Sat Dec 6 14:24:31 2014 +0100
Branches: input_method_editor_partial_support
https://developer.blender.org/rB2fdec3684aa0a00049a71d909ccee7432aea1eb5

cleanup: picky edits

===================================================================

M       CMakeLists.txt
M       intern/ghost/GHOST_Types.h
M       source/blender/editors/interface/interface_handlers.c
M       source/blender/editors/interface/interface_intern.h

===================================================================

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 45f2aaa..51a9d96 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -318,7 +318,7 @@ mark_as_advanced(WITH_LIBMV_SCHUR_SPECIALIZATIONS)
 option(WITH_FREESTYLE     "Enable Freestyle (advanced edges rendering)" ON)
 
 # Misc
-if (WIN32)
+if(WIN32)
        option(WITH_INPUT_IME "Enable Input Method Editor (IME)" ON)
 endif()
 option(WITH_INPUT_NDOF "Enable NDOF input devices (SpaceNavigator and 
friends)" ${_init_INPUT_NDOF})
diff --git a/intern/ghost/GHOST_Types.h b/intern/ghost/GHOST_Types.h
index 5d9fc33..c4a7490 100644
--- a/intern/ghost/GHOST_Types.h
+++ b/intern/ghost/GHOST_Types.h
@@ -443,7 +443,7 @@ typedef struct {
 /** similar to wmImeData */
 typedef struct {
        /** size_t */
-       GHOST_TUserDataPtr result_len, composite_len; 
+       GHOST_TUserDataPtr result_len, composite_len;
        /** char * utf8 encoding */
        GHOST_TUserDataPtr result, composite;
        /** Cursor position in the IME composition. */
diff --git a/source/blender/editors/interface/interface_handlers.c 
b/source/blender/editors/interface/interface_handlers.c
index 4f0d9bb..b39c786 100644
--- a/source/blender/editors/interface/interface_handlers.c
+++ b/source/blender/editors/interface/interface_handlers.c
@@ -2450,7 +2450,7 @@ static void ui_textedit_ime_end(wmWindow *win, uiBut 
*UNUSED(but))
        wm_window_IME_end(win);
 }
 
-void ui_but_ime_reposition(uiBut *but, int x, int y, int complete) 
+void ui_but_ime_reposition(uiBut *but, int x, int y, bool complete)
 {
        BLI_assert(but->active);
 
@@ -2461,10 +2461,12 @@ void ui_but_ime_reposition(uiBut *but, int x, int y, 
int complete)
 /* should be ui_but_ime_data_get */
 wmIMEData *ui_but_get_ime_data(uiBut *but)
 {
-       if (but->active && but->active->window)
+       if (but->active && but->active->window) {
                return but->active->window->ime_data;
-       else
+       }
+       else {
                return NULL;
+       }
 }
 #endif  /* WITH_INPUT_IME */
 
diff --git a/source/blender/editors/interface/interface_intern.h 
b/source/blender/editors/interface/interface_intern.h
index fe8adba..2c3a239 100644
--- a/source/blender/editors/interface/interface_intern.h
+++ b/source/blender/editors/interface/interface_intern.h
@@ -629,7 +629,7 @@ uiBut *ui_but_find_old(uiBlock *block_old, const uiBut 
*but_new);
 uiBut *ui_but_find_new(uiBlock *block_old, const uiBut *but_new);
 
 #ifdef WITH_INPUT_IME
-void ui_but_ime_reposition(uiBut *but, int x, int y, int complete);
+void ui_but_ime_reposition(uiBut *but, int x, int y, bool complete);
 struct wmIMEData *ui_but_get_ime_data(uiBut *but);
 #endif

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs