Cleanup some standard #include file names

* Use C++ standard include names rather than old C names (but only in
`*.cpp` files, and `*.h` where appropriate).  For example, use <cstdio>
or <cstdint> rather than <stdio.h> or <stdint.h>

* Make sure to use C-style include names in `*.c` files.  For example
<assert.h> rather than <cassert>

* Remove many (but not all) <shlwapi.h>

* Remove <cstdint>, <cstdarg>, <stdint.h> where not actually necessary

diff --git a/Externals/crystaledit/editlib/cregexp_poco.cpp b/Externals/crystaledit/editlib/cregexp_poco.cpp
index 9423acb..44f503b 100644 (file)
--- a/Externals/crystaledit/editlib/cregexp_poco.cpp
+++ b/Externals/crystaledit/editlib/cregexp_poco.cpp
@@ -15,11 +15,11 @@
 ////////////////////////////////////////////////////////////////////////////
 
 #include "StdAfx.h"
-#include <assert.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <ctype.h>
+#include <cassert>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
+#include <cctype>
 #include <memory>
 #include <Poco/RegularExpression.h>
 #include <Poco/UnicodeConverter.h>

diff --git a/Externals/crystaledit/editlib/cs2cs.cpp b/Externals/crystaledit/editlib/cs2cs.cpp
index 28c804b..7b78586 100644 (file)
--- a/Externals/crystaledit/editlib/cs2cs.cpp
+++ b/Externals/crystaledit/editlib/cs2cs.cpp
@@ -2,7 +2,7 @@
 
 #include "StdAfx.h"
 #include "cs2cs.h"
-#include <string.h>
+#include <cstring>
 #include <malloc.h>
 
 // Escaped character constants in range 0x80-0xFF are interpreted in current codepage

diff --git a/Src/7zCommon.cpp b/Src/7zCommon.cpp
index dde6891..e4138dd 100644 (file)
--- a/Src/7zCommon.cpp
+++ b/Src/7zCommon.cpp
@@ -98,7 +98,6 @@ DATE:         BY:                                     DESCRIPTION:
 #include "stdafx.h"\r
 #include "7zCommon.h"\r
 #include <afxinet.h>\r
-#include <shlwapi.h>\r
 #include "OptionsDef.h"\r
 #include "OptionsMgr.h"\r
 #include "DirView.h"\r

diff --git a/Src/Common/ShellFileOperations.cpp b/Src/Common/ShellFileOperations.cpp
index 362423e..120da59 100644 (file)
--- a/Src/Common/ShellFileOperations.cpp
+++ b/Src/Common/ShellFileOperations.cpp
@@ -23,7 +23,6 @@
 #include "ShellFileOperations.h"
 #include <windows.h>
 #include <tchar.h>
-#include <shlwapi.h>
 #include <vector>
 #include <shellapi.h>
 #include "UnicodeString.h"

diff --git a/Src/Common/SuperComboBox.cpp b/Src/Common/SuperComboBox.cpp
index 6ba1aad..62878a0 100644 (file)
--- a/Src/Common/SuperComboBox.cpp
+++ b/Src/Common/SuperComboBox.cpp
@@ -3,7 +3,6 @@
 
 #include "StdAfx.h"
 #include "SuperComboBox.h"
-#include <shlwapi.h>
 #include <vector>
 #include "DropHandler.h"
 

diff --git a/Src/Common/UniFile.cpp b/Src/Common/UniFile.cpp
index 7bab41b..0cc4d05 100644 (file)
--- a/Src/Common/UniFile.cpp
+++ b/Src/Common/UniFile.cpp
@@ -32,7 +32,6 @@ THE SOFTWARE.
 #include <cstdio>
 #include <cassert>
 #include <memory>
-#include <cstdint>
 #include <Poco/SharedMemory.h>
 #include <Poco/Exception.h>
 #include "UnicodeString.h"

diff --git a/Src/Common/UniFile.h b/Src/Common/UniFile.h
index b41fce3..6f8b186 100644 (file)
--- a/Src/Common/UniFile.h
+++ b/Src/Common/UniFile.h
@@ -9,7 +9,6 @@
 #pragma once
 
 #include "unicoder.h"
-#include <cstdint>
 
 namespace Poco { class SharedMemory; }
 

diff --git a/Src/Common/UnicodeString.h b/Src/Common/UnicodeString.h
index e637170..1155f7a 100644 (file)
--- a/Src/Common/UnicodeString.h
+++ b/Src/Common/UnicodeString.h
@@ -24,9 +24,6 @@
 #pragma once
 
 #include <string>
