Merge pull request #1860 from GermanAizek/master

Code modernize C++17, refactor and minor optimize

Author: berryzplus

sakura_core/CDicMgr.cpp

@@ -52,7 +52,8 @@ BOOL CDicMgr::Search(
 	CRunningTimer cRunningTimer( L"CDicMgr::Search" );
 #endif
 	long	i;
-	const wchar_t*	pszDelimit = L" /// ";
+	constexpr auto& pszDelimit = L" /// ";
+	constexpr auto cchDelimit = _countof(pszDelimit) - 1;
 	wchar_t*	pszWork;
 	int		nRes;
 	wchar_t*	pszToken;
@@ -81,7 +82,7 @@ BOOL CDicMgr::Search(
 		pszWork = wcsstr( szLine, pszDelimit );
 		if( NULL != pszWork && szLine[0] != L';' ){
 			*pszWork = L'\0';
-			pszWork += wcslen( pszDelimit );
+			pszWork += cchDelimit;
 
 			/* 最初のトークンを取得します。 */
 			wchar_t *context = NULL;

sakura_core/CGrepAgent.cpp

@@ -122,8 +122,7 @@ class CFileLoadOrWnd{
 		, m_nLineNum(0)
 	{
 	}
-	~CFileLoadOrWnd(){
-	}
+	~CFileLoadOrWnd() = default;
 	ECodeType FileOpen(const WCHAR* pszFile, bool bBigFile, ECodeType charCode, int nFlag)
 	{
 		if( m_hWnd ){

sakura_core/CGrepEnumFileBase.h

@@ -115,8 +115,9 @@ class CGrepEnumFileBase {
 	int Enumerates( LPCWSTR lpBaseFolder, VGrepEnumKeys& vecKeys, CGrepEnumOptions& option, CGrepEnumFileBase* pExceptItems = NULL ){
 		int found = 0;
 
+		const auto cchBaseFolder = lpBaseFolder ? wcsnlen_s(lpBaseFolder, 4096 - 1) : 0; // FIXME: パス長の上限は暫定値。
 		for( int i = 0; i < (int)vecKeys.size(); i++ ){
-			int baseLen = wcslen( lpBaseFolder );
+			int baseLen = cchBaseFolder;
 			LPWSTR lpPath = new WCHAR[ baseLen + wcslen( vecKeys[ i ] ) + 2 ];
 			if( NULL == lpPath ) break;
 			wcscpy( lpPath, lpBaseFolder );
@@ -163,11 +164,11 @@ class CGrepEnumFileBase {
 					if( IsValid( w32fd, lpName ) ){
 						if( pExceptItems && pExceptItems->IsExist( lpFullPath ) ){
 						}else{
-							m_vpItems.push_back( PairGrepEnumItem( lpName, w32fd.nFileSizeLow ) );
+							m_vpItems.emplace_back( lpName, w32fd.nFileSizeLow );
 							found++; // 2011.11.19
 							if( pExceptItems && nKeyDirLen ){
 								// フォルダーを含んだパスなら検索済みとして除外指定に追加する
-								pExceptItems->m_vpItems.push_back( PairGrepEnumItem( lpFullPath, w32fd.nFileSizeLow ) );
+								pExceptItems->m_vpItems.emplace_back( lpFullPath, w32fd.nFileSizeLow );
 							}else{
 								delete [] lpFullPath;
 							}

sakura_core/CGrepEnumKeys.h

@@ -69,8 +69,8 @@ class CGrepEnumKeys {
 	}
 
 	// 除外ファイルの2つの解析済み配列から1つのリストを作る
-	auto GetExcludeFiles() const ->  std::list<decltype(m_vecExceptFileKeys)::value_type> {
-		std::list<decltype(m_vecExceptFileKeys)::value_type> excludeFiles;
+	auto GetExcludeFiles() const ->  std::vector<decltype(m_vecExceptFileKeys)::value_type> {
+		std::vector<decltype(m_vecExceptFileKeys)::value_type> excludeFiles;
 		const auto& fileKeys = m_vecExceptFileKeys;
 		excludeFiles.insert( excludeFiles.cend(), fileKeys.cbegin(), fileKeys.cend() );
 		const auto& absFileKeys = m_vecExceptAbsFileKeys;
@@ -79,8 +79,8 @@ class CGrepEnumKeys {
 	}
 
 	// 除外フォルダーの2つの解析済み配列から1つのリストを作る
-	auto GetExcludeFolders() const ->  std::list<decltype(m_vecExceptFolderKeys)::value_type> {
-		std::list<decltype(m_vecExceptFolderKeys)::value_type> excludeFolders;
+	auto GetExcludeFolders() const ->  std::vector<decltype(m_vecExceptFolderKeys)::value_type> {
+		std::vector<decltype(m_vecExceptFolderKeys)::value_type> excludeFolders;
 		const auto& folderKeys = m_vecExceptFolderKeys;
 		excludeFolders.insert( excludeFolders.cend(), folderKeys.cbegin(), folderKeys.cend() );
 		const auto& absFolderKeys = m_vecExceptAbsFolderKeys;

sakura_core/CProfile.cpp

@@ -72,7 +72,7 @@ using namespace std;
 */
 void CProfile::Init( void )
 {
-	m_strProfileName = L"";
+	m_strProfileName.clear();
 	m_ProfileData.clear();
 	m_bRead = true;
 	return;
@@ -100,17 +100,17 @@ void CProfile::ReadOneline(
 	// セクション取得
 	//	Jan. 29, 2004 genta compare使用
 	if( line.compare( 0, 1, LTEXT("[") ) == 0 
-			&& line.find( LTEXT("=") ) == line.npos
-			&& line.find( LTEXT("]") ) == ( line.size() - 1 ) ) {
+			&& line.find( LTEXT('=') ) == line.npos
+			&& line.find( LTEXT(']') ) == ( line.size() - 1 ) ) {
 		Section Buffer;
 		Buffer.strSectionName = line.substr( 1, line.size() - 1 - 1 );
 		m_ProfileData.push_back( Buffer );
 	}
 	// エントリ取得
 	else if( !m_ProfileData.empty() ) {	//最初のセクション以前の行のエントリは無視
-		wstring::size_type idx = line.find( LTEXT("=") );
+		wstring::size_type idx = line.find( LTEXT('=') );
 		if( line.npos != idx ) {
-			m_ProfileData.back().mapEntries.insert( PAIR_STR_STR( line.substr(0,idx), line.substr(idx+1) ) );
+			m_ProfileData.back().mapEntries.emplace( line.substr(0,idx), line.substr(idx+1) );
 		}
 	}
 }
@@ -247,7 +247,7 @@ bool CProfile::WriteProfile(
 
 	std::vector< wstring > vecLine;
 	if( NULL != pszComment ) {
-		vecLine.push_back( LTEXT(";") + wstring( pszComment ) );		// //->;	2008/5/24 Uchi
+		vecLine.emplace_back( LTEXT(";") + wstring( pszComment ) );		// //->;	2008/5/24 Uchi
 		vecLine.push_back( LTEXT("") );
 	}
 	for(auto iter = m_ProfileData.cbegin(); iter != m_ProfileData.cend(); iter++ ) {

sakura_core/CProfile.h

@@ -54,7 +54,6 @@ class CProfile
 	typedef std::wstring wstring;
 	typedef std::string string;
 
-	typedef std::pair< wstring, wstring > PAIR_STR_STR;
 	typedef std::map< wstring, wstring > MAP_STR_STR;
 	struct Section
 	{

sakura_core/CPropertyManager.cpp

@@ -111,7 +111,7 @@ bool CPropertyManager::OpenPropertySheetTypes( HWND hWnd, int nPageNum, CTypeCon
 	CPropTypes* pcPropTypes = new CPropTypes();
 	pcPropTypes->Create( G_AppInstance(), m_hwndOwner );
 
-	std::unique_ptr<STypeConfig> pType(new STypeConfig());
+	auto pType = std::make_unique<STypeConfig>();
 	CDocTypeManager().GetTypeConfig(nSettingType, *pType);
 	pcPropTypes->SetTypeData(*pType);
 	// Mar. 31, 2003 genta メモリ削減のためポインタに変更しProperySheet内で取得するように

sakura_core/CSelectLang.h

@@ -130,9 +130,9 @@ class CLoadString
 	/*
 	||  Constructors
 	*/
-	CLoadString(){}
+	CLoadString() = default;
 	CLoadString( UINT uid ){ LoadString( uid ); }		// 文字列読み込み付きコンストラクタ
-	/*virtual*/ ~CLoadString(){}
+	/*virtual*/ ~CLoadString() = default;
 
 	/*
 	||  Attributes & Operations

sakura_core/_main/CControlTray.cpp

@@ -815,7 +815,7 @@ LRESULT CControlTray::DispatchEvent(
 								int iBitmap = CMenuDrawer::TOOLBAR_ICON_PLUGCOMMAND_DEFAULT - 1;
 								const CPlug* plug = *it;
 								if( !plug->m_sIcon.empty() ){
-									iBitmap = m_cMenuDrawer.m_pcIcons->Add( plug->m_cPlugin.GetFilePath( plug->m_sIcon.c_str() ).c_str() );
+									iBitmap = m_cMenuDrawer.m_pcIcons->Add( plug->m_cPlugin.GetFilePath( plug->m_sIcon ).c_str() );
 								}
 								m_cMenuDrawer.AddToolButton( iBitmap, plug->GetFunctionCode() );
 							}

sakura_core/basis/CMySize.h

@@ -32,7 +32,7 @@
 class CMySize : public SIZE{
 public:
 	//コンストラクタ・デストラクタ
-	CMySize(){} //※初期化なし
+	CMySize() : CMySize(0, 0) {}
 	CMySize(int _cx,int _cy){ cx=_cx; cy=_cy; }
 	CMySize(const SIZE& rhs){ cx=rhs.cx; cy=rhs.cy; }