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

Remove unnecessary condition for assigning value #338

Merged

Conversation

ma8ma
Copy link
Collaborator

@ma8ma ma8ma commented Jun 13, 2020

条件に関係なく代入の結果と同じになるとcppcheckに指摘されたため代入の条件文を削除します。

cppcheckのレポート

src/article/drawareabase.cpp:5442:28: style: The statement 'if (m_scrollinfo.x!=m_x_pointer) m_scrollinfo.x=m_x_pointer' is logically equivalent to 'm_scrollinfo.x=m_x_pointer'. [duplicateConditionalAssign]
        if( m_scrollinfo.x != m_x_pointer ) m_scrollinfo.x = m_x_pointer;
                           ^
src/article/drawareabase.cpp:5442:60: note: Assignment 'm_scrollinfo.x=m_x_pointer'
        if( m_scrollinfo.x != m_x_pointer ) m_scrollinfo.x = m_x_pointer;
                                                           ^
src/article/drawareabase.cpp:5442:28: note: Condition 'm_scrollinfo.x!=m_x_pointer' is redundant
        if( m_scrollinfo.x != m_x_pointer ) m_scrollinfo.x = m_x_pointer;
                           ^
src/article/drawareabase.cpp:5443:28: style: The statement 'if (m_scrollinfo.y!=m_y_pointer) m_scrollinfo.y=m_y_pointer' is logically equivalent to 'm_scrollinfo.y=m_y_pointer'. [duplicateConditionalAssign]
        if( m_scrollinfo.y != m_y_pointer ) m_scrollinfo.y = m_y_pointer;
                           ^
src/article/drawareabase.cpp:5443:60: note: Assignment 'm_scrollinfo.y=m_y_pointer'
        if( m_scrollinfo.y != m_y_pointer ) m_scrollinfo.y = m_y_pointer;
                                                           ^
src/article/drawareabase.cpp:5443:28: note: Condition 'm_scrollinfo.y!=m_y_pointer' is redundant
        if( m_scrollinfo.y != m_y_pointer ) m_scrollinfo.y = m_y_pointer;
                           ^
src/dbtree/frontloader.cpp:37:24: style: The statement 'if (m_url_boadbase!=url_boardbase) m_url_boadbase=url_boardbase' is logically equivalent to 'm_url_boadbase=url_boardbase'. [duplicateConditionalAssign]
    if( m_url_boadbase != url_boardbase ) m_url_boadbase = url_boardbase;
                       ^
src/dbtree/frontloader.cpp:37:58: note: Assignment 'm_url_boadbase=url_boardbase'
    if( m_url_boadbase != url_boardbase ) m_url_boadbase = url_boardbase;
                                                         ^
src/dbtree/frontloader.cpp:37:24: note: Condition 'm_url_boadbase!=url_boardbase' is redundant
    if( m_url_boadbase != url_boardbase ) m_url_boadbase = url_boardbase;
                       ^
src/dbtree/ruleloader.cpp:66:28: style: The statement 'if (m_url_boadbase!=url_boardbase) m_url_boadbase=url_boardbase' is logically equivalent to 'm_url_boadbase=url_boardbase'. [duplicateConditionalAssign]
        if( m_url_boadbase != url_boardbase ) m_url_boadbase = url_boardbase;
                           ^
src/dbtree/ruleloader.cpp:66:62: note: Assignment 'm_url_boadbase=url_boardbase'
        if( m_url_boadbase != url_boardbase ) m_url_boadbase = url_boardbase;
                                                             ^
src/dbtree/ruleloader.cpp:66:28: note: Condition 'm_url_boadbase!=url_boardbase' is redundant
        if( m_url_boadbase != url_boardbase ) m_url_boadbase = url_boardbase;
                           ^
src/dbtree/settingloader.cpp:68:28: style: The statement 'if (m_url_boadbase!=url_boardbase) m_url_boadbase=url_boardbase' is logically equivalent to 'm_url_boadbase=url_boardbase'. [duplicateConditionalAssign]
        if( m_url_boadbase != url_boardbase ) m_url_boadbase = url_boardbase;
                           ^