-#include <cstdarg>
-#include <cstdint>
-
 #ifdef _WIN32
 #  include <tchar.h>
 #else

diff --git a/Src/Common/VersionInfo.cpp b/Src/Common/VersionInfo.cpp
index 33f8a2d..7e353f1 100644 (file)
--- a/Src/Common/VersionInfo.cpp
+++ b/Src/Common/VersionInfo.cpp
@@ -8,7 +8,7 @@
 #include <windows.h>
 #include <cstdio>
 #include <tchar.h>
-#include <assert.h>
+#include <cassert>
 #include <strsafe.h>
 #include "coretypes.h"
 #include "UnicodeString.h"

diff --git a/Src/Common/multiformatText.cpp b/Src/Common/multiformatText.cpp
index cedf298..42f043d 100644 (file)
--- a/Src/Common/multiformatText.cpp
+++ b/Src/Common/multiformatText.cpp
@@ -33,7 +33,6 @@
 #include <cstring>
 #include <cassert>
 #include <memory>
-#include <cstdint>
 #include <Poco/SharedMemory.h>
 #include <Poco/FileStream.h>
 #include <Poco/ByteOrder.h>

diff --git a/Src/Common/unicoder.cpp b/Src/Common/unicoder.cpp
index fc34fb3..3b28de0 100644 (file)
--- a/Src/Common/unicoder.cpp
+++ b/Src/Common/unicoder.cpp
@@ -19,7 +19,6 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
 #include <tchar.h>
 #include <cassert>
 #include <memory>
-#include <cstdint>
 #include <Poco/UnicodeConverter.h>
 #include "UnicodeString.h"
 #include "ExConverter.h"

diff --git a/Src/Common/unicoder.h b/Src/Common/unicoder.h
index 8bb664f..bd714c8 100644 (file)
--- a/Src/Common/unicoder.h
+++ b/Src/Common/unicoder.h
@@ -9,7 +9,6 @@
 #pragma once
 
 #include "UnicodeString.h"
