Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Organize function parameter names part1,2,3 #1333

Merged
merged 3 commits into from
Jan 27, 2024

Conversation

ma8ma
Copy link
Collaborator

@ma8ma ma8ma commented Jan 27, 2024

Organize function parameter names part1

関数の宣言と定義で仮引数の名前が異なっているとcppcheckに指摘されたため名前を整理して揃えます。

cppcheck 2.13.0のレポート (with inconclusive option)

src/article/articleviewbase.cpp:2014:60: style: inconclusive: Function 'slot_leave_notify' argument 1 names different: declaration 'ev' definition 'event'. [funcArgNamesDifferent]
src/bbslist/addetcdialog.cpp:15:114: style: inconclusive: Function 'AddEtcDialog' argument 4 names different: declaration '_id' definition 'id'. [funcArgNamesDifferent]
src/bbslist/addetcdialog.cpp:15:137: style: inconclusive: Function 'AddEtcDialog' argument 5 names different: declaration '_passwd' definition 'passwd'. [funcArgNamesDifferent]
src/bbslist/addetcdialog.cpp:15:89: style: inconclusive: Function 'AddEtcDialog' argument 3 names different: declaration '_name' definition 'name'. [funcArgNamesDifferent]
src/config/globalconf.cpp:410:46: style: inconclusive: Function 'set_instruct_tglart' argument 1 names different: declaration 'set' definition 'tgl'. [funcArgNamesDifferent]
src/config/globalconf.cpp:420:40: style: inconclusive: Function 'set_instruct_tglimg' argument 1 names different: declaration 'set' definition 'tgl'. [funcArgNamesDifferent]
src/control/mouseconfig.cpp:103:53: style: inconclusive: Function 'get_str_motions' argument 1 names different: declaration 'id' definition 'id_'. [funcArgNamesDifferent]
src/control/mouseconfig.cpp:115:57: style: inconclusive: Function 'get_default_motions' argument 1 names different: declaration 'id' definition 'id_'. [funcArgNamesDifferent]
src/dbtree/article2chcompati.cpp:19:86: style: inconclusive: Function 'Article2chCompati' argument 2 names different: declaration 'id' definition '_id'. [funcArgNamesDifferent]
src/dbtree/articlejbbs.cpp:17:74: style: inconclusive: Function 'ArticleJBBS' argument 2 names different: declaration 'id' definition '_id'. [funcArgNamesDifferent]
src/dbtree/articlemachi.cpp:20:76: style: inconclusive: Function 'ArticleMachi' argument 2 names different: declaration 'id' definition '_id'. [funcArgNamesDifferent]
src/dbtree/frontloader.cpp:19:46: style: inconclusive: Function 'FrontLoader' argument 1 names different: declaration 'url_boardbase' definition 'url_boadbase'. [funcArgNamesDifferent]

Organize function parameter names part2

関数の宣言と定義で仮引数の名前が異なっているとcppcheckに指摘されたため名前を整理して揃えます。

cppcheck 2.13.0のレポート (with inconclusive option)

