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.

Sign up for GitHub

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

Jump to bottom

アウトライン解析 データ配列クラスのリファクタリング #1647

Draft
wants to merge 8 commits into
base: master
Choose a base branch
from
Draft

アウトライン解析 データ配列クラスのリファクタリング #1647

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
bafbae5
アウトライン解析 データ配列クラスのリファクタリング
beru Apr 27, 2021
02671cf
Update sakura_core/outline/CDlgFuncList.cpp
beru May 19, 2021
93d50f1
Update sakura_core/outline/CDlgFuncList.cpp
beru May 19, 2021
a4b1fef
Update sakura_core/outline/CDlgFuncList.cpp
beru May 19, 2021
aa00f70
Update sakura_core/outline/CDlgFuncList.cpp
beru May 19, 2021
f50282f
Update sakura_core/outline/CDlgFuncList.cpp
beru May 19, 2021
7ba76cf
レビュー指摘対応
beru May 21, 2021
d7d0025
レビュー指摘対応
beru May 22, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 17 additions & 16 deletions sakura_core/dlg/CDlgJump.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -253,46 +253,47 @@ void CDlgJump::SetData( void )
nIndex = 0;
nPLSQLBlockNum = 0;
for( i = 0; i < cFuncInfoArr.GetNum(); ++i ){
if( 31 == cFuncInfoArr.GetAt( i )->m_nInfo ){
auto& cFuncInfo = cFuncInfoArr.GetAt(i);
if( 31 == cFuncInfo.m_nInfo ){
if( m_pShareData->m_bLineNumIsCRLF_ForJump ){ /* 行番号の表示 false=折り返し単位／true=改行単位 */
auto_sprintf( szText, LS(STR_DLGJUMP_PSLQL),
cFuncInfoArr.GetAt( i )->m_nFuncLineCRLF,
cFuncInfoArr.GetAt( i )->m_cmemFuncName.GetStringPtr()
cFuncInfo.m_nFuncLineCRLF,
cFuncInfo.m_strFuncName.c_str()
);
}else{
auto_sprintf( szText, LS(STR_DLGJUMP_PSLQL),
cFuncInfoArr.GetAt( i )->m_nFuncLineLAYOUT,
cFuncInfoArr.GetAt( i )->m_cmemFuncName.GetStringPtr()
cFuncInfo.m_nFuncLineLAYOUT,
cFuncInfo.m_strFuncName.c_str()
);
}
nIndex = Combo_AddString( hwndCtrl, szText );
if( m_pShareData->m_bLineNumIsCRLF_ForJump ){ /* 行番号の表示 false=折り返し単位／true=改行単位 */
Combo_SetItemData( hwndCtrl, nIndex, (Int)cFuncInfoArr.GetAt( i )->m_nFuncLineCRLF );
Combo_SetItemData( hwndCtrl, nIndex, (Int)cFuncInfo.m_nFuncLineCRLF );
}
else{
Combo_SetItemData( hwndCtrl, nIndex, (Int)cFuncInfoArr.GetAt( i )->m_nFuncLineLAYOUT );
Combo_SetItemData( hwndCtrl, nIndex, (Int)cFuncInfo.m_nFuncLineLAYOUT );
}
nPLSQLBlockNum++;
}
if( 41 == cFuncInfoArr.GetAt( i )->m_nInfo ){
if( 41 == cFuncInfo.m_nInfo ){
if( m_pShareData->m_bLineNumIsCRLF_ForJump ){ /* 行番号の表示 false=折り返し単位／true=改行単位 */
auto_sprintf( szText, LS(STR_DLGJUMP_PSLQL),
cFuncInfoArr.GetAt( i )->m_nFuncLineCRLF,
cFuncInfoArr.GetAt( i )->m_cmemFuncName.GetStringPtr()
cFuncInfo.m_nFuncLineCRLF,
cFuncInfo.m_strFuncName.c_str()
);
}else{
auto_sprintf( szText, LS(STR_DLGJUMP_PSLQL),
cFuncInfoArr.GetAt( i )->m_nFuncLineLAYOUT,
cFuncInfoArr.GetAt( i )->m_cmemFuncName.GetStringPtr()
cFuncInfo.m_nFuncLineLAYOUT,
cFuncInfo.m_strFuncName.c_str()
);
}
nIndexCurSel = nIndex = Combo_AddString( hwndCtrl, szText );
if( m_pShareData->m_bLineNumIsCRLF_ForJump ){ /* 行番号の表示 false=折り返し単位／true=改行単位 */
nWorkLine = (Int)cFuncInfoArr.GetAt( i )->m_nFuncLineCRLF;
Combo_SetItemData( hwndCtrl, nIndex, (Int)cFuncInfoArr.GetAt( i )->m_nFuncLineCRLF );
nWorkLine = (Int)cFuncInfo.m_nFuncLineCRLF;
Combo_SetItemData( hwndCtrl, nIndex, (Int)cFuncInfo.m_nFuncLineCRLF );
}else{
nWorkLine = (Int)cFuncInfoArr.GetAt( i )->m_nFuncLineLAYOUT;
Combo_SetItemData( hwndCtrl, nIndex, (Int)cFuncInfoArr.GetAt( i )->m_nFuncLineLAYOUT );
nWorkLine = (Int)cFuncInfo.m_nFuncLineLAYOUT;
Combo_SetItemData( hwndCtrl, nIndex, (Int)cFuncInfo.m_nFuncLineLAYOUT );
}
++nPLSQLBlockNum;
}
Expand Down
Loading