-#include <cstdint>
 
 namespace ucr
 {

diff --git a/Src/CompareEngines/ByteComparator.cpp b/Src/CompareEngines/ByteComparator.cpp
index 329a231..223178a 100644 (file)
--- a/Src/CompareEngines/ByteComparator.cpp
+++ b/Src/CompareEngines/ByteComparator.cpp
@@ -6,7 +6,6 @@
 
 #include "ByteComparator.h"
 #include <cassert>
-#include <cstdint>
 #include "UnicodeString.h"
 #include "FileTextStats.h"
 #include "CompareOptions.h"

diff --git a/Src/CompareEngines/ByteCompare.cpp b/Src/CompareEngines/ByteCompare.cpp
index e7c16b9..a36988f 100644 (file)
--- a/Src/CompareEngines/ByteCompare.cpp
+++ b/Src/CompareEngines/ByteCompare.cpp
@@ -6,7 +6,6 @@
 
 #include "ByteCompare.h"
 #include <cassert>
-#include <cstdint>
 #ifdef _WIN32
 #include <io.h>
 #else

diff --git a/Src/CompareEngines/TimeSizeCompare.cpp b/Src/CompareEngines/TimeSizeCompare.cpp
index ef55c3d..dca2689 100644 (file)
--- a/Src/CompareEngines/TimeSizeCompare.cpp
+++ b/Src/CompareEngines/TimeSizeCompare.cpp
@@ -5,7 +5,6 @@
  */
 
 #include "TimeSizeCompare.h"
-#include <cstdint>
 #include <Poco/Timestamp.h>
 #include "DiffItem.h"
 #include "DiffWrapper.h"

diff --git a/Src/DiffContext.h b/Src/DiffContext.h
index 7d1f934..939d5e7 100644 (file)
--- a/Src/DiffContext.h
+++ b/Src/DiffContext.h
@@ -8,7 +8,6 @@
 #define POCO_NO_UNWINDOWS 1
 #include <Poco/Mutex.h>
 #include <memory>
-#include <cstdint>
 #include "PathContext.h"
 #include "DiffFileInfo.h"
 #include "DiffItemList.h"

diff --git a/Src/DiffItemList.h b/Src/DiffItemList.h
index bef2e2e..d93628e 100644 (file)
--- a/Src/DiffItemList.h
+++ b/Src/DiffItemList.h
@@ -6,7 +6,6 @@
 #pragma once
 
 #include "DiffItem.h"
-#include <cstdint>
 
 /**
  * @brief List of DIFFITEMs in folder compare.

diff --git a/Src/DirDoc.h b/Src/DirDoc.h
index 22463bb..3ce73e4 100644 (file)
--- a/Src/DirDoc.h
+++ b/Src/DirDoc.h
@@ -26,7 +26,6 @@
 #pragma once
 
 #include <memory>
-#include <cstdint>
 #include "DiffThread.h"
 #include "PluginManager.h"
 

diff --git a/Src/DirItem.h b/Src/DirItem.h
index 9d13960..b888e5d 100644 (file)
--- a/Src/DirItem.h
+++ b/Src/DirItem.h
@@ -27,7 +27,6 @@
 #include <boost/flyweight.hpp>
 #include "UnicodeString.h"
 #include "FileVersion.h"
-#include "stdint.h"
 
 /**
  * @brief Class for fileflags.

diff --git a/Src/DirScan.cpp b/Src/DirScan.cpp
index ba56743..c3e046a 100644 (file)
--- a/Src/DirScan.cpp
+++ b/Src/DirScan.cpp
@@ -7,7 +7,6 @@
 #include "DirScan.h"
 #include <cassert>
 #include <memory>
-#include <cstdint>
 #define POCO_NO_UNWINDOWS 1
 #include <Poco/Semaphore.h>
 #include <Poco/Notification.h>

diff --git a/Src/DirScan.h b/Src/DirScan.h
index c8ebd79..e8c2301 100644 (file)
--- a/Src/DirScan.h
+++ b/Src/DirScan.h
@@ -6,7 +6,6 @@
 #pragma once
 
 #include "UnicodeString.h"
-#include <cstdint>
 
 class CDiffContext;
 class DiffItemList;

diff --git a/Src/DirTravel.cpp b/Src/DirTravel.cpp
index bb1bdfa..9011512 100644 (file)
--- a/Src/DirTravel.cpp
+++ b/Src/DirTravel.cpp
@@ -7,7 +7,6 @@
 
 #include "DirTravel.h"
 #include <algorithm>
-#include <cstdint>
 #include <Poco/DirectoryIterator.h>
 #include <Poco/Timestamp.h>
 #include <windows.h>

diff --git a/Src/DirViewColItems.cpp b/Src/DirViewColItems.cpp
index 638bc4c..67a082d 100644 (file)
--- a/Src/DirViewColItems.cpp
+++ b/Src/DirViewColItems.cpp
@@ -6,7 +6,6 @@
  * @date  Created: 2003-08-19
  */
 #include "DirViewColItems.h"
-#include <cstdint>
 #include <Poco/Timestamp.h>
 #include <Shlwapi.h>
 #include "UnicodeString.h"

diff --git a/Src/MergeDoc.cpp b/Src/MergeDoc.cpp
index 61c8e5d..ac2f03a 100644 (file)
--- a/Src/MergeDoc.cpp
+++ b/Src/MergeDoc.cpp
@@ -27,7 +27,6 @@
 
 #include "StdAfx.h"
 #include "MergeDoc.h"
-#include <cstdint>
 #include <io.h>
 #include <Poco/Timestamp.h>
 #include "UnicodeString.h"

diff --git a/Src/Plugins.cpp b/Src/Plugins.cpp
index 575837f..85db51e 100644 (file)
--- a/Src/Plugins.cpp
+++ b/Src/Plugins.cpp
@@ -30,7 +30,6 @@
 #include <list>
 #include <unordered_set>
 #include <algorithm>
-#include <cstdarg>
 #include <cassert>
 #include <iostream>
 #include <sstream>

diff --git a/Src/SourceControl.cpp b/Src/SourceControl.cpp
index 9206224..805c1c5 100644 (file)
--- a/Src/SourceControl.cpp
+++ b/Src/SourceControl.cpp
@@ -10,7 +10,6 @@
 #include <Poco/Process.h>
 #include <Poco/Format.h>
 #include <direct.h>
-#include <Shlwapi.h>
 #include <initguid.h>
 #include "ssauto.h"
 #include "MyCom.h"

diff --git a/Src/TempFile.cpp b/Src/TempFile.cpp
index d30b1b7..4860278 100644 (file)
--- a/Src/TempFile.cpp
+++ b/Src/TempFile.cpp
@@ -8,7 +8,6 @@
 #include "TempFile.h"
 #include <windows.h>
 #include <tlhelp32.h> 
-#include <shlwapi.h>
 #include "paths.h"
 #include "TFile.h"
 #include "Environment.h"

diff --git a/Src/diffutils/src/analyze.c b/Src/diffutils/src/analyze.c
index a4b7ad9..c8d091c 100644 (file)
--- a/Src/diffutils/src/analyze.c
+++ b/Src/diffutils/src/analyze.c
@@ -38,7 +38,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
 #include "diff.h"
 #include "cmpbuf.h"
-#include <cassert>
+#include <assert.h>
 #ifdef _WIN32
 #  include <io.h>
 #endif

diff --git a/Src/diffutils/src/ifdef.c b/Src/diffutils/src/ifdef.c
index 98c95c2..14126f0 100644 (file)
--- a/Src/diffutils/src/ifdef.c
+++ b/Src/diffutils/src/ifdef.c
@@ -20,7 +20,7 @@ and this notice must be preserved on all copies.  */
 
 
 #include "diff.h"
-#include <cassert>
+#include <assert.h>
 
 struct group
 {

diff --git a/Src/diffutils/src/io.c b/Src/diffutils/src/io.c
index 69aad81..51159f2 100644 (file)
--- a/Src/diffutils/src/io.c
+++ b/Src/diffutils/src/io.c
@@ -19,7 +19,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
 #include "diff.h"
 #include <io.h>
-#include <cassert>
+#include <assert.h>
 
 /* Rotate a value n bits to the left. */
 #define UINT_BIT (sizeof (unsigned) * CHAR_BIT)

diff --git a/Src/diffutils/src/mystat.cpp b/Src/diffutils/src/mystat.cpp
index 0e89507..4f352f5 100644 (file)
--- a/Src/diffutils/src/mystat.cpp
+++ b/Src/diffutils/src/mystat.cpp
@@ -1,19 +1,18 @@
 // my own _fstat() and _wstat() implementation for the bug https://connect.microsoft.com/VisualStudio/feedback/details/1600505/stat-not-working-on-windows-xp-using-v14-xp-platform-toolset-vs2015\r
 #include <sys/stat.h>\r
 #include <io.h>\r
-#include <cstdint>\r
 #include <cerrno>\r
 #include <Windows.h>\r
 \r
 inline time_t filetime_to_time_t(const FILETIME& ft)\r
 {\r
-       return ((static_cast<int64_t>(ft.dwHighDateTime) << 32) + ft.dwLowDateTime) / 10000000ULL - 11644473600ULL;\r
+       return ((static_cast<time_t>(ft.dwHighDateTime) << 32) + ft.dwLowDateTime) / 10000000ULL - 11644473600ULL;\r
 }\r
 \r
 template<typename FileInfo>\r
 inline void set_statbuf(const FileInfo& hfi, struct _stat64& buf)\r
 {\r
-       buf.st_size = (static_cast<int64_t>(hfi.nFileSizeHigh) << 32) | hfi.nFileSizeLow;\r
+       buf.st_size = (static_cast<__int64>(hfi.nFileSizeHigh) << 32) | hfi.nFileSizeLow;\r
        buf.st_atime = filetime_to_time_t(hfi.ftLastAccessTime);\r
        buf.st_mtime = filetime_to_time_t(hfi.ftLastWriteTime);\r
        buf.st_ctime = filetime_to_time_t(hfi.ftCreationTime);\r

diff --git a/Src/dllpstub.cpp b/Src/dllpstub.cpp
index 077fec7..8013d24 100644 (file)
--- a/Src/dllpstub.cpp
+++ b/Src/dllpstub.cpp
@@ -26,7 +26,6 @@ DATE:         BY:                                     DESCRIPTION:
 
 #include "stdafx.h"
 #include "dllpstub.h"
-#include <shlwapi.h>
 #include <afxdisp.h>
 #include <afxinet.h>
 

diff --git a/Src/locality.cpp b/Src/locality.cpp
index b776b93..1593f7c 100644 (file)
--- a/Src/locality.cpp
+++ b/Src/locality.cpp
@@ -5,7 +5,6 @@
  */
 
 #include "locality.h"
-#include <cstdint>
 #include <windows.h>
 #include <Poco/Format.h>
 #include <Poco/Debugger.h>

diff --git a/Src/locality.h b/Src/locality.h
index 3ab90e4..42c12c3 100644 (file)
--- a/Src/locality.h
+++ b/Src/locality.h
@@ -6,7 +6,6 @@
 #pragma once
 
 #include "UnicodeString.h"
-#include <cstdint>
 
 namespace locality {