Remove unnecessary #includes using #include Diagnostics in Visual Studio

WinMerge · Feb 18, 2024 · 2202a28 · 2202a28
1 parent 77b742d
commit 2202a28
Show file tree

Hide file tree

Showing 29 changed files with 6 additions and 61 deletions.
diff --git a/Src/Common/multiformatText.cpp b/Src/Common/multiformatText.cpp
@@ -15,7 +15,6 @@
 #include "pch.h"
 #define NOMINMAX
 #include "multiformatText.h"
-#include <vector>
 #include <algorithm>
 #include <cstring>
 #include <cassert>

diff --git a/Src/CompareStats.cpp b/Src/CompareStats.cpp
@@ -7,8 +7,6 @@
 #include "pch.h"
 #include "CompareStats.h"
 #include <cassert>
-#include <cstring>
-#include <atomic>
 #include "DiffItem.h"
 
 /** 

diff --git a/Src/ConfigLog.cpp b/Src/ConfigLog.cpp
@@ -9,15 +9,13 @@
 #include "ConfigLog.h"
 #include <cassert>
 #include <windows.h>
-#include <memory>
 #include "Constants.h"
 #include "VersionInfo.h"
 #include "UniFile.h"
 #include "Plugins.h"
 #include "TFile.h"
 #include "paths.h"
 #include "locality.h"
-#include "unicoder.h"
 #include "Environment.h"
 #include "MergeApp.h"
 #include "OptionsMgr.h"

diff --git a/Src/DiffContext.cpp b/Src/DiffContext.cpp
@@ -12,12 +12,10 @@
 
 #include "pch.h"
 #include "DiffContext.h"
-#include <Poco/ScopedLock.h>
 #include "CompareOptions.h"
 #include "VersionInfo.h"
 #include "paths.h"
 #include "codepage_detect.h"
-#include "DiffItemList.h"
 #include "IAbortable.h"
 #include "DiffWrapper.h"
 #include "DebugNew.h"

diff --git a/Src/DiffFileData.cpp b/Src/DiffFileData.cpp
@@ -9,11 +9,8 @@
 #include "pch.h"
 #include "DiffFileData.h"
 #include "cio.h"
-#include <memory>
 #include "DiffItem.h"
-#include "FileLocation.h"
 #include "diff.h"
-#include "TFile.h"
 #include "FileTransform.h"
 #include "unicoder.h"
 #include "DebugNew.h"

diff --git a/Src/DiffList.cpp b/Src/DiffList.cpp
@@ -8,21 +8,17 @@
 #include "pch.h"
 #include "DiffList.h"
 #include <cassert>
-#include <string>
 #include <sstream>
 #include <algorithm>
 
-using std::swap;
-using std::vector;
-
 /**
  * @brief Swap diff sides.
  */
 void DIFFRANGE::swap_sides(int index1, int index2)
 {
-	swap(begin[index1], begin[index2]);
-	swap(end[index1], end[index2]);
-	swap(blank[index1], blank[index2]);
+	std::swap(begin[index1], begin[index2]);
+	std::swap(end[index1], end[index2]);
+	std::swap(blank[index1], blank[index2]);
 }
 
 /**
@@ -807,8 +803,8 @@ const DIFFRANGE * DiffList::LastSignificant3wayDiffRange(int nDiffType) const
  */
 void DiffList::Swap(int index1, int index2)
 {
-	vector<DiffRangeInfo>::iterator iter = m_diffs.begin();
-	vector<DiffRangeInfo>::const_iterator iterEnd = m_diffs.end();
+	std::vector<DiffRangeInfo>::iterator iter = m_diffs.begin();
+	std::vector<DiffRangeInfo>::const_iterator iterEnd = m_diffs.end();
 	while (iter != iterEnd)
 	{
 		(*iter).swap_sides(index1, index2);

diff --git a/Src/DiffThread.cpp b/Src/DiffThread.cpp
@@ -11,7 +11,6 @@
 #include <climits>
 #include <Poco/Thread.h>
 #include <Poco/Semaphore.h>
-#include "UnicodeString.h"
 #include "CompareStats.h"
 #include "IAbortable.h"
 #include "Plugins.h"

diff --git a/Src/DirCmpReportDlg.cpp b/Src/DirCmpReportDlg.cpp
@@ -7,7 +7,6 @@
 
 #include "stdafx.h"
 #include "DirCmpReportDlg.h"
-#include "Coretools.h"
 #include "DirReportTypes.h"
 #include "paths.h"
 #include "FileOrFolderSelect.h"

diff --git a/Src/DirDoc.cpp b/Src/DirDoc.cpp
@@ -13,7 +13,6 @@
 
 #include "StdAfx.h"
 #include "DirDoc.h"
-#include <Poco/StringTokenizer.h>
 #include <boost/range/mfc.hpp>
 #include "Merge.h"
 #include "IMergeDoc.h"
@@ -33,7 +32,6 @@
 #include "LineFiltersList.h"
 #include "SubstitutionFiltersList.h"
 #include "FileFilterHelper.h"
-#include "unicoder.h"
 #include "DirActions.h"
 #include "DirScan.h"
 #include "MessageBoxDialog.h"
@@ -47,7 +45,6 @@
 #define new DEBUG_NEW
 #endif
 
-using Poco::StringTokenizer;
 using boost::begin;
 using boost::end;
 

diff --git a/Src/DirFrame.cpp b/Src/DirFrame.cpp
@@ -13,7 +13,6 @@
 
 #include "stdafx.h"
 #include "DirFrame.h"
-#include "Merge.h"
 #include "OptionsDef.h"
 #include "OptionsMgr.h"
 

diff --git a/Src/FileFilterMgr.cpp b/Src/FileFilterMgr.cpp
@@ -8,7 +8,6 @@
 #include "pch.h"
 #include "FileFilterMgr.h"
 #include <vector>
-#include <Poco/String.h>
 #include <Poco/Glob.h>
 #include <Poco/RegularExpression.h>
 #include "DirTravel.h"
@@ -20,7 +19,6 @@
 
 using std::vector;
 using Poco::Glob;
-using Poco::icompare;
 using Poco::RegularExpression;
 
 static void AddFilterPattern(vector<FileFilterElementPtr> *filterList, String & str, bool fileFilter);

diff --git a/Src/FileOrFolderSelect.cpp b/Src/FileOrFolderSelect.cpp
@@ -17,8 +17,6 @@
 #pragma warning (disable:4091)	// VC bug when using XP enabled toolsets.
 #include <shlobj.h>
 #pragma warning (pop)
-#include <sys/stat.h>
-#include "Environment.h"
 #include "paths.h"
 #include "MergeApp.h"
 

diff --git a/Src/FolderCmp.cpp b/Src/FolderCmp.cpp
@@ -7,7 +7,6 @@
 #include "pch.h"
 #include "diff.h"
 #include "FolderCmp.h"
-#include <cassert>
 #include "Wrap_DiffUtils.h"
 #include "ByteCompare.h"
 #include "paths.h"

diff --git a/Src/InternalPlugins.cpp b/Src/InternalPlugins.cpp
@@ -1,19 +1,13 @@
 #include "pch.h"
 #include "Plugins.h"
 #define POCO_NO_UNWINDOWS 1
-#include <Poco/FileStream.h>
 #include <Poco/SAX/SAXParser.h>
 #include <Poco/SAX/SAXException.h>
 #include <Poco/SAX/ContentHandler.h>
 #include <Poco/SAX/Attributes.h>
 #include <Poco/Exception.h>
 #include <vector>
 #include <list>
-#include <unordered_set>
-#include <algorithm>
-#include <cassert>
-#include <iostream>
-#include <sstream>
 #include <windows.h>
 #include <Shlwapi.h>
 #include "MergeApp.h"

diff --git a/Src/MainFrm.cpp b/Src/MainFrm.cpp
@@ -60,9 +60,7 @@
 #include "JumpList.h"
 #include "DropHandler.h"
 #include "LanguageSelect.h"
-#include "VersionInfo.h"
 #include "Bitmap.h"
-#include "CCrystalTextMarkers.h"
 #include "utils/hqbitmap.h"
 #include "UniFile.h"
 #include "TFile.h"

diff --git a/Src/Merge7zFormatShellImpl.cpp b/Src/Merge7zFormatShellImpl.cpp
@@ -11,7 +11,6 @@
 #pragma warning (pop)
 #include <ShObjIdl.h>
 #include <comip.h>
-#include <vector>
 #include "unicoder.h"
 #include "Merge7zFormatRegister.h"
 #include "paths.h"

diff --git a/Src/MergeApp.cpp b/Src/MergeApp.cpp
@@ -2,7 +2,6 @@
 #include "MergeApp.h"
 #include "Merge.h"
 #include "VersionInfo.h"
-#include "paths.h"
 #include "Constants.h"
 #include "unicoder.h"
 

diff --git a/Src/MergeAppCOMClass.cpp b/Src/MergeAppCOMClass.cpp
@@ -1,7 +1,6 @@
 #include "pch.h"
 #include <Windows.h>
 #include "MergeAppCOMClass.h"
-#include "LanguageSelect.h"
 #include "OptionsMgr.h"
 #include "MergeApp.h"
 

diff --git a/Src/MergeDocLineDiffs.cpp b/Src/MergeDocLineDiffs.cpp
@@ -10,7 +10,6 @@
 #include <vector>
 #include <memory>
 #include "MergeEditView.h"
-#include "DiffTextBuffer.h"
 #include "stringdiffs.h"
 #include "UnicodeString.h"
 #include "SubstitutionFiltersList.h"

diff --git a/Src/MergeEditFrm.cpp b/Src/MergeEditFrm.cpp
@@ -14,11 +14,9 @@
 #include "stdafx.h"
 #include "MergeEditFrm.h"
 #include "Merge.h"
-#include "MainFrm.h"
 #include "MergeDoc.h"
 #include "MergeEditView.h"
 #include "LocationView.h"
-#include "DiffViewBar.h"
 #include "OptionsDef.h"
 #include "OptionsMgr.h"
 

diff --git a/Src/MergeEditSplitterView.cpp b/Src/MergeEditSplitterView.cpp
@@ -12,10 +12,8 @@
 
 #include "StdAfx.h"
 #include "MergeEditSplitterView.h"
-#include "Merge.h"
 #include "MergeDoc.h"
 #include "MergeEditview.h"
-#include "MainFrm.h"
 #include "OptionsMgr.h"
 #include "OptionsDef.h"
 

diff --git a/Src/OpenView.cpp b/Src/OpenView.cpp
@@ -13,7 +13,6 @@
 #include "stdafx.h"
 #include "OpenView.h"
 #include <vector>
-#include <sys/stat.h>
 #include "UnicodeString.h"
 #include "Merge.h"
 #include "OpenDoc.h"

diff --git a/Src/OptionsInit.cpp b/Src/OptionsInit.cpp
@@ -6,7 +6,6 @@
 
 #include "pch.h"
 #include <vector>
-#include <typeinfo>
 #include "OptionsDef.h"
 #include "OptionsMgr.h"
 #include "RegOptionsMgr.h"
@@ -20,7 +19,6 @@
 #include "DiffWrapper.h" // CMP_CONTENT
 #include "paths.h"
 #include "Environment.h"
-#include "FileTransform.h"
 #include "Constants.h"
 
 // Functions to copy values set by installer from HKLM to HKCU.

diff --git a/Src/PluginManager.cpp b/Src/PluginManager.cpp
@@ -7,7 +7,6 @@
 
 #include "pch.h"
 #include "PluginManager.h"
-#include <Poco/ScopedLock.h>
 
 using Poco::FastMutex;
 

diff --git a/Src/Plugins.cpp b/Src/Plugins.cpp
@@ -15,11 +15,9 @@
 #define POCO_NO_UNWINDOWS 1
 #include <vector>
 #include <list>
-#include <unordered_set>
+#include <unordered_map>
 #include <algorithm>
 #include <cassert>
-#include <iostream>
-#include <sstream>
 #include <set>
 #include <Poco/Mutex.h>
 #include <Poco/ScopedLock.h>
@@ -29,13 +27,11 @@
 #include "unicoder.h"
 #include "FileFilterMgr.h"
 #include "lwdisp.h"
-#include "resource.h"
 #include "Exceptions.h"
 #include "RegKey.h"
 #include "paths.h"
 #include "Environment.h"
 #include "FileFilter.h"
-#include "coretools.h"
 #include "OptionsMgr.h"
 #include "OptionsDef.h"
 

diff --git a/Src/PropRegistry.cpp b/Src/PropRegistry.cpp
@@ -7,7 +7,6 @@
 
 #include "stdafx.h"
 #include "PropRegistry.h"
-#include "RegKey.h"
 #include "FileOrFolderSelect.h"
 #include "OptionsDef.h"
 #include "OptionsMgr.h"

diff --git a/Src/PropertySystem.cpp b/Src/PropertySystem.cpp
@@ -10,7 +10,6 @@
 #include <shobjidl.h>
 #include <propsys.h>
 #include <propvarutil.h>
-#include <propkey.h>
 #include <strsafe.h>
 #endif
 

diff --git a/Src/codepage_detect.cpp b/Src/codepage_detect.cpp
@@ -9,7 +9,6 @@
 #include "codepage_detect.h"
 #include <cstdio>
 #include <cstring>
-#include <algorithm>
 #include <memory>
 #include "unicoder.h"
 #include "ExConverter.h"

diff --git a/Src/paths.cpp b/Src/paths.cpp
@@ -8,15 +8,12 @@
 #include "paths.h"
 #include <windows.h>
 #include <cassert>
-#include <cstring>
-#include <direct.h>
 #pragma warning (push)			// prevent "warning C4091: 'typedef ': ignored on left of 'tagGPFIDL_FLAGS' when no variable is declared"
 #pragma warning (disable:4091)	// VC bug when using XP enabled toolsets.
 #include <shlobj.h>
 #pragma warning (pop)
 #include <shlwapi.h>
 #include "PathContext.h"
-#include "coretools.h"
 #include "TFile.h"
 
 namespace paths