Skip to content

Commit

Permalink
レビュー指摘対応
Browse files Browse the repository at this point in the history
  • Loading branch information
beru committed May 22, 2021
1 parent 204010e commit 04cd642
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 11 deletions.
20 changes: 10 additions & 10 deletions sakura_core/outline/CDlgFuncList.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ int CALLBACK CDlgFuncList::CompareFunc_Asc( LPARAM lParam1, LPARAM lParam2, LPAR
CDlgFuncList* pcDlgFuncList;
pcDlgFuncList = (CDlgFuncList*)lParamSort;

size_t num = pcDlgFuncList->m_pcFuncInfoArr->GetNum();
int num = pcDlgFuncList->m_pcFuncInfoArr->GetNum();
if (lParam1 < 0 || lParam1 >= num) {
return -1;
}
Expand Down Expand Up @@ -555,9 +555,9 @@ void CDlgFuncList::SetData()
m_cmemClipText.SetString(L""); /* クリップボードコピー用テキスト */
{
const int nBuffLenTag = 13 + wcslen(m_pcFuncInfoArr->m_szFilePath);
const size_t nNum = m_pcFuncInfoArr->GetNum();
const int nNum = m_pcFuncInfoArr->GetNum();
size_t nBuffLen = 0;
for(size_t i = 0; i < nNum; ++i ){
for( int i = 0; i < nNum; ++i ){
const CFuncInfo& cFuncInfo = m_pcFuncInfoArr->GetAt(i);
nBuffLen += cFuncInfo.m_strFuncName.size();
}
Expand Down Expand Up @@ -918,9 +918,9 @@ void CDlgFuncList::SetTreeJava( HWND hwndDlg, BOOL bAddClass )
m_cmemClipText.SetString( L"" );
{
const int nBuffLenTag = 13 + wcslen(m_pcFuncInfoArr->m_szFilePath);
const size_t nNum = m_pcFuncInfoArr->GetNum();
const int nNum = m_pcFuncInfoArr->GetNum();
int nBuffLen = 0;
for( size_t i = 0; i < nNum; i++ ){
for( int i = 0; i < nNum; i++ ){
const CFuncInfo& cFuncInfo = m_pcFuncInfoArr->GetAt(i);
nBuffLen += cFuncInfo.m_strFuncName.size();
}
Expand Down Expand Up @@ -1183,9 +1183,9 @@ void CDlgFuncList::SetListVB (void)
m_cmemClipText.SetString( L"" );
{
const int nBuffLenTag = 17 + wcslen(m_pcFuncInfoArr->m_szFilePath);
const size_t nNum = m_pcFuncInfoArr->GetNum();
const int nNum = m_pcFuncInfoArr->GetNum();
int nBuffLen = 0;
for( size_t i = 0; i < nNum; i++ ){
for( int i = 0; i < nNum; i++ ){
const CFuncInfo& cFuncInfo = m_pcFuncInfoArr->GetAt(i);
nBuffLen += cFuncInfo.m_strFuncName.size();
}
Expand Down Expand Up @@ -1450,7 +1450,7 @@ void CDlgFuncList::SetTree(bool tagjump, bool nolabel)
CNativeW text;
if( tagjump ){
const WCHAR* pszFileName = cFuncInfo.m_strFileName.c_str();
if( pszFileName == NULL ){
if( cFuncInfo.m_strFileName.empty() ){
pszFileName = m_pcFuncInfoArr->m_szFilePath;
}
text.AllocStringBuffer(
Expand Down Expand Up @@ -1504,8 +1504,8 @@ void CDlgFuncList::SetDocLineFuncList()
CDocLineMgr* pcDocLineMgr = &pcEditView->GetDocument()->m_cDocLineMgr;

CFuncListManager().ResetAllFucListMark(pcDocLineMgr, false);
size_t num = m_pcFuncInfoArr->GetNum();
for( size_t i = 0; i < num; ++i ){
int num = m_pcFuncInfoArr->GetNum();
for( int i = 0; i < num; ++i ){
const CFuncInfo& cFuncInfo = m_pcFuncInfoArr->GetAt(i);
if( 0 < cFuncInfo.m_nFuncLineCRLF ){
CDocLine* pcDocLine = pcDocLineMgr->GetLine( cFuncInfo.m_nFuncLineCRLF - 1 );
Expand Down
2 changes: 1 addition & 1 deletion sakura_core/outline/CFuncInfoArr.h
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ class CFuncInfoArr {
void AppendData( CLogicInt nFuncLineCRLF, CLayoutInt nFuncLineLAYOUT, const WCHAR* pszFuncName,
int nInfo, int nDepth = 0 ); /* 配列の最後にデータを追加する 2002.04.01 YAZAKI 深さ導入*/
void AppendData( CLogicInt nLogicLine, CLogicInt nLogicCol, CLayoutInt nLayoutLine, CLayoutInt nLayoutCol, const WCHAR*, const WCHAR*, int, int nDepth = 0 ); /* 配列の最後にデータを追加する 2010.03.01 syat 桁導入*/
size_t GetNum( void ) const { return m_cFuncInfoArr.size(); } /* 配列要素数を返す */
int GetNum( void ) const { return (int)m_cFuncInfoArr.size(); } /* 配列要素数を返す */
void Empty( void );
void DUMP( void );
void SetAppendText( int info, std::wstring s, bool overwrite );
Expand Down

0 comments on commit 04cd642

Please sign in to comment.