diff --git a/sakura_core/CGrepAgent.cpp b/sakura_core/CGrepAgent.cpp index 06a17991e9..7efc8f6075 100644 --- a/sakura_core/CGrepAgent.cpp +++ b/sakura_core/CGrepAgent.cpp @@ -169,8 +169,6 @@ DWORD CGrepAgent::DoGrep( const CNativeW* pcmGrepReplace, const CNativeT* pcmGrepFile, const CNativeT* pcmGrepFolder, - const CNativeT* pcmExcludeFile, - const CNativeT* pcmExcludeFolder, bool bGrepCurFolder, BOOL bGrepSubFolder, bool bGrepStdout, diff --git a/sakura_core/CGrepAgent.h b/sakura_core/CGrepAgent.h index 0b57d8fee2..2055afe968 100644 --- a/sakura_core/CGrepAgent.h +++ b/sakura_core/CGrepAgent.h @@ -85,8 +85,6 @@ class CGrepAgent : public CDocListenerEx{ const CNativeW* pcmGrepReplace, const CNativeT* pcmGrepFile, const CNativeT* pcmGrepFolder, - const CNativeT* pcmExcludeFile, - const CNativeT* pcmExcludeFolder, bool bGrepCurFolder, BOOL bGrepSubFolder, bool bGrepStdout, diff --git a/sakura_core/_main/CCommandLine.h b/sakura_core/_main/CCommandLine.h index 797a9298a8..0d4bca6c1b 100644 --- a/sakura_core/_main/CCommandLine.h +++ b/sakura_core/_main/CCommandLine.h @@ -33,8 +33,6 @@ struct GrepInfo { CNativeW cmGrepRep; //!< 置換キー CNativeT cmGrepFile; //!< 検索対象ファイル CNativeT cmGrepFolder; //!< 検索対象フォルダ - CNativeT cmExcludeFile; //!< 除外対象ファイル - CNativeT cmExcludeFolder; //!< 除外対象フォルダ SSearchOption sGrepSearchOption; //!< 検索オプション bool bGrepCurFolder; //!< カレントディレクトリを維持 bool bGrepStdout; //!< 標準出力モード diff --git a/sakura_core/_main/CControlTray.cpp b/sakura_core/_main/CControlTray.cpp index 4f392868ff..c603d9448b 100644 --- a/sakura_core/_main/CControlTray.cpp +++ b/sakura_core/_main/CControlTray.cpp @@ -92,20 +92,13 @@ void CControlTray::DoGrepCreateWindow(HINSTANCE hinst, HWND msgParent, CDlgGrep& CNativeW cmWork1; CNativeT cmWork2; CNativeT cmWork3; - CNativeT cmWorkExcludeFile; - CNativeT cmWorkExcludeFolder; cmWork1.SetString( cDlgGrep.m_strText.c_str() ); cmWork2.SetString( cDlgGrep.m_szFile ); cmWork3.SetString( cDlgGrep.m_szFolder ); - cmWorkExcludeFile.SetString(cDlgGrep.m_szExcludeFile); - cmWorkExcludeFolder.SetString(cDlgGrep.m_szExcludeFolder); - cmWork1.Replace( L"\"", L"\"\"" ); cmWork2.Replace( _T("\""), _T("\"\"") ); cmWork3.Replace( _T("\""), _T("\"\"") ); - cmWorkExcludeFile.Replace( _T("\""), _T("\"\"")); - cmWorkExcludeFolder.Replace(_T("\""), _T("\"\"")); // -GREPMODE -GKEY="1" -GFILE="*.*;*.c;*.h" -GFOLDER="c:\" -GCODE=0 -GOPT=S CNativeT cCmdLine; diff --git a/sakura_core/_main/CNormalProcess.cpp b/sakura_core/_main/CNormalProcess.cpp index f972b4c59a..0e7ce49017 100644 --- a/sakura_core/_main/CNormalProcess.cpp +++ b/sakura_core/_main/CNormalProcess.cpp @@ -210,8 +210,6 @@ bool CNormalProcess::InitializeProcess() &gi.cmGrepRep, &gi.cmGrepFile, &gi.cmGrepFolder, - &gi.cmExcludeFile, - &gi.cmExcludeFolder, gi.bGrepCurFolder, gi.bGrepSubFolder, gi.bGrepStdout, diff --git a/sakura_core/cmd/CViewCommander_Grep.cpp b/sakura_core/cmd/CViewCommander_Grep.cpp index a9060fe8df..7fdcdc464f 100644 --- a/sakura_core/cmd/CViewCommander_Grep.cpp +++ b/sakura_core/cmd/CViewCommander_Grep.cpp @@ -59,13 +59,9 @@ void CViewCommander::Command_GREP( void ) CNativeT cmWork2; CNativeT cmWork3; CNativeW cmWork4; - CNativeT cmWorkExcludeFile; - CNativeT cmWorkExcludeFolder; cmWork1.SetString( GetEditWindow()->m_cDlgGrep.m_strText.c_str() ); cmWork2.SetString( GetEditWindow()->m_cDlgGrep.m_szFile ); cmWork3.SetString( GetEditWindow()->m_cDlgGrep.m_szFolder ); - cmWorkExcludeFile.SetString(GetEditWindow()->m_cDlgGrep.m_szExcludeFile); - cmWorkExcludeFolder.SetString(GetEditWindow()->m_cDlgGrep.m_szExcludeFolder); /* 今のEditViewにGrep結果を表示する。 Grepモードのとき、または未編集で無題かつアウトプットでない場合。 @@ -95,8 +91,6 @@ void CViewCommander::Command_GREP( void ) &cmWork4, &cmWork2, &cmWork3, - &cmWorkExcludeFile, - &cmWorkExcludeFolder, false, GetEditWindow()->m_cDlgGrep.m_bSubFolder, false, @@ -166,16 +160,12 @@ void CViewCommander::Command_GREP_REPLACE( void ) CNativeT cmWork2; CNativeT cmWork3; CNativeW cmWork4; - CNativeT cmWorkExcludeFile; - CNativeT cmWorkExcludeFolder; CDlgGrepReplace& cDlgGrepRep = GetEditWindow()->m_cDlgGrepReplace; cmWork1.SetString( cDlgGrepRep.m_strText.c_str() ); cmWork2.SetString( cDlgGrepRep.m_szFile ); cmWork3.SetString( cDlgGrepRep.m_szFolder ); cmWork4.SetString( cDlgGrepRep.m_strText2.c_str() ); - cmWorkExcludeFile.SetString(cDlgGrepRep.m_szExcludeFile); - cmWorkExcludeFolder.SetString(cDlgGrepRep.m_szExcludeFolder); /* 今のEditViewにGrep結果を表示する。 Grepモードのとき、または未編集で無題かつアウトプットでない場合。 @@ -195,8 +185,6 @@ void CViewCommander::Command_GREP_REPLACE( void ) &cmWork4, &cmWork2, &cmWork3, - &cmWorkExcludeFile, - &cmWorkExcludeFolder, false, cDlgGrepRep.m_bSubFolder, false, // Stdout