griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Cleanup: Use StringRef arguments for some UI button functions

Browse Source 
The benefits are O(1) access to the string size, clearer ownership,
and easily accessible utility functions. For now, only change functions
where the string is clearly non-null. It's not clear in what cases some
other functions recieve null strings.
This commit is contained in:
Hans Goudey
2024-01-31 17:16:25 -05:00
parent 5fa61ee620
commit 9c3aa8b824
2 changed files with 33 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
source/blender/editors/include/UI_interface_c.hh
View File

@@ -988,7 +988,7 @@ bool UI_but_is_userdef(const uiBut *but);
uiBut *uiDefBut(uiBlock *block,
int type,
int retval,
const char *str,
blender::StringRef str,
int x,
int y,
short width,
@@ -1002,7 +1002,7 @@ uiBut *uiDefBut(uiBlock *block,
uiBut *uiDefButF(uiBlock *block,
int type,
int retval,
const char *str,
blender::StringRef str,
int x,
int y,
short width,
@@ -1016,7 +1016,7 @@ uiBut *uiDefButF(uiBlock *block,
uiBut *uiDefButI(uiBlock *block,
int type,
int retval,
const char *str,
blender::StringRef str,
int x,
int y,
short width,
@@ -1031,7 +1031,7 @@ uiBut *uiDefButBitI(uiBlock *block,
int type,
int bit,
int retval,
const char *str,
blender::StringRef str,
int x,
int y,
short width,
@@ -1045,7 +1045,7 @@ uiBut *uiDefButBitI(uiBlock *block,
uiBut *uiDefButS(uiBlock *block,
int type,
int retval,
const char *str,
blender::StringRef str,
int x,
int y,
short width,
@@ -1060,7 +1060,7 @@ uiBut *uiDefButBitS(uiBlock *block,
int type,
int bit,
int retval,
const char *str,
blender::StringRef str,
int x,
int y,
short width,
@@ -1074,7 +1074,7 @@ uiBut *uiDefButBitS(uiBlock *block,
uiBut *uiDefButC(uiBlock *block,
int type,
int retval,
const char *str,
blender::StringRef str,
int x,
int y,
short width,
@@ -1089,7 +1089,7 @@ uiBut *uiDefButBitC(uiBlock *block,
int type,
int bit,
int retval,
const char *str,
blender::StringRef str,
int x,
int y,
short width,
@@ -1303,7 +1303,7 @@ uiBut *uiDefIconTextBut(uiBlock *block,
int type,
int retval,
int icon,
const char *str,
blender::StringRef str,
int x,
int y,
short width,
@@ -1318,7 +1318,7 @@ uiBut *uiDefIconTextButF(uiBlock *block,
int type,
int retval,
int icon,
const char *str,
blender::StringRef str,
int x,
int y,
short width,
@@ -1333,7 +1333,7 @@ uiBut *uiDefIconTextButI(uiBlock *block,
int type,
int retval,
int icon,
const char *str,
blender::StringRef str,
int x,
int y,
short width,
@@ -1499,7 +1499,7 @@ int UI_icon_from_keymap_item(const wmKeyMapItem *kmi, int r_icon_mod[4]);
uiBut *uiDefMenuBut(uiBlock *block,
uiMenuCreateFunc func,
void *arg,
const char *str,
blender::StringRef str,
int x,
int y,
short width,
@@ -1509,7 +1509,7 @@ uiBut *uiDefIconTextMenuBut(uiBlock *block,
uiMenuCreateFunc func,
void *arg,
int icon,
const char *str,
blender::StringRef str,
int x,
int y,
short width,
@@ -1528,7 +1528,7 @@ uiBut *uiDefIconMenuBut(uiBlock *block,
uiBut *uiDefBlockBut(uiBlock *block,
uiBlockCreateFunc func,
void *arg,
const char *str,
blender::StringRef str,
int x,
int y,
short width,
@@ -1537,7 +1537,7 @@ uiBut *uiDefBlockBut(uiBlock *block,
uiBut *uiDefBlockButN(uiBlock *block,
uiBlockCreateFunc func,
void *argN,
const char *str,
blender::StringRef str,
int x,
int y,
short width,

37
source/blender/editors/interface/interface.cc
View File

@@ -78,6 +78,7 @@
#include "interface_intern.hh"
using blender::StringRef;
using blender::Vector;
/* prototypes. */
@@ -4050,8 +4051,6 @@ uiBut *ui_but_change_type(uiBut *but, eButType new_type)
}
/**
* \brief ui_def_but is the function that draws many button types
*
* \param x, y: The lower left hand corner of the button (X axis)
* \param width, height: The size of the button.
*
@@ -4063,7 +4062,7 @@ uiBut *ui_but_change_type(uiBut *but, eButType new_type)
static uiBut *ui_def_but(uiBlock *block,
int type,
int retval,
const char *str,
const StringRef str,
int x,
int y,
short width,
@@ -4805,7 +4804,7 @@ static uiBut *ui_def_but_operator_ptr(uiBlock *block,
uiBut *uiDefBut(uiBlock *block,
int type,
int retval,
const char *str,
const StringRef str,
int x,
int y,
short width,
@@ -5008,7 +5007,7 @@ static uiBut *uiDefButBit(uiBlock *block,
int type,
int bit,
int retval,
const char *str,
const StringRef str,
int x,
int y,
short width,
@@ -5042,7 +5041,7 @@ static uiBut *uiDefButBit(uiBlock *block,
uiBut *uiDefButF(uiBlock *block,
int type,
int retval,
const char *str,
const StringRef str,
int x,
int y,
short width,
@@ -5072,7 +5071,7 @@ uiBut *uiDefButF(uiBlock *block,
uiBut *uiDefButI(uiBlock *block,
int type,
int retval,
const char *str,
const StringRef str,
int x,
int y,
short width,
@@ -5103,7 +5102,7 @@ uiBut *uiDefButBitI(uiBlock *block,
int type,
int bit,
int retval,
const char *str,
const StringRef str,
int x,
int y,
short width,
@@ -5134,7 +5133,7 @@ uiBut *uiDefButBitI(uiBlock *block,
uiBut *uiDefButS(uiBlock *block,
int type,
int retval,
const char *str,
const StringRef str,
int x,
int y,
short width,
@@ -5165,7 +5164,7 @@ uiBut *uiDefButBitS(uiBlock *block,
int type,
int bit,
int retval,
const char *str,
const StringRef str,
int x,
int y,
short width,
@@ -5196,7 +5195,7 @@ uiBut *uiDefButBitS(uiBlock *block,
uiBut *uiDefButC(uiBlock *block,
int type,
int retval,
const char *str,
const StringRef str,
int x,
int y,
short width,
@@ -5227,7 +5226,7 @@ uiBut *uiDefButBitC(uiBlock *block,
int type,
int bit,
int retval,
const char *str,
const StringRef str,
int x,
int y,
short width,
@@ -5624,7 +5623,7 @@ uiBut *uiDefIconTextBut(uiBlock *block,
int type,
int retval,
int icon,
const char *str,
const StringRef str,
int x,
int y,
short width,
@@ -5646,7 +5645,7 @@ uiBut *uiDefIconTextButF(uiBlock *block,
int type,
int retval,
int icon,
const char *str,
const StringRef str,
int x,
int y,
short width,
@@ -5678,7 +5677,7 @@ uiBut *uiDefIconTextButI(uiBlock *block,
int type,
int retval,
int icon,
const char *str,
const StringRef str,
int x,
int y,
short width,
@@ -6085,7 +6084,7 @@ void UI_but_func_pushed_state_set(uiBut *but, std::function<bool(const uiBut &)>
uiBut *uiDefBlockBut(uiBlock *block,
uiBlockCreateFunc func,
void *arg,
const char *str,
const StringRef str,
int x,
int y,
short width,
@@ -6102,7 +6101,7 @@ uiBut *uiDefBlockBut(uiBlock *block,
uiBut *uiDefBlockButN(uiBlock *block,
uiBlockCreateFunc func,
void *argN,
const char *str,
const StringRef str,
int x,
int y,
short width,
@@ -6123,7 +6122,7 @@ uiBut *uiDefBlockButN(uiBlock *block,
uiBut *uiDefMenuBut(uiBlock *block,
uiMenuCreateFunc func,
void *arg,
const char *str,
const StringRef str,
int x,
int y,
short width,
@@ -6141,7 +6140,7 @@ uiBut *uiDefIconTextMenuBut(uiBlock *block,
uiMenuCreateFunc func,
void *arg,
int icon,
const char *str,
const StringRef str,
int x,
int y,
short width,