src/dbtree/settingloader.cpp:68:62: note: Assignment 'm_url_boadbase=url_boardbase'
        if( m_url_boadbase != url_boardbase ) m_url_boadbase = url_boardbase;
                                                             ^
src/dbtree/settingloader.cpp:68:28: note: Condition 'm_url_boadbase!=url_boardbase' is redundant
        if( m_url_boadbase != url_boardbase ) m_url_boadbase = url_boardbase;
                           ^
src/skeleton/edittreeview.cpp:69:23: style: The statement 'if (type!=TYPE_BOARD) type=TYPE_BOARD' is logically equivalent to 'type=TYPE_BOARD'. [duplicateConditionalAssign]
        else if( type != TYPE_BOARD ) type = TYPE_BOARD;
                      ^
src/skeleton/edittreeview.cpp:69:44: note: Assignment 'type=TYPE_BOARD'
        else if( type != TYPE_BOARD ) type = TYPE_BOARD;
                                           ^
src/skeleton/edittreeview.cpp:69:23: note: Condition 'type!=TYPE_BOARD' is redundant
        else if( type != TYPE_BOARD ) type = TYPE_BOARD;
                      ^
src/skeleton/edittreeview.cpp:75:23: style: The statement 'if (type!=TYPE_THREAD) type=TYPE_THREAD' is logically equivalent to 'type=TYPE_THREAD'. [duplicateConditionalAssign]
        else if( type != TYPE_THREAD ) type = TYPE_THREAD;
                      ^
src/skeleton/edittreeview.cpp:75:45: note: Assignment 'type=TYPE_THREAD'
        else if( type != TYPE_THREAD ) type = TYPE_THREAD;
                                            ^
src/skeleton/edittreeview.cpp:75:23: note: Condition 'type!=TYPE_THREAD' is redundant
        else if( type != TYPE_THREAD ) type = TYPE_THREAD;
                      ^

条件に関係なく代入の結果と同じになるとcppcheckに指摘されたため
代入の条件文を削除します。

