レビュー指摘対応

virtual 指定子と override 指定子を同時に指定しないように変更派生クラスのデストラクタに override 指定子を指定しないように変更
sakura-editor · Nov 16, 2019 · 4d92fd2 · 4d92fd2
1 parent 8f6def6
commit 4d92fd2
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/sakura_core/CGrepEnumFiles.h b/sakura_core/CGrepEnumFiles.h
@@ -42,7 +42,7 @@ class CGrepEnumFiles : public CGrepEnumFileBase {
 	virtual ~CGrepEnumFiles(){
 	}
 
-	virtual BOOL IsValid( WIN32_FIND_DATA& w32fd, LPCWSTR pFile = NULL ) override {
+	BOOL IsValid( WIN32_FIND_DATA& w32fd, LPCWSTR pFile = NULL ) override {
 		if( ! ( w32fd.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY ) ){
 			if( CGrepEnumFileBase::IsValid( w32fd, pFile ) ){
 				return TRUE;

diff --git a/sakura_core/_main/CControlProcess.h b/sakura_core/_main/CControlProcess.h
@@ -41,12 +41,12 @@ class CControlProcess final : public CProcess {
 		m_pcTray( 0 )
 	{}
 
-	~CControlProcess() override;
+	~CControlProcess();
 protected:
 	CControlProcess();
 	bool InitializeProcess() override;
 	bool MainLoop() override;
-	virtual void OnExitProcess() override;
+	void OnExitProcess() override;
 
 private:
 	HANDLE			m_hMutex;				//!< アプリケーション実行検出用ミューテックス

diff --git a/sakura_core/_main/CNormalProcess.h b/sakura_core/_main/CNormalProcess.h
@@ -33,7 +33,7 @@ class CNormalProcess final : public CProcess {
 public:
 	//コンストラクタ・デストラクタ
 	CNormalProcess( HINSTANCE hInstance, LPCWSTR lpCmdLine );
-	~CNormalProcess() override;
+	~CNormalProcess();
 
 protected:
 	//プロセスハンドラ

diff --git a/sakura_core/dlg/CDlgCancel.h b/sakura_core/dlg/CDlgCancel.h
@@ -54,7 +54,7 @@ class CDlgCancel : public CDialog
 	/*
 	||  実装ヘルパ関数
 	*/
-	virtual BOOL OnInitDialog(HWND hwndDlg, WPARAM wParam, LPARAM lParam) override;
+	BOOL OnInitDialog(HWND hwndDlg, WPARAM wParam, LPARAM lParam) override;
 	BOOL OnBnClicked(int wID) override;
 	LPVOID GetHelpIdTable(void) override;	//@@@ 2002.01.18 add
 };