From 4e89ce457b691a68fb18e8ff64f0ebb3bc4b32af Mon Sep 17 00:00:00 2001 From: Takashi Sawanaka Date: Sun, 27 Nov 2016 20:23:26 +0900 Subject: [PATCH] Remove unused #include directives --- Externals/crystaledit/editlib/basic.cpp | 1 - Externals/crystaledit/editlib/memcombo.cpp | 1 - Externals/crystaledit/editlib/verilog.cpp | 1 - Src/7zCommon.cpp | 1 - Src/AboutDlg.h | 1 - Src/Common/LanguageSelect.cpp | 1 - Src/Common/RegKey.cpp | 2 -- Src/CompareEngines/TimeSizeCompare.cpp | 2 -- Src/Diff3.h | 5 ----- Src/DiffContext.cpp | 3 --- Src/DiffContext.h | 3 +-- Src/DiffFileData.cpp | 1 - Src/DiffList.h | 1 - Src/DiffTextBuffer.cpp | 2 -- Src/DiffViewBar.h | 1 - Src/DiffWrapper.h | 2 -- Src/DirActions.cpp | 1 - Src/DirDoc.cpp | 1 - Src/DirView.h | 1 - Src/DirViewColItems.cpp | 1 - Src/DirViewColItems.h | 1 - Src/Environment.cpp | 1 - Src/Exceptions.h | 3 --- Src/FileFilterMgr.cpp | 1 - Src/FileOrFolderSelect.cpp | 1 - Src/FileTransform.cpp | 1 - Src/FileTransform.h | 1 - Src/FilepathEdit.cpp | 1 - Src/FilterCommentsManager.cpp | 1 - Src/FilterList.h | 1 - Src/FolderCmp.cpp | 11 ++++------- Src/HexMergeDoc.cpp | 2 -- Src/ImgMergeFrm.cpp | 2 -- Src/IntToIntMap.h | 2 ++ Src/JumpList.cpp | 1 - Src/LineFiltersList.cpp | 2 -- Src/LoadSaveCodepageDlg.cpp | 1 - Src/LocationBar.h | 1 - Src/MainFrm.cpp | 8 -------- Src/Merge.cpp | 3 --- Src/Merge7zFormatShellImpl.cpp | 1 - Src/MergeApp.cpp | 1 - Src/MergeCmdLineInfo.cpp | 2 -- Src/MergeDoc.cpp | 5 ----- Src/MergeEditView.cpp | 1 - Src/OpenView.cpp | 1 - Src/OptionsInit.cpp | 1 - Src/PatchDlg.cpp | 1 - Src/PathContext.cpp | 2 -- Src/PropArchive.cpp | 1 - Src/PropShell.cpp | 1 - Src/TempFile.cpp | 1 - Src/VSSHelper.cpp | 2 -- Src/paths.cpp | 1 - Src/stringdiffs.cpp | 2 -- Testing/GoogleTest/Paths/paths_test.cpp | 3 --- .../ShellFileOperations/ShellFileOperations_test.cpp | 1 - Testing/GoogleTest/unicoder/unicoder_test.cpp | 1 + 58 files changed, 8 insertions(+), 97 deletions(-) diff --git a/Externals/crystaledit/editlib/basic.cpp b/Externals/crystaledit/editlib/basic.cpp index 5afc9b0e9..cce4d690a 100644 --- a/Externals/crystaledit/editlib/basic.cpp +++ b/Externals/crystaledit/editlib/basic.cpp @@ -16,7 +16,6 @@ #include "StdAfx.h" #include "ccrystaltextview.h" -#include "ccrystaltextbuffer.h" #include "SyntaxColors.h" #include "string_util.h" diff --git a/Externals/crystaledit/editlib/memcombo.cpp b/Externals/crystaledit/editlib/memcombo.cpp index 7cfd23e57..b227b20d7 100644 --- a/Externals/crystaledit/editlib/memcombo.cpp +++ b/Externals/crystaledit/editlib/memcombo.cpp @@ -15,7 +15,6 @@ //////////////////////////////////////////////////////////////////////////// #include "StdAfx.h" -#include "resource.h" #include "editreg.h" #include "memcombo.h" #include "registry.h" diff --git a/Externals/crystaledit/editlib/verilog.cpp b/Externals/crystaledit/editlib/verilog.cpp index fb7811c4a..0ecbb4d44 100644 --- a/Externals/crystaledit/editlib/verilog.cpp +++ b/Externals/crystaledit/editlib/verilog.cpp @@ -16,7 +16,6 @@ #include "StdAfx.h" #include "ccrystaltextview.h" -#include "ccrystaltextbuffer.h" #include "SyntaxColors.h" #include "string_util.h" diff --git a/Src/7zCommon.cpp b/Src/7zCommon.cpp index 9fb06def4..cb8ba1fa5 100644 --- a/Src/7zCommon.cpp +++ b/Src/7zCommon.cpp @@ -101,7 +101,6 @@ DATE: BY: DESCRIPTION: #include #include "OptionsDef.h" #include "OptionsMgr.h" -#include "resource.h" #include "DirView.h" #include "DirDoc.h" #include "DirActions.h" diff --git a/Src/AboutDlg.h b/Src/AboutDlg.h index 8c0a2eda9..744687d67 100644 --- a/Src/AboutDlg.h +++ b/Src/AboutDlg.h @@ -24,7 +24,6 @@ #include #include -#include "UnicodeString.h" #include "MergeApp.h" class CAboutDlg diff --git a/Src/Common/LanguageSelect.cpp b/Src/Common/LanguageSelect.cpp index b97b4e0c8..f230a323b 100644 --- a/Src/Common/LanguageSelect.cpp +++ b/Src/Common/LanguageSelect.cpp @@ -6,7 +6,6 @@ #include "StdAfx.h" #include "LanguageSelect.h" -#include #include "version.h" #include "BCMenu.h" #include "Environment.h" diff --git a/Src/Common/RegKey.cpp b/Src/Common/RegKey.cpp index 24c5f14d0..a037e7783 100644 --- a/Src/Common/RegKey.cpp +++ b/Src/Common/RegKey.cpp @@ -8,10 +8,8 @@ #include "RegKey.h" #include #include -#include #include #include "UnicodeString.h" -#include "coretypes.h" /** * @brief Default constructor. diff --git a/Src/CompareEngines/TimeSizeCompare.cpp b/Src/CompareEngines/TimeSizeCompare.cpp index b0c19abd3..93c059c82 100644 --- a/Src/CompareEngines/TimeSizeCompare.cpp +++ b/Src/CompareEngines/TimeSizeCompare.cpp @@ -5,8 +5,6 @@ */ #include "TimeSizeCompare.h" -#include -#include #include #include #include "DiffItem.h" diff --git a/Src/Diff3.h b/Src/Diff3.h index 81015420d..1065d1eca 100644 --- a/Src/Diff3.h +++ b/Src/Diff3.h @@ -2,11 +2,6 @@ #include #include -#ifdef _DEBUG -# define POCO_NO_UNWINDOWS 1 -# include -# include -#endif #include "DiffList.h" /* diff3 algorithm. It is almost the same as GNU diff3's algorithm */ diff --git a/Src/DiffContext.cpp b/Src/DiffContext.cpp index 215acdc74..10aac34e0 100644 --- a/Src/DiffContext.cpp +++ b/Src/DiffContext.cpp @@ -26,11 +26,8 @@ #include "DiffContext.h" #include -#include -#include #include "CompareOptions.h" #include "version.h" -#include "FilterList.h" #include "paths.h" #include "codepage_detect.h" #include "DiffItemList.h" diff --git a/Src/DiffContext.h b/Src/DiffContext.h index 1113961fe..7d1f93414 100644 --- a/Src/DiffContext.h +++ b/Src/DiffContext.h @@ -7,12 +7,12 @@ #define POCO_NO_UNWINDOWS 1 #include -#include #include #include #include "PathContext.h" #include "DiffFileInfo.h" #include "DiffItemList.h" +#include "FilterList.h" class PackingInfo; class PrediffingInfo; @@ -21,7 +21,6 @@ struct DIFFITEM; class CompareStats; class IAbortable; class CDiffWrapper; -class FilterList; class CompareOptions; struct DIFFOPTIONS; class FilterCommentsManager; diff --git a/Src/DiffFileData.cpp b/Src/DiffFileData.cpp index 01e269597..c03b241b7 100644 --- a/Src/DiffFileData.cpp +++ b/Src/DiffFileData.cpp @@ -7,7 +7,6 @@ */ #include "DiffFileData.h" -#include #ifdef _WIN32 #include #else diff --git a/Src/DiffList.h b/Src/DiffList.h index 761a52a46..85c7d4499 100644 --- a/Src/DiffList.h +++ b/Src/DiffList.h @@ -21,7 +21,6 @@ */ #pragma once -#include #include #include diff --git a/Src/DiffTextBuffer.cpp b/Src/DiffTextBuffer.cpp index 04f2ac483..a34a47fc4 100644 --- a/Src/DiffTextBuffer.cpp +++ b/Src/DiffTextBuffer.cpp @@ -7,11 +7,9 @@ #include "StdAfx.h" #include "DiffTextBuffer.h" -#include #include #include "UniFile.h" #include "files.h" -#include "cs2cs.h" #include "locality.h" #include "paths.h" #include "OptionsDef.h" diff --git a/Src/DiffViewBar.h b/Src/DiffViewBar.h index 0fba1a0d0..1792b7c99 100644 --- a/Src/DiffViewBar.h +++ b/Src/DiffViewBar.h @@ -5,7 +5,6 @@ */ #pragma once -#include "sizecbar.h" #include "scbarcf.h" class CSplitterWndEx; diff --git a/Src/DiffWrapper.h b/Src/DiffWrapper.h index 2b8420222..611932f1c 100644 --- a/Src/DiffWrapper.h +++ b/Src/DiffWrapper.h @@ -24,11 +24,9 @@ #pragma once #include -#include #include "diff.h" #include "FileLocation.h" #include "PathContext.h" -#include "FileTextStats.h" #include "CompareOptions.h" #include "DiffList.h" #include "UnicodeString.h" diff --git a/Src/DirActions.cpp b/Src/DirActions.cpp index db3055d96..03d7346b0 100644 --- a/Src/DirActions.cpp +++ b/Src/DirActions.cpp @@ -22,7 +22,6 @@ #include "FileActionScript.h" #include "locality.h" #include "FileFilterHelper.h" -#include "OptionsMgr.h" static void ThrowConfirmCopy(const CDiffContext& ctxt, int origin, int destination, int count, const String& src, const String& dest, bool destIsSide); diff --git a/Src/DirDoc.cpp b/Src/DirDoc.cpp index dafbf37b8..c92e3daaa 100644 --- a/Src/DirDoc.cpp +++ b/Src/DirDoc.cpp @@ -43,7 +43,6 @@ #include "OptionsDef.h" #include "OptionsMgr.h" #include "OptionsDiffOptions.h" -#include "FileActionScript.h" #include "LineFiltersList.h" #include "FileFilterHelper.h" #include "unicoder.h" diff --git a/Src/DirView.h b/Src/DirView.h index e055f80de..1627cb7cc 100644 --- a/Src/DirView.h +++ b/Src/DirView.h @@ -27,7 +27,6 @@ ///////////////////////////////////////////////////////////////////////////// // CDirView view #include -#include #include #include "OptionsDiffColors.h" #include "SortHeaderCtrl.h" diff --git a/Src/DirViewColItems.cpp b/Src/DirViewColItems.cpp index 6f0ae31c7..b5b33903b 100644 --- a/Src/DirViewColItems.cpp +++ b/Src/DirViewColItems.cpp @@ -23,7 +23,6 @@ using Poco::Timestamp; #endif using std::swap; -using boost::int64_t; namespace { diff --git a/Src/DirViewColItems.h b/Src/DirViewColItems.h index 68322c8a2..dac14aeec 100644 --- a/Src/DirViewColItems.h +++ b/Src/DirViewColItems.h @@ -10,7 +10,6 @@ #include "UnicodeString.h" #include #include -#include struct DIFFITEM; class CDiffContext; diff --git a/Src/Environment.cpp b/Src/Environment.cpp index 43b03917c..eec0f0d05 100644 --- a/Src/Environment.cpp +++ b/Src/Environment.cpp @@ -8,7 +8,6 @@ #include "Environment.h" #include #include -#include #include #include #include diff --git a/Src/Exceptions.h b/Src/Exceptions.h index 14b31137e..308fa8950 100644 --- a/Src/Exceptions.h +++ b/Src/Exceptions.h @@ -27,15 +27,12 @@ #ifdef _MSC_VER -#include #include #include #include #endif -#include "UnicodeString.h" - /** * @brief C exception "wrapper" class for C++ try/catch * diff --git a/Src/FileFilterMgr.cpp b/Src/FileFilterMgr.cpp index 2bbfcfdc7..8eaadc9c5 100644 --- a/Src/FileFilterMgr.cpp +++ b/Src/FileFilterMgr.cpp @@ -20,7 +20,6 @@ #include "FileFilterMgr.h" #include -#include #include #include #include diff --git a/Src/FileOrFolderSelect.cpp b/Src/FileOrFolderSelect.cpp index 5d321f10a..01319acca 100644 --- a/Src/FileOrFolderSelect.cpp +++ b/Src/FileOrFolderSelect.cpp @@ -31,7 +31,6 @@ #include "Environment.h" #include "paths.h" #include "MergeApp.h" -#include "resource.h" static int CALLBACK BrowseCallbackProc(HWND hwnd, UINT uMsg, LPARAM lParam, LPARAM lpData); diff --git a/Src/FileTransform.cpp b/Src/FileTransform.cpp index 63af2c67b..1a7f3c8bf 100644 --- a/Src/FileTransform.cpp +++ b/Src/FileTransform.cpp @@ -28,7 +28,6 @@ #include #include #include "Plugins.h" -#include "paths.h" #include "multiformatText.h" #include "UniMarkdownFile.h" #include "Environment.h" diff --git a/Src/FileTransform.h b/Src/FileTransform.h index 69dc060c5..0e3e9c130 100644 --- a/Src/FileTransform.h +++ b/Src/FileTransform.h @@ -27,7 +27,6 @@ #include #include "UnicodeString.h" -#include "resource.h" #include "MergeApp.h" class UniFile; diff --git a/Src/FilepathEdit.cpp b/Src/FilepathEdit.cpp index ca394257e..930327575 100644 --- a/Src/FilepathEdit.cpp +++ b/Src/FilepathEdit.cpp @@ -31,7 +31,6 @@ #include "ClipBoard.h" #include "Shlwapi.h" #include "paths.h" -#include #ifdef _DEBUG #define new DEBUG_NEW diff --git a/Src/FilterCommentsManager.cpp b/Src/FilterCommentsManager.cpp index 36f7f4d56..97b972190 100644 --- a/Src/FilterCommentsManager.cpp +++ b/Src/FilterCommentsManager.cpp @@ -23,7 +23,6 @@ #include "FilterCommentsManager.h" #include #include -#include #include #include #include diff --git a/Src/FilterList.h b/Src/FilterList.h index 4fbc62e57..efaaac00c 100644 --- a/Src/FilterList.h +++ b/Src/FilterList.h @@ -6,7 +6,6 @@ #pragma once #include -#include #include #define POCO_NO_UNWINDOWS 1 #include diff --git a/Src/FolderCmp.cpp b/Src/FolderCmp.cpp index 5f78ff815..be165076a 100644 --- a/Src/FolderCmp.cpp +++ b/Src/FolderCmp.cpp @@ -15,10 +15,7 @@ #include "DiffList.h" #include "DiffWrapper.h" #include "FileTransform.h" -#include "IAbortable.h" -#include "ByteComparator.h" #include "codepage_detect.h" -#include "unicoder.h" #include "BinaryCompare.h" #include "TimeSizeCompare.h" #include "TFile.h" @@ -377,10 +374,10 @@ exitPrepAndCompare: if (nDirs > 2 && filepathUnpacked[2] != files[2]) try { TFile(filepathUnpacked[2]).remove(); } catch (...) { LogErrorString(string_format(_T("DeleteFile(%s) failed"), filepathUnpacked[2].c_str())); } - if (!pCtxt->m_bIgnoreCodepage && - (code & DIFFCODE::COMPAREFLAGS) == DIFFCODE::SAME && - !std::equal(encoding + 1, encoding + nDirs, encoding)) - code = (code & ~DIFFCODE::COMPAREFLAGS) | DIFFCODE::DIFF; + if (!pCtxt->m_bIgnoreCodepage && + (code & DIFFCODE::COMPAREFLAGS) == DIFFCODE::SAME && + !std::equal(encoding + 1, encoding + nDirs, encoding)) + code = (code & ~DIFFCODE::COMPAREFLAGS) | DIFFCODE::DIFF; } else if (nCompMethod == CMP_BINARY_CONTENT) { diff --git a/Src/HexMergeDoc.cpp b/Src/HexMergeDoc.cpp index 3a2341152..11bdeb9c9 100644 --- a/Src/HexMergeDoc.cpp +++ b/Src/HexMergeDoc.cpp @@ -29,12 +29,10 @@ #include "HexMergeDoc.h" #include #include "UnicodeString.h" -#include "FileTextEncoding.h" #include "HexMergeFrm.h" #include "HexMergeView.h" #include "DiffItem.h" #include "FolderCmp.h" -#include "Environment.h" #include "DiffContext.h" // FILE_SAME #include "DirDoc.h" #include "DirActions.h" diff --git a/Src/ImgMergeFrm.cpp b/Src/ImgMergeFrm.cpp index cf087bda6..a5a2c15af 100644 --- a/Src/ImgMergeFrm.cpp +++ b/Src/ImgMergeFrm.cpp @@ -45,8 +45,6 @@ #include "Constants.h" #include "DropHandler.h" #include -#include -#include #ifdef _DEBUG #define new DEBUG_NEW diff --git a/Src/IntToIntMap.h b/Src/IntToIntMap.h index 60474a4ab..81ad4e717 100644 --- a/Src/IntToIntMap.h +++ b/Src/IntToIntMap.h @@ -5,6 +5,8 @@ */ #pragma once +#include + /** * @brief An int->int map with helper methods for finding largest bin */ diff --git a/Src/JumpList.cpp b/Src/JumpList.cpp index e26cabe01..fa6eea017 100644 --- a/Src/JumpList.cpp +++ b/Src/JumpList.cpp @@ -6,7 +6,6 @@ */ #include "JumpList.h" #include -#include #include #include #include diff --git a/Src/LineFiltersList.cpp b/Src/LineFiltersList.cpp index c61ebd653..49f1dbd08 100644 --- a/Src/LineFiltersList.cpp +++ b/Src/LineFiltersList.cpp @@ -7,8 +7,6 @@ #include "LineFiltersList.h" #include #include -#include -#include "OptionsDef.h" #include "OptionsMgr.h" #include "UnicodeString.h" diff --git a/Src/LoadSaveCodepageDlg.cpp b/Src/LoadSaveCodepageDlg.cpp index 6b96b97e5..cd3afd6e3 100644 --- a/Src/LoadSaveCodepageDlg.cpp +++ b/Src/LoadSaveCodepageDlg.cpp @@ -7,7 +7,6 @@ #include "stdafx.h" #include "LoadSaveCodepageDlg.h" #include "resource.h" -#include "unicoder.h" #include "ExConverter.h" #ifdef _DEBUG diff --git a/Src/LocationBar.h b/Src/LocationBar.h index b4120324d..450906bf6 100644 --- a/Src/LocationBar.h +++ b/Src/LocationBar.h @@ -9,7 +9,6 @@ #pragma once -#include "sizecbar.h" #include "scbarcf.h" diff --git a/Src/MainFrm.cpp b/Src/MainFrm.cpp index 9cafaa7c1..3f0e57f5d 100644 --- a/Src/MainFrm.cpp +++ b/Src/MainFrm.cpp @@ -27,9 +27,6 @@ #include "StdAfx.h" #include "MainFrm.h" #include -#include -#include -#include #include #include #include "Constants.h" @@ -44,7 +41,6 @@ #include "DirView.h" #include "DirDoc.h" #include "OpenDoc.h" -#include "OpenView.h" #include "MergeDoc.h" #include "MergeEditView.h" #include "HexMergeDoc.h" @@ -56,7 +52,6 @@ #include "Environment.h" #include "PatchTool.h" #include "Plugins.h" -#include "SelectUnpackerDlg.h" #include "ConfigLog.h" #include "7zCommon.h" #include "Merge7zFormatMergePluginImpl.h" @@ -65,16 +60,13 @@ #include "OptionsDef.h" #include "codepage_detect.h" #include "unicoder.h" -#include "codepage.h" #include "PreferencesDlg.h" #include "ProjectFilePathsDlg.h" #include "FileOrFolderSelect.h" -#include "unicoder.h" #include "PluginsListDlg.h" #include "stringdiffs.h" #include "MergeCmdLineInfo.h" #include "OptionsFont.h" -#include "TFile.h" #include "JumpList.h" #include "DropHandler.h" #include "LanguageSelect.h" diff --git a/Src/Merge.cpp b/Src/Merge.cpp index fa9d8d6f9..b161bb148 100644 --- a/Src/Merge.cpp +++ b/Src/Merge.cpp @@ -62,14 +62,11 @@ #include "OptionsDef.h" #include "MergeCmdLineInfo.h" #include "ConflictFileParser.h" -#include "codepage.h" #include "JumpList.h" -#include "paths.h" #include "stringdiffs.h" #include "TFile.h" #include "SourceControl.h" #include "paths.h" -#include "Constants.h" // For shutdown cleanup #include "charsets.h" diff --git a/Src/Merge7zFormatShellImpl.cpp b/Src/Merge7zFormatShellImpl.cpp index f8b1fbfdf..4abef4092 100644 --- a/Src/Merge7zFormatShellImpl.cpp +++ b/Src/Merge7zFormatShellImpl.cpp @@ -9,7 +9,6 @@ #include #include #include "unicoder.h" -#include "paths.h" #include "Merge7zFormatRegister.h" typedef _com_ptr_t<_com_IIID> IFileOperationPtr; diff --git a/Src/MergeApp.cpp b/Src/MergeApp.cpp index aeb986a0b..2c7af3b2c 100644 --- a/Src/MergeApp.cpp +++ b/Src/MergeApp.cpp @@ -3,7 +3,6 @@ #include "Merge.h" #include "version.h" #include "paths.h" -#include "Environment.h" #include "Constants.h" #include "unicoder.h" diff --git a/Src/MergeCmdLineInfo.cpp b/Src/MergeCmdLineInfo.cpp index d041d9b98..569973b78 100644 --- a/Src/MergeCmdLineInfo.cpp +++ b/Src/MergeCmdLineInfo.cpp @@ -28,8 +28,6 @@ #include "MergeCmdLineInfo.h" -#include -#include #include "Constants.h" #include "Paths.h" #include "OptionsDef.h" diff --git a/Src/MergeDoc.cpp b/Src/MergeDoc.cpp index 890edd151..a125a4690 100644 --- a/Src/MergeDoc.cpp +++ b/Src/MergeDoc.cpp @@ -27,17 +27,13 @@ #include "StdAfx.h" #include "MergeDoc.h" -#include -#include // PathCompactPathEx() #include #include -#include #include "UnicodeString.h" #include "Merge.h" #include "MainFrm.h" #include "DiffTextBuffer.h" #include "Environment.h" -#include "DiffContext.h" // FILE_SAME #include "MovedLines.h" #include "MergeEditView.h" #include "ChildFrm.h" @@ -50,7 +46,6 @@ #include "DiffFileInfo.h" #include "SaveClosingDlg.h" #include "DiffList.h" -#include "codepage.h" #include "paths.h" #include "OptionsMgr.h" #include "OptionsDiffOptions.h" diff --git a/Src/MergeEditView.cpp b/Src/MergeEditView.cpp index 79e5b28f7..96cb32e0c 100644 --- a/Src/MergeEditView.cpp +++ b/Src/MergeEditView.cpp @@ -40,7 +40,6 @@ #include "OptionsDef.h" #include "SyntaxColors.h" #include "ChildFrm.h" -#include "unicoder.h" #include "MergeLineFlags.h" #include "paths.h" #include "DropHandler.h" diff --git a/Src/OpenView.cpp b/Src/OpenView.cpp index b69fcf0e6..538acbe2a 100644 --- a/Src/OpenView.cpp +++ b/Src/OpenView.cpp @@ -27,7 +27,6 @@ #include "stdafx.h" #include "OpenView.h" #include -#include #include #include "UnicodeString.h" #include "Merge.h" diff --git a/Src/OptionsInit.cpp b/Src/OptionsInit.cpp index dbab7be18..21b13bee2 100644 --- a/Src/OptionsInit.cpp +++ b/Src/OptionsInit.cpp @@ -12,7 +12,6 @@ #include "OptionsDiffColors.h" #include "OptionsFont.h" #include "DiffWrapper.h" // CMP_CONTENT -#include "unicoder.h" #include "SourceControl.h" #include "paths.h" #include "Environment.h" diff --git a/Src/PatchDlg.cpp b/Src/PatchDlg.cpp index 3472d7777..c861aa6f4 100644 --- a/Src/PatchDlg.cpp +++ b/Src/PatchDlg.cpp @@ -26,7 +26,6 @@ #include "diff.h" #include "paths.h" #include "CompareOptions.h" -#include "PatchHTML.h" #include "FileOrFolderSelect.h" #include "Environment.h" diff --git a/Src/PathContext.cpp b/Src/PathContext.cpp index 14486bf3f..8d7bfaac7 100644 --- a/Src/PathContext.cpp +++ b/Src/PathContext.cpp @@ -7,9 +7,7 @@ #include "PathContext.h" #include -#include #include "paths.h" -#include "Environment.h" /** * @brief Copy constructor. diff --git a/Src/PropArchive.cpp b/Src/PropArchive.cpp index 8af5683ac..f8f95757e 100644 --- a/Src/PropArchive.cpp +++ b/Src/PropArchive.cpp @@ -6,7 +6,6 @@ #include "stdafx.h" #include "PropArchive.h" -#include "Constants.h" #include "OptionsDef.h" #include "OptionsMgr.h" #include "OptionsPanel.h" diff --git a/Src/PropShell.cpp b/Src/PropShell.cpp index 78a08eae3..851e604eb 100644 --- a/Src/PropShell.cpp +++ b/Src/PropShell.cpp @@ -8,7 +8,6 @@ #include "stdafx.h" #include "PropShell.h" #include "RegKey.h" -#include "OptionsDef.h" #include "OptionsMgr.h" #include "OptionsPanel.h" #include "Constants.h" diff --git a/Src/TempFile.cpp b/Src/TempFile.cpp index e955c7f75..c487ab635 100644 --- a/Src/TempFile.cpp +++ b/Src/TempFile.cpp @@ -9,7 +9,6 @@ #include #include #include -#include #include "paths.h" #include "Environment.h" #include "Constants.h" diff --git a/Src/VSSHelper.cpp b/Src/VSSHelper.cpp index 346220fbb..37fd63f9e 100644 --- a/Src/VSSHelper.cpp +++ b/Src/VSSHelper.cpp @@ -23,13 +23,11 @@ #include "VSSHelper.h" #include -#include #include #include "UnicodeString.h" #include "paths.h" #include "Environment.h" #include "MergeApp.h" -#include "resource.h" String VSSHelper::GetProjectBase() const { diff --git a/Src/paths.cpp b/Src/paths.cpp index de4e4a5b3..7403efd07 100644 --- a/Src/paths.cpp +++ b/Src/paths.cpp @@ -13,7 +13,6 @@ #include #include #include "PathContext.h" -#include "unicoder.h" #include "coretools.h" static bool IsSlash(const String& pszStart, size_t nPos); diff --git a/Src/stringdiffs.cpp b/Src/stringdiffs.cpp index 8bf3929b0..76fc93e4f 100644 --- a/Src/stringdiffs.cpp +++ b/Src/stringdiffs.cpp @@ -9,9 +9,7 @@ #define NOMINMAX #include #include -#include #include -#include #include #include "CompareOptions.h" #include "stringdiffsi.h" diff --git a/Testing/GoogleTest/Paths/paths_test.cpp b/Testing/GoogleTest/Paths/paths_test.cpp index 8b9d180f5..1c88723da 100644 --- a/Testing/GoogleTest/Paths/paths_test.cpp +++ b/Testing/GoogleTest/Paths/paths_test.cpp @@ -1,8 +1,5 @@ #include #include -#include -#include -#include #include "paths.h" // Expects that C:\Temp exists for creating temporary testing files. diff --git a/Testing/GoogleTest/ShellFileOperations/ShellFileOperations_test.cpp b/Testing/GoogleTest/ShellFileOperations/ShellFileOperations_test.cpp index 347f62bc4..7d28d3dbb 100644 --- a/Testing/GoogleTest/ShellFileOperations/ShellFileOperations_test.cpp +++ b/Testing/GoogleTest/ShellFileOperations/ShellFileOperations_test.cpp @@ -2,7 +2,6 @@ #include #include #include -#include #include "UnicodeString.h" #include "ShellFileOperations.h" diff --git a/Testing/GoogleTest/unicoder/unicoder_test.cpp b/Testing/GoogleTest/unicoder/unicoder_test.cpp index 94ab8ce1c..a8681bda7 100644 --- a/Testing/GoogleTest/unicoder/unicoder_test.cpp +++ b/Testing/GoogleTest/unicoder/unicoder_test.cpp @@ -1,4 +1,5 @@ #include +#include "codepage.h" #include "unicoder.h" namespace -- 2.11.0