blender
/
blender
136
411
Fork 595
Code Issues 6.3k Pull Requests 770 Projects 19 Wiki Activity

Refactor: UTF-8 Character Defines #109163

Merged
Harley Acheson merged 2 commits from Harley/blender:utf8_defines into main 2023-06-26 06:05:26 +02:00
Conversation 14 Commits 2 Files Changed 9 +3 -10
2 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 335bf9222e - Show all commits

7
source/blender/blenlib/BLI_string_utf8_symbols.h
View File

@ -39,13 +39,6 @@ extern "C" {
#define BLI_STR_UTF8_HORIZONTAL_TAB_KEY u8"\u2B7E" /* ⭾ */
#define BLI_STR_UTF8_BLACK_DIAMOND_MINUS_WHITE_X u8"\u2756" /* ❖ */
/* Unicode characters as UTF-32 codepoints. Last portion should include the official assigned name.
* Please do not add defines here that are not actually in use. */
#define BLI_STR_UTF32_SPACE U'\u0020' /* */
#define BLI_STR_UTF32_SLASH U'\u002F' /* / */
#define BLI_STR_UTF32_BLACK_RIGHT_POINTING_SMALL_TRIANGLE U'\u25B8' /* ▸ */
#ifdef __cplusplus
}
#endif

6
source/blender/blenlib/intern/string_search.cc
View File

@ -15,7 +15,7 @@
/* Right arrow, keep in sync with #UI_MENU_ARROW_SEP in `UI_interface.h`. */
#define UI_MENU_ARROW_SEP BLI_STR_UTF8_BLACK_RIGHT_POINTING_SMALL_TRIANGLE
#define UI_MENU_ARROW_SEP_UNICODE BLI_STR_UTF32_BLACK_RIGHT_POINTING_SMALL_TRIANGLE
#define UI_MENU_ARROW_SEP_UNICODE 0x25b8
namespace blender::string_search {
@ -348,8 +348,8 @@ void extract_normalized_words(StringRef str,
LinearAllocator<> &allocator,
Vector<StringRef, 64> &r_words)
{
const uint32_t unicode_space = BLI_STR_UTF32_SPACE;
const uint32_t unicode_slash = BLI_STR_UTF32_SLASH;
const uint32_t unicode_space = uint32_t(' ');
const uint32_t unicode_slash = uint32_t('/');
const uint32_t unicode_right_triangle = UI_MENU_ARROW_SEP_UNICODE;
BLI_assert(unicode_space == BLI_str_utf8_as_unicode(" "));