src/article/drawareabase.cpp:1358:50: style: inconclusive: Function 'layout_one_text_node' argument 1 names different: declaration 'node' definition 'layout'. [funcArgNamesDifferent]
src/article/drawareabase.cpp:1358:63: style: inconclusive: Function 'layout_one_text_node' argument 2 names different: declaration 'node_x' definition 'x'. [funcArgNamesDifferent]
src/article/drawareabase.cpp:1358:71: style: inconclusive: Function 'layout_one_text_node' argument 3 names different: declaration 'node_y' definition 'y'. [funcArgNamesDifferent]
src/article/drawareabase.cpp:1470:49: style: inconclusive: Function 'layout_one_img_node' argument 1 names different: declaration 'node' definition 'layout'. [funcArgNamesDifferent]
src/article/drawareabase.cpp:1470:62: style: inconclusive: Function 'layout_one_img_node' argument 2 names different: declaration 'node_x' definition 'x'. [funcArgNamesDifferent]
src/article/drawareabase.cpp:1470:70: style: inconclusive: Function 'layout_one_img_node' argument 3 names different: declaration 'node_y' definition 'y'. [funcArgNamesDifferent]
src/article/drawareabase.cpp:1470:78: style: inconclusive: Function 'layout_one_img_node' argument 4 names different: declaration 'brsize' definition 'br_size'. [funcArgNamesDifferent]
src/dbtree/root.cpp:1182:119: style: inconclusive: Function 'add_etc' argument 4 names different: declaration 'id' definition 'boardid'. [funcArgNamesDifferent]
src/dbtree/ruleloader.cpp:20:44: style: inconclusive: Function 'RuleLoader' argument 1 names different: declaration 'url_boardbase' definition 'url_boadbase'. [funcArgNamesDifferent]
src/dbtree/settingloader.cpp:19:50: style: inconclusive: Function 'SettingLoader' argument 1 names different: declaration 'url_boardbase' definition 'url_boadbase'. [funcArgNamesDifferent]
src/jdlib/jdsocket.cpp:101:42: style: inconclusive: Function 'connect' argument 1 names different: declaration 'host' definition 'hostname'. [funcArgNamesDifferent]
src/jdlib/misccharcode.cpp:204:57: style: inconclusive: Function 'is_jis' argument 2 names different: declaration 'read_byte' definition 'byte'. [funcArgNamesDifferent]
src/jdlib/miscgtk.cpp:216:56: style: inconclusive: Function 'htmlcolor_to_str' argument 1 names different: declaration 'htmlcolor' definition '_htmlcolor'. [funcArgNamesDifferent]

Organize function parameter names part3

関数の宣言と定義で仮引数の名前が異なっているとcppcheckに指摘されたため名前を整理して揃えます。

cppcheck 2.13.0のレポート (with inconclusive option)

src/article/drawareabase.cpp:1567:54: style: inconclusive: Function 'get_width_of_one_char' argument 1 names different: declaration 'str' definition 'utfstr'. [funcArgNamesDifferent]
src/dbtree/nodetreebase.cpp:2974:39: style: inconclusive: Function 'check_anchor' argument 3 names different: declaration 'n' definition 'n_in'. [funcArgNamesDifferent]
src/dbtree/nodetreebase.cpp:85:72: style: inconclusive: Function 'NodeTreeBase' argument 2 names different: declaration 'date_modified' definition 'modified'. [funcArgNamesDifferent]
src/session.cpp:1012:61: style: inconclusive: Function 'set_items_msg_toolbar_str' argument 1 names different: declaration 'items' definition 'items_str'. [funcArgNamesDifferent]
src/session.cpp:1034:59: style: inconclusive: Function 'set_items_board_col_str' argument 1 names different: declaration 'items' definition 'items_str'. [funcArgNamesDifferent]
src/session.cpp:798:50: style: inconclusive: Function 'set_maximized_win_main' argument 1 names different: declaration 'maximized' definition 'set'. [funcArgNamesDifferent]
src/session.cpp:804:49: style: inconclusive: Function 'set_maximized_win_mes' argument 1 names different: declaration 'maximized' definition 'set'. [funcArgNamesDifferent]
src/session.cpp:838:44: style: inconclusive: Function 'set_show_sidebar' argument 1 names different: declaration 'showbar' definition 'showurl'. [funcArgNamesDifferent]
src/session.cpp:909:65: style: inconclusive: Function 'set_items_sidebar_toolbar_str' argument 1 names different: declaration 'items' definition 'items_str'. [funcArgNamesDifferent]
src/session.cpp:992:63: style: inconclusive: Function 'set_items_board_toolbar_str' argument 1 names different: declaration 'items' definition 'items_str'. [funcArgNamesDifferent]
src/skeleton/dragnote.cpp:188:64: style: inconclusive: Function 'remove_page' argument 2 names different: declaration 'adust_tab' definition 'adjust_tab'. [funcArgNamesDifferent]
src/skeleton/dragnote.cpp:347:92: style: inconclusive: Function 'set_tabicon' argument 3 names different: declaration 'icon' definition 'id'. [funcArgNamesDifferent]
src/xml/dom.cpp:474:56: style: inconclusive: Function 'append_treestore' argument 4 names different: declaration 'parnet' definition 'parent'. [funcArgNamesDifferent]

ma8ma added 3 commits January 27, 2024 22:30
関数の宣言と定義で仮引数の名前が異なっているとcppcheckに指摘されたため
名前を整理して揃えます。