cppcheckのレポート
```
src/article/drawareabase.cpp:5442:28: style: The statement 'if (m_scrollinfo.x!=m_x_pointer) m_scrollinfo.x=m_x_pointer' is logically equivalent to 'm_scrollinfo.x=m_x_pointer'. [duplicateConditionalAssign]
        if( m_scrollinfo.x != m_x_pointer ) m_scrollinfo.x = m_x_pointer;
                           ^
src/article/drawareabase.cpp:5442:60: note: Assignment 'm_scrollinfo.x=m_x_pointer'
        if( m_scrollinfo.x != m_x_pointer ) m_scrollinfo.x = m_x_pointer;
                                                           ^
src/article/drawareabase.cpp:5442:28: note: Condition 'm_scrollinfo.x!=m_x_pointer' is redundant
        if( m_scrollinfo.x != m_x_pointer ) m_scrollinfo.x = m_x_pointer;
                           ^
src/article/drawareabase.cpp:5443:28: style: The statement 'if (m_scrollinfo.y!=m_y_pointer) m_scrollinfo.y=m_y_pointer' is logically equivalent to 'm_scrollinfo.y=m_y_pointer'. [duplicateConditionalAssign]
        if( m_scrollinfo.y != m_y_pointer ) m_scrollinfo.y = m_y_pointer;
                           ^
src/article/drawareabase.cpp:5443:60: note: Assignment 'm_scrollinfo.y=m_y_pointer'
        if( m_scrollinfo.y != m_y_pointer ) m_scrollinfo.y = m_y_pointer;
                                                           ^
src/article/drawareabase.cpp:5443:28: note: Condition 'm_scrollinfo.y!=m_y_pointer' is redundant
        if( m_scrollinfo.y != m_y_pointer ) m_scrollinfo.y = m_y_pointer;
                           ^
src/dbtree/frontloader.cpp:37:24: style: The statement 'if (m_url_boadbase!=url_boardbase) m_url_boadbase=url_boardbase' is logically equivalent to 'm_url_boadbase=url_boardbase'. [duplicateConditionalAssign]
    if( m_url_boadbase != url_boardbase ) m_url_boadbase = url_boardbase;
                       ^
src/dbtree/frontloader.cpp:37:58: note: Assignment 'm_url_boadbase=url_boardbase'
    if( m_url_boadbase != url_boardbase ) m_url_boadbase = url_boardbase;
                                                         ^
src/dbtree/frontloader.cpp:37:24: note: Condition 'm_url_boadbase!=url_boardbase' is redundant
    if( m_url_boadbase != url_boardbase ) m_url_boadbase = url_boardbase;
                       ^
src/dbtree/ruleloader.cpp:66:28: style: The statement 'if (m_url_boadbase!=url_boardbase) m_url_boadbase=url_boardbase' is logically equivalent to 'm_url_boadbase=url_boardbase'. [duplicateConditionalAssign]
        if( m_url_boadbase != url_boardbase ) m_url_boadbase = url_boardbase;
                           ^
src/dbtree/ruleloader.cpp:66:62: note: Assignment 'm_url_boadbase=url_boardbase'
        if( m_url_boadbase != url_boardbase ) m_url_boadbase = url_boardbase;
                                                             ^
src/dbtree/ruleloader.cpp:66:28: note: Condition 'm_url_boadbase!=url_boardbase' is redundant
        if( m_url_boadbase != url_boardbase ) m_url_boadbase = url_boardbase;
                           ^
src/dbtree/settingloader.cpp:68:28: style: The statement 'if (m_url_boadbase!=url_boardbase) m_url_boadbase=url_boardbase' is logically equivalent to 'm_url_boadbase=url_boardbase'. [duplicateConditionalAssign]
        if( m_url_boadbase != url_boardbase ) m_url_boadbase = url_boardbase;
                           ^
src/dbtree/settingloader.cpp:68:62: note: Assignment 'm_url_boadbase=url_boardbase'
        if( m_url_boadbase != url_boardbase ) m_url_boadbase = url_boardbase;
                                                             ^
src/dbtree/settingloader.cpp:68:28: note: Condition 'm_url_boadbase!=url_boardbase' is redundant
        if( m_url_boadbase != url_boardbase ) m_url_boadbase = url_boardbase;
                           ^
src/skeleton/edittreeview.cpp:69:23: style: The statement 'if (type!=TYPE_BOARD) type=TYPE_BOARD' is logically equivalent to 'type=TYPE_BOARD'. [duplicateConditionalAssign]
        else if( type != TYPE_BOARD ) type = TYPE_BOARD;
                      ^
src/skeleton/edittreeview.cpp:69:44: note: Assignment 'type=TYPE_BOARD'
        else if( type != TYPE_BOARD ) type = TYPE_BOARD;
                                           ^
src/skeleton/edittreeview.cpp:69:23: note: Condition 'type!=TYPE_BOARD' is redundant
        else if( type != TYPE_BOARD ) type = TYPE_BOARD;
                      ^
src/skeleton/edittreeview.cpp:75:23: style: The statement 'if (type!=TYPE_THREAD) type=TYPE_THREAD' is logically equivalent to 'type=TYPE_THREAD'. [duplicateConditionalAssign]
        else if( type != TYPE_THREAD ) type = TYPE_THREAD;
                      ^
src/skeleton/edittreeview.cpp:75:45: note: Assignment 'type=TYPE_THREAD'
        else if( type != TYPE_THREAD ) type = TYPE_THREAD;
                                            ^
src/skeleton/edittreeview.cpp:75:23: note: Condition 'type!=TYPE_THREAD' is redundant
        else if( type != TYPE_THREAD ) type = TYPE_THREAD;
                      ^
```
@ma8ma ma8ma added the refactoring コードの整理 (バグ修正でも機能変更でもない) label Jun 13, 2020
@ma8ma ma8ma merged commit d125be9 into JDimproved:master Jun 13, 2020
@ma8ma ma8ma added this to Done in State of JDim-v0.3.0+ via automation Jun 13, 2020
@ma8ma ma8ma deleted the remove-unnecessary-cond-for-assigning-value branch June 13, 2020 13:35
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
refactoring コードの整理 (バグ修正でも機能変更でもない)
Projects
No open projects
Development

Successfully merging this pull request may close these issues.

None yet

1 participant