Skip to content

Commit

Permalink
履歴管理クラスに関するインクルード文を整理する (#1697)
Browse files Browse the repository at this point in the history
- CRecentを利用する際にインクルードするヘッダファイルを変更
- CRecentとその派生クラスにおいてインクルードするヘッダを整理
  • Loading branch information
Kohki Akikaze authored Jun 29, 2021
2 parents c1568de + 4e06a5c commit 9768d7f
Show file tree
Hide file tree
Showing 32 changed files with 65 additions and 61 deletions.
1 change: 1 addition & 0 deletions sakura_core/dlg/CDlgExec.h
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@

#include "dlg/CDialog.h"
#include "recent/CRecentCmd.h"
#include "recent/CRecentCurDir.h"

/*-----------------------------------------------------------------------
クラスの宣言
Expand Down
10 changes: 9 additions & 1 deletion sakura_core/dlg/CDlgFavorite.h
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,15 @@
#pragma once

#include "dlg/CDialog.h"
#include "recent/CRecent.h"
#include "recent/CRecentFile.h"
#include "recent/CRecentFolder.h"
#include "recent/CRecentExceptMru.h"
#include "recent/CRecentSearch.h"
#include "recent/CRecentReplace.h"
#include "recent/CRecentGrepFile.h"
#include "recent/CRecentGrepFolder.h"
#include "recent/CRecentCmd.h"
#include "recent/CRecentCurDir.h"

//!「履歴とお気に入りの管理」ダイアログ
//アクセス方法:[設定] - [履歴の管理]
Expand Down
6 changes: 5 additions & 1 deletion sakura_core/dlg/CDlgGrep.h
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,12 @@
class CDlgGrep;

#include "dlg/CDialog.h"
#include "recent/CRecent.h"
#include "util/window.h"
#include "recent/CRecentSearch.h"
#include "recent/CRecentGrepFile.h"
#include "recent/CRecentGrepFolder.h"
#include "recent/CRecentExcludeFile.h"
#include "recent/CRecentExcludeFolder.h"

#define DEFAULT_EXCLUDE_FILE_PATTERN L"*.msi;*.exe;*.obj;*.pdb;*.ilk;*.res;*.pch;*.iobj;*.ipdb"
#define DEFAULT_EXCLUDE_FOLDER_PATTERN L".git;.svn;.vs"
Expand Down
1 change: 1 addition & 0 deletions sakura_core/dlg/CDlgGrepReplace.h
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ class CDlgGrep;

#include "dlg/CDialog.h"
#include "dlg/CDlgGrep.h"
#include "recent/CRecentReplace.h"

//! GREP置換ダイアログボックス
class CDlgGrepReplace final : public CDlgGrep
Expand Down
3 changes: 2 additions & 1 deletion sakura_core/dlg/CDlgOpenFile_CommonFileDialog.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@
#include "CEol.h"
#include "charset/CCodePage.h"
#include "doc/CDocListener.h"
#include "recent/CRecent.h"
#include "util/window.h"
#include "util/shell.h"
#include "util/file.h"
Expand All @@ -45,6 +44,8 @@
#include "sakura_rc.h"
#include "sakura.hh"
#include "String_define.h"
#include "recent/CRecentFile.h"
#include "recent/CRecentFolder.h"

static const DWORD p_helpids[] = { //13100
// IDOK, HIDOK_OPENDLG, //Winのヘルプで勝手に出てくる
Expand Down
3 changes: 2 additions & 1 deletion sakura_core/dlg/CDlgReplace.h
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,9 @@
#pragma once

#include "dlg/CDialog.h"
#include "recent/CRecent.h"
#include "util/window.h"
#include "recent/CRecentReplace.h"
#include "recent/CRecentSearch.h"

/*-----------------------------------------------------------------------
クラスの宣言
Expand Down
7 changes: 6 additions & 1 deletion sakura_core/env/CSearchKeywordManager.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,12 @@
#include "DLLSHAREDATA.h"

#include "CSearchKeywordManager.h"
#include "recent/CRecent.h"
#include "recent/CRecentSearch.h"
#include "recent/CRecentReplace.h"
#include "recent/CRecentGrepFile.h"
#include "recent/CRecentGrepFolder.h"
#include "recent/CRecentExcludeFile.h"
#include "recent/CRecentExcludeFolder.h"

/*! m_aSearchKeysにpszSearchKeyを追加する。
YAZAKI
Expand Down
2 changes: 2 additions & 0 deletions sakura_core/prop/CPropComGeneral.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@
#include "sakura.hh"
#include "config/app_constants.h"
#include "String_define.h"
#include "recent/CRecentFile.h"
#include "recent/CRecentFolder.h"

//@@@ 2001.02.04 Start by MIK: Popup Help
TYPE_NAME_ID<int> SpecialScrollModeArr[] = {
Expand Down
2 changes: 0 additions & 2 deletions sakura_core/recent/CRecent.h
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@
#define SAKURA_CRECENT_F4D70310_9FAF_4F07_9431_2B011A47142D_H_
#pragma once

#include "_main/global.h"
#include "env/DLLSHAREDATA.h"

class CRecent{
Expand Down Expand Up @@ -83,5 +82,4 @@ class CRecent{
}
};

#include "CRecentImp.h"
#endif /* SAKURA_CRECENT_F4D70310_9FAF_4F07_9431_2B011A47142D_H_ */
3 changes: 0 additions & 3 deletions sakura_core/recent/CRecentCmd.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,6 @@

#include "StdAfx.h"
#include "CRecentCmd.h"
#include "config/maxdata.h"
#include "env/DLLSHAREDATA.h"
#include <string.h>

// -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- //
// 生成 //
Expand Down
2 changes: 0 additions & 2 deletions sakura_core/recent/CRecentCurDir.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,6 @@
#include "StdAfx.h"
#include "CRecentCurDir.h"
#include "config/maxdata.h"
#include "env/DLLSHAREDATA.h"
#include <string.h>

// -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- //
// 生成 //
Expand Down
2 changes: 0 additions & 2 deletions sakura_core/recent/CRecentEditNode.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,6 @@

#include "StdAfx.h"
#include "CRecentEditNode.h"
#include <string.h>
#include "env/DLLSHAREDATA.h"

// -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- //
// 生成 //
Expand Down
7 changes: 3 additions & 4 deletions sakura_core/recent/CRecentExceptMru.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,9 @@
distribution.
*/

#include "stdafx.h"
#include "CRecentExceptMRU.h"
#include <string.h>
#include "env/DLLSHAREDATA.h"
#include "StdAfx.h"
#include "CRecentExceptMru.h"
#include "config/maxdata.h"

// -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- //
// 生成 //
Expand Down
5 changes: 2 additions & 3 deletions sakura_core/recent/CRecentExcludeFile.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
/*
/*! @file
Copyright (C) 2018-2021, Sakura Editor Organization
This software is provided 'as-is', without any express or implied
Expand All @@ -24,8 +25,6 @@

#include "StdAfx.h"
#include "CRecentExcludeFile.h"
#include <string.h>
#include "env/DLLSHAREDATA.h"

// -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- //
// 生成 //
Expand Down
4 changes: 3 additions & 1 deletion sakura_core/recent/CRecentExcludeFile.h
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
/*
/*! @file
Copyright (C) 2018-2021, Sakura Editor Organization
This software is provided 'as-is', without any express or implied
Expand Down Expand Up @@ -27,6 +28,7 @@

#include "CRecentImp.h"
#include "util/StaticType.h"
#include "config/maxdata.h"

typedef StaticString<WCHAR, MAX_EXCLUDE_PATH> CExcludeFileString;

Expand Down
5 changes: 2 additions & 3 deletions sakura_core/recent/CRecentExcludeFolder.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
/*
/*! @file
Copyright (C) 2018-2021, Sakura Editor Organization
This software is provided 'as-is', without any express or implied
Expand All @@ -23,9 +24,7 @@
*/

#include "StdAfx.h"
#include <string.h>
#include "CRecentExcludeFolder.h"
#include "env/DLLSHAREDATA.h"

// -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- //
// 生成 //
Expand Down
4 changes: 3 additions & 1 deletion sakura_core/recent/CRecentExcludeFolder.h
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
/*
/*! @file
Copyright (C) 2018-2021, Sakura Editor Organization
This software is provided 'as-is', without any express or implied
Expand Down Expand Up @@ -27,6 +28,7 @@

#include "CRecentImp.h"
#include "util/StaticType.h"
#include "config/maxdata.h"

typedef StaticString<WCHAR, MAX_EXCLUDE_PATH> CExcludeFolderString;

Expand Down
3 changes: 1 addition & 2 deletions sakura_core/recent/CRecentFile.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,7 @@

#include "StdAfx.h"
#include "recent/CRecentFile.h"
#include <string.h>
#include "env/DLLSHAREDATA.h"
#include "config/maxdata.h"

/*
アイテムの比較要素を取得する。
Expand Down
3 changes: 1 addition & 2 deletions sakura_core/recent/CRecentFolder.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,7 @@

#include "StdAfx.h"
#include "CRecentFolder.h"
#include <string.h>
#include "env/DLLSHAREDATA.h"
#include "config/maxdata.h"

// -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- //
// 生成 //
Expand Down
2 changes: 0 additions & 2 deletions sakura_core/recent/CRecentFolder.h
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,6 @@
#include "CRecentImp.h"
#include "util/StaticType.h"

//StaticVector< StaticString<WCHAR, _MAX_PATH>, MAX_GREPFOLDER, const WCHAR*>

typedef StaticString<WCHAR, _MAX_PATH> CPathString;

//! フォルダの履歴を管理 (RECENT_FOR_FOLDER)
Expand Down
2 changes: 0 additions & 2 deletions sakura_core/recent/CRecentGrepFile.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,6 @@

#include "StdAfx.h"
#include "CRecentGrepFile.h"
#include <string.h>
#include "env/DLLSHAREDATA.h"

// -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- //
// 生成 //
Expand Down
1 change: 1 addition & 0 deletions sakura_core/recent/CRecentGrepFile.h
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@

#include "CRecentImp.h"
#include "util/StaticType.h"
#include "config/maxdata.h"

typedef StaticString<WCHAR, MAX_GREP_PATH> CGrepFileString;

Expand Down
2 changes: 0 additions & 2 deletions sakura_core/recent/CRecentGrepFolder.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,7 @@
*/

#include "StdAfx.h"
#include <string.h>
#include "CRecentGrepFolder.h"
#include "env/DLLSHAREDATA.h"

// -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- //
// 生成 //
Expand Down
1 change: 1 addition & 0 deletions sakura_core/recent/CRecentGrepFolder.h
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@

#include "CRecentImp.h"
#include "util/StaticType.h"
#include "config/maxdata.h"

typedef StaticString<WCHAR, MAX_GREP_PATH> CGrepFolderString;

Expand Down
15 changes: 13 additions & 2 deletions sakura_core/recent/CRecentImp.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,19 @@
#include "StdAfx.h"
#include "CRecentImp.h"

#include "env/CAppNodeManager.h" // EditNode
#include "EditInfo.h" // EditInfo
#include "CRecentCmd.h"
#include "CRecentCurDir.h"
#include "CRecentEditNode.h"
#include "CRecentExceptMru.h"
#include "CRecentExcludeFile.h"
#include "CRecentExcludeFolder.h"
#include "CRecentFile.h"
#include "CRecentFolder.h"
#include "CRecentGrepFile.h"
#include "CRecentGrepFolder.h"
#include "CRecentReplace.h"
#include "CRecentSearch.h"
#include "CRecentTagjumpKeyword.h"

// -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- //
// 生成 //
Expand Down
15 changes: 0 additions & 15 deletions sakura_core/recent/CRecentImp.h
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
/*! @file */
// 各CRecent実装クラスのベースクラス

// エディタ系ファイルからincludeするときは CRecent.h をinclude
/*
Copyright (C) 2008, kobake
Copyright (C) 2018-2021, Sakura Editor Organization
Expand Down Expand Up @@ -123,17 +121,4 @@ class CRecentImp : public CRecent{
size_t m_nTextMaxLength; //!< 最大テキスト長(終端含む)
};

#include "CRecentFile.h"
#include "CRecentFolder.h"
#include "CRecentExceptMru.h"
#include "CRecentSearch.h"
#include "CRecentReplace.h"
#include "CRecentGrepFile.h"
#include "CRecentGrepFolder.h"
#include "CRecentExcludeFile.h"
#include "CRecentExcludeFolder.h"
#include "CRecentCmd.h"
#include "CRecentCurDir.h"
#include "CRecentEditNode.h"
#include "CRecentTagjumpKeyword.h"
#endif /* SAKURA_CRECENTIMP_B18E6196_5684_44E4_91E0_ADB1542BF7E1_H_ */
3 changes: 1 addition & 2 deletions sakura_core/recent/CRecentReplace.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,7 @@

#include "StdAfx.h"
#include "CRecentReplace.h"
#include <string.h>
#include "env/DLLSHAREDATA.h"
#include "config/maxdata.h"

// -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- //
// 生成 //
Expand Down
2 changes: 0 additions & 2 deletions sakura_core/recent/CRecentSearch.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,6 @@
#include "StdAfx.h"
#include "CRecentSearch.h"
#include "config/maxdata.h"
#include "env/DLLSHAREDATA.h"
#include <string.h>

// -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- //
// 生成 //
Expand Down
3 changes: 1 addition & 2 deletions sakura_core/recent/CRecentTagjumpKeyword.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,7 @@

#include "StdAfx.h"
#include "CRecentTagjumpKeyword.h"
#include "env/DLLSHAREDATA.h"
#include <string.h>
#include "config/maxdata.h"

// -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- //
// 生成 //
Expand Down
2 changes: 1 addition & 1 deletion sakura_core/view/CEditView_Command.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -37,11 +37,11 @@
#include "util/window.h"
#include "_main/CControlTray.h"
#include "charset/charcode.h"
#include "recent/CRecent.h"
#include "apiwrap/StdApi.h"
#include "apiwrap/CommonControl.h"
#include "config/system_constants.h"
#include "config/app_constants.h"
#include "recent/CRecentCmd.h"

/*
指定ファイルの指定位置にタグジャンプする。
Expand Down
3 changes: 3 additions & 0 deletions sakura_core/window/CEditWnd.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,9 @@
#include "config/system_constants.h"
#include "config/app_constants.h"
#include "String_define.h"
#include "recent/CRecentEditNode.h"
#include "recent/CRecentFile.h"
#include "recent/CRecentFolder.h"

//@@@ 2002.01.14 YAZAKI 印刷プレビューをCPrintPreviewに独立させたので
// 定義を削除
Expand Down
2 changes: 1 addition & 1 deletion sakura_core/window/CMainToolBar.h
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@
#define SAKURA_CMAINTOOLBAR_FEA7E388_DFEC_4E15_94CC_90A7E779797B_H_
#pragma once

#include "recent/CRecent.h"
#include "dlg/CDialog.h"
#include "recent/CRecentSearch.h"

class CEditWnd;
class CImageListMgr;
Expand Down

0 comments on commit 9768d7f

Please sign in to comment.