cppcheck 2.13.0のレポート (with inconclusive option)
```
src/article/articleviewbase.cpp:2014:60: style: inconclusive: Function 'slot_leave_notify' argument 1 names different: declaration 'ev' definition 'event'. [funcArgNamesDifferent]
src/bbslist/addetcdialog.cpp:15:114: style: inconclusive: Function 'AddEtcDialog' argument 4 names different: declaration '_id' definition 'id'. [funcArgNamesDifferent]
src/bbslist/addetcdialog.cpp:15:137: style: inconclusive: Function 'AddEtcDialog' argument 5 names different: declaration '_passwd' definition 'passwd'. [funcArgNamesDifferent]
src/bbslist/addetcdialog.cpp:15:89: style: inconclusive: Function 'AddEtcDialog' argument 3 names different: declaration '_name' definition 'name'. [funcArgNamesDifferent]
src/config/globalconf.cpp:410:46: style: inconclusive: Function 'set_instruct_tglart' argument 1 names different: declaration 'set' definition 'tgl'. [funcArgNamesDifferent]
src/config/globalconf.cpp:420:40: style: inconclusive: Function 'set_instruct_tglimg' argument 1 names different: declaration 'set' definition 'tgl'. [funcArgNamesDifferent]
src/control/mouseconfig.cpp:103:53: style: inconclusive: Function 'get_str_motions' argument 1 names different: declaration 'id' definition 'id_'. [funcArgNamesDifferent]
src/control/mouseconfig.cpp:115:57: style: inconclusive: Function 'get_default_motions' argument 1 names different: declaration 'id' definition 'id_'. [funcArgNamesDifferent]
src/dbtree/article2chcompati.cpp:19:86: style: inconclusive: Function 'Article2chCompati' argument 2 names different: declaration 'id' definition '_id'. [funcArgNamesDifferent]
src/dbtree/articlejbbs.cpp:17:74: style: inconclusive: Function 'ArticleJBBS' argument 2 names different: declaration 'id' definition '_id'. [funcArgNamesDifferent]
src/dbtree/articlemachi.cpp:20:76: style: inconclusive: Function 'ArticleMachi' argument 2 names different: declaration 'id' definition '_id'. [funcArgNamesDifferent]
src/dbtree/frontloader.cpp:19:46: style: inconclusive: Function 'FrontLoader' argument 1 names different: declaration 'url_boardbase' definition 'url_boadbase'. [funcArgNamesDifferent]
```
関数の宣言と定義で仮引数の名前が異なっているとcppcheckに指摘されたため
名前を整理して揃えます。

cppcheck 2.13.0のレポート (with inconclusive option)
```
src/article/drawareabase.cpp:1358:50: style: inconclusive: Function 'layout_one_text_node' argument 1 names different: declaration 'node' definition 'layout'. [funcArgNamesDifferent]
src/article/drawareabase.cpp:1358:63: style: inconclusive: Function 'layout_one_text_node' argument 2 names different: declaration 'node_x' definition 'x'. [funcArgNamesDifferent]
src/article/drawareabase.cpp:1358:71: style: inconclusive: Function 'layout_one_text_node' argument 3 names different: declaration 'node_y' definition 'y'. [funcArgNamesDifferent]
src/article/drawareabase.cpp:1470:49: style: inconclusive: Function 'layout_one_img_node' argument 1 names different: declaration 'node' definition 'layout'. [funcArgNamesDifferent]
src/article/drawareabase.cpp:1470:62: style: inconclusive: Function 'layout_one_img_node' argument 2 names different: declaration 'node_x' definition 'x'. [funcArgNamesDifferent]
src/article/drawareabase.cpp:1470:70: style: inconclusive: Function 'layout_one_img_node' argument 3 names different: declaration 'node_y' definition 'y'. [funcArgNamesDifferent]
src/article/drawareabase.cpp:1470:78: style: inconclusive: Function 'layout_one_img_node' argument 4 names different: declaration 'brsize' definition 'br_size'. [funcArgNamesDifferent]
src/dbtree/root.cpp:1182:119: style: inconclusive: Function 'add_etc' argument 4 names different: declaration 'id' definition 'boardid'. [funcArgNamesDifferent]
src/dbtree/ruleloader.cpp:20:44: style: inconclusive: Function 'RuleLoader' argument 1 names different: declaration 'url_boardbase' definition 'url_boadbase'. [funcArgNamesDifferent]
src/dbtree/settingloader.cpp:19:50: style: inconclusive: Function 'SettingLoader' argument 1 names different: declaration 'url_boardbase' definition 'url_boadbase'. [funcArgNamesDifferent]
src/jdlib/jdsocket.cpp:101:42: style: inconclusive: Function 'connect' argument 1 names different: declaration 'host' definition 'hostname'. [funcArgNamesDifferent]
src/jdlib/misccharcode.cpp:204:57: style: inconclusive: Function 'is_jis' argument 2 names different: declaration 'read_byte' definition 'byte'. [funcArgNamesDifferent]
src/jdlib/miscgtk.cpp:216:56: style: inconclusive: Function 'htmlcolor_to_str' argument 1 names different: declaration 'htmlcolor' definition '_htmlcolor'. [funcArgNamesDifferent]
```
関数の宣言と定義で仮引数の名前が異なっているとcppcheckに指摘されたため
名前を整理して揃えます。

cppcheck 2.13.0のレポート (with inconclusive option)
```
src/article/drawareabase.cpp:1567:54: style: inconclusive: Function 'get_width_of_one_char' argument 1 names different: declaration 'str' definition 'utfstr'. [funcArgNamesDifferent]
src/dbtree/nodetreebase.cpp:2974:39: style: inconclusive: Function 'check_anchor' argument 3 names different: declaration 'n' definition 'n_in'. [funcArgNamesDifferent]
src/dbtree/nodetreebase.cpp:85:72: style: inconclusive: Function 'NodeTreeBase' argument 2 names different: declaration 'date_modified' definition 'modified'. [funcArgNamesDifferent]
src/session.cpp:1012:61: style: inconclusive: Function 'set_items_msg_toolbar_str' argument 1 names different: declaration 'items' definition 'items_str'. [funcArgNamesDifferent]
src/session.cpp:1034:59: style: inconclusive: Function 'set_items_board_col_str' argument 1 names different: declaration 'items' definition 'items_str'. [funcArgNamesDifferent]
src/session.cpp:798:50: style: inconclusive: Function 'set_maximized_win_main' argument 1 names different: declaration 'maximized' definition 'set'. [funcArgNamesDifferent]
src/session.cpp:804:49: style: inconclusive: Function 'set_maximized_win_mes' argument 1 names different: declaration 'maximized' definition 'set'. [funcArgNamesDifferent]
src/session.cpp:838:44: style: inconclusive: Function 'set_show_sidebar' argument 1 names different: declaration 'showbar' definition 'showurl'. [funcArgNamesDifferent]
src/session.cpp:909:65: style: inconclusive: Function 'set_items_sidebar_toolbar_str' argument 1 names different: declaration 'items' definition 'items_str'. [funcArgNamesDifferent]
src/session.cpp:992:63: style: inconclusive: Function 'set_items_board_toolbar_str' argument 1 names different: declaration 'items' definition 'items_str'. [funcArgNamesDifferent]
src/skeleton/dragnote.cpp:188:64: style: inconclusive: Function 'remove_page' argument 2 names different: declaration 'adust_tab' definition 'adjust_tab'. [funcArgNamesDifferent]
src/skeleton/dragnote.cpp:347:92: style: inconclusive: Function 'set_tabicon' argument 3 names different: declaration 'icon' definition 'id'. [funcArgNamesDifferent]
src/xml/dom.cpp:474:56: style: inconclusive: Function 'append_treestore' argument 4 names different: declaration 'parnet' definition 'parent'. [funcArgNamesDifferent]
```
@ma8ma ma8ma added the bug バグの追跡 label Jan 27, 2024
@ma8ma ma8ma merged commit d44c393 into master Jan 27, 2024
20 checks passed
@ma8ma ma8ma deleted the organize-function-parameter-names-part1-2-3 branch January 27, 2024 13:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug バグの追跡
Projects
No open projects
Development

Successfully merging this pull request may close these issues.

1 participant