clang-tidy: modernize-deprecated-headers

2024-11-23 11:39:48 +00:00 · 2019-09-06 22:58:06 +02:00 · 2019-09-06 22:58:06 +02:00 · f30523d090
commit f30523d090
parent 9602bcfc62
178 changed files with 289 additions and 290 deletions
--- a/.clang-tidy
+++ b/.clang-tidy
@ -11,7 +11,6 @@ misc-*,\
 -misc-static-assert,\
 modernize-*,\
 -modernize-avoid-c-arrays,\
-modernize-deprecated-headers,\
 -modernize-use-nodiscard,\
 -modernize-use-noexcept,\
 -modernize-use-transparent-functors,\
--- a/Source/CPack/IFW/cmCPackIFWInstaller.cxx
+++ b/Source/CPack/IFW/cmCPackIFWInstaller.cxx
@ -13,8 +13,8 @@
 #include "cmXMLParser.h"
 #include "cmXMLWriter.h"

+#include <cstddef>
 #include <sstream>
-#include <stddef.h>
 #include <utility>

 cmCPackIFWInstaller::cmCPackIFWInstaller() = default;
--- a/Source/CPack/IFW/cmCPackIFWPackage.cxx
+++ b/Source/CPack/IFW/cmCPackIFWPackage.cxx
@ -13,9 +13,9 @@
 #include "cmTimestamp.h"
 #include "cmXMLWriter.h"

+#include <cstddef>
 #include <map>
 #include <sstream>
-#include <stddef.h>
 #include <utility>

 //---------------------------------------------------------- CompareStruct ---
--- a/Source/CPack/IFW/cmCPackIFWRepository.cxx
+++ b/Source/CPack/IFW/cmCPackIFWRepository.cxx
@ -8,7 +8,7 @@
 #include "cmXMLParser.h"
 #include "cmXMLWriter.h"

-#include <stddef.h>
+#include <cstddef>

 cmCPackIFWRepository::cmCPackIFWRepository()
  : Update(cmCPackIFWRepository::None)
--- a/Source/CPack/OSXScriptLauncher.cxx
+++ b/Source/CPack/OSXScriptLauncher.cxx
@ -3,8 +3,9 @@
 #include "cmsys/FStream.hxx"
 #include "cmsys/Process.h"
 #include "cmsys/SystemTools.hxx"
+
+#include <cstddef>
 #include <iostream>
-#include <stddef.h>
 #include <string>
 #include <vector>

--- a/Source/CPack/cmCPackDebGenerator.cxx
+++ b/Source/CPack/cmCPackDebGenerator.cxx
@ -13,10 +13,10 @@
 #include "cm_sys_stat.h"

 #include "cmsys/Glob.hxx"
+#include <cstring>
 #include <map>
 #include <ostream>
 #include <set>
-#include <string.h>
 #include <utility>

 namespace {
--- a/Source/CPack/cmCPackDragNDropGenerator.cxx
+++ b/Source/CPack/cmCPackDragNDropGenerator.cxx
@ -12,9 +12,9 @@
 #include "cmsys/FStream.hxx"
 #include "cmsys/RegularExpression.hxx"
 #include <algorithm>
+#include <cstdlib>
 #include <iomanip>
 #include <map>
-#include <stdlib.h>

 #include <CoreFoundation/CoreFoundation.h>

--- a/Source/CPack/cmCPackNSISGenerator.cxx
+++ b/Source/CPack/cmCPackNSISGenerator.cxx
@ -14,10 +14,10 @@
 #include "cmsys/Directory.hxx"
 #include "cmsys/RegularExpression.hxx"
 #include <algorithm>
+#include <cstdlib>
+#include <cstring>
 #include <map>
 #include <sstream>
-#include <stdlib.h>
-#include <string.h>
 #include <utility>

 /* NSIS uses different command line syntax on Windows and others */
--- a/Source/CPack/cmCPackPackageMakerGenerator.cxx
+++ b/Source/CPack/cmCPackPackageMakerGenerator.cxx
@ -4,11 +4,11 @@

 #include "cmsys/FStream.hxx"
 #include "cmsys/RegularExpression.hxx"
-#include <assert.h>
+#include <cassert>
+#include <cstdio>
+#include <cstdlib>
 #include <map>
 #include <sstream>
-#include <stdio.h>
-#include <stdlib.h>
 #include <string>

 #include "cmCPackComponentGroup.h"
--- a/Source/CPack/cmCPackProductBuildGenerator.cxx
+++ b/Source/CPack/cmCPackProductBuildGenerator.cxx
@ -2,9 +2,9 @@
   file Copyright.txt or https://cmake.org/licensing for details.  */
 #include "cmCPackProductBuildGenerator.h"

+#include <cstddef>
 #include <map>
 #include <sstream>
-#include <stddef.h>

 #include "cmCPackComponentGroup.h"
 #include "cmCPackLog.h"
--- a/Source/CPack/cmCPackRPMGenerator.cxx
+++ b/Source/CPack/cmCPackRPMGenerator.cxx
@ -3,7 +3,7 @@
 #include "cmCPackRPMGenerator.h"

 #include <algorithm>
-#include <ctype.h>
+#include <cctype>
 #include <map>
 #include <ostream>
 #include <utility>
--- a/Source/CPack/cmCPackSTGZGenerator.cxx
+++ b/Source/CPack/cmCPackSTGZGenerator.cxx
@ -3,8 +3,8 @@
 #include "cmCPackSTGZGenerator.h"

 #include "cmsys/FStream.hxx"
+#include <cstdio>
 #include <sstream>
-#include <stdio.h>
 #include <string>
 #include <vector>

--- a/Source/CPack/cpack.cxx
+++ b/Source/CPack/cpack.cxx
@ -22,10 +22,10 @@
 #  include "cmsys/ConsoleBuf.hxx"
 #endif

+#include <cstddef>
 #include <iostream>
 #include <map>
 #include <sstream>
-#include <stddef.h>
 #include <string>
 #include <utility>
 #include <vector>
--- a/Source/CTest/cmCTestBZR.cxx
+++ b/Source/CTest/cmCTestBZR.cxx
@ -11,10 +11,10 @@

 #include "cm_expat.h"
 #include "cmsys/RegularExpression.hxx"
+#include <cstdlib>
 #include <list>
 #include <map>
 #include <ostream>
-#include <stdlib.h>
 #include <vector>

 extern "C" int cmBZRXMLParserUnknownEncodingHandler(void* /*unused*/,
--- a/Source/CTest/cmCTestBuildAndTestHandler.cxx
+++ b/Source/CTest/cmCTestBuildAndTestHandler.cxx
@ -14,9 +14,9 @@

 #include "cmsys/Process.h"
 #include <chrono>
+#include <cstdlib>
 #include <cstring>
 #include <ratio>
-#include <stdlib.h>

 cmCTestBuildAndTestHandler::cmCTestBuildAndTestHandler()
 {
--- a/Source/CTest/cmCTestBuildCommand.cxx
+++ b/Source/CTest/cmCTestBuildCommand.cxx
@ -11,8 +11,8 @@
 #include "cmSystemTools.h"
 #include "cmake.h"

+#include <cstring>
 #include <sstream>
-#include <string.h>

 class cmExecutionStatus;

--- a/Source/CTest/cmCTestBuildHandler.cxx
+++ b/Source/CTest/cmCTestBuildHandler.cxx
@ -17,9 +17,9 @@
 #include "cmsys/Directory.hxx"
 #include "cmsys/FStream.hxx"
 #include "cmsys/Process.h"
+#include <cstdlib>
+#include <cstring>
 #include <set>
-#include <stdlib.h>
-#include <string.h>
 #include <utility>

 static const char* cmCTestErrorMatches[] = {
--- a/Source/CTest/cmCTestConfigureCommand.cxx
+++ b/Source/CTest/cmCTestConfigureCommand.cxx
@ -10,8 +10,8 @@
 #include "cmSystemTools.h"
 #include "cmake.h"

+#include <cstring>
 #include <sstream>
-#include <string.h>
 #include <vector>

 cmCTestConfigureCommand::cmCTestConfigureCommand()
--- a/Source/CTest/cmCTestCoverageHandler.cxx
+++ b/Source/CTest/cmCTestCoverageHandler.cxx
@ -24,12 +24,12 @@
 #include "cmsys/RegularExpression.hxx"
 #include <algorithm>
 #include <chrono>
+#include <cstdio>
+#include <cstdlib>
 #include <cstring>
 #include <iomanip>
 #include <iterator>
 #include <sstream>
-#include <stdio.h>
-#include <stdlib.h>
 #include <utility>

 class cmMakefile;
--- a/Source/CTest/cmCTestCurl.cxx
+++ b/Source/CTest/cmCTestCurl.cxx
@ -8,8 +8,8 @@
 #include "cmStringAlgorithms.h"
 #include "cmSystemTools.h"

+#include <cstdio>
 #include <ostream>
-#include <stdio.h>

 cmCTestCurl::cmCTestCurl(cmCTest* ctest)
 {
--- a/Source/CTest/cmCTestGIT.cxx
+++ b/Source/CTest/cmCTestGIT.cxx
@ -4,10 +4,10 @@

 #include "cmsys/FStream.hxx"
 #include "cmsys/Process.h"
-#include <ctype.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <time.h>
+#include <cctype>
+#include <cstdio>
+#include <cstdlib>
+#include <ctime>
 #include <vector>

 #include "cmCTest.h"
--- a/Source/CTest/cmCTestHandlerCommand.cxx
+++ b/Source/CTest/cmCTestHandlerCommand.cxx
@ -10,9 +10,9 @@
 #include "cmSystemTools.h"
 #include "cmWorkingDirectory.h"

+#include <cstdlib>
 #include <cstring>
 #include <sstream>
-#include <stdlib.h>

 cmCTestHandlerCommand::cmCTestHandlerCommand()
 {
--- a/Source/CTest/cmCTestLaunch.cxx
+++ b/Source/CTest/cmCTestLaunch.cxx
@ -5,9 +5,9 @@
 #include "cmsys/FStream.hxx"
 #include "cmsys/Process.h"
 #include "cmsys/RegularExpression.hxx"
+#include <cstdlib>
+#include <cstring>
 #include <iostream>
-#include <stdlib.h>
-#include <string.h>

 #include "cmCryptoHash.h"
 #include "cmGeneratedFileStream.h"
--- a/Source/CTest/cmCTestMemCheckHandler.cxx
+++ b/Source/CTest/cmCTestMemCheckHandler.cxx
@ -12,9 +12,9 @@
 #include "cmsys/Glob.hxx"
 #include "cmsys/RegularExpression.hxx"
 #include <chrono>
+#include <cstring>
 #include <iostream>
 #include <sstream>
-#include <string.h>
 #include <utility>

 struct CatToErrorType
--- a/Source/CTest/cmCTestMultiProcessHandler.cxx
+++ b/Source/CTest/cmCTestMultiProcessHandler.cxx
@ -25,15 +25,15 @@

 #include <algorithm>
 #include <chrono>
+#include <cmath>
+#include <cstdlib>
 #include <cstring>
 #include <iomanip>
 #include <iostream>
 #include <list>
-#include <math.h>
 #include <memory>
 #include <sstream>
 #include <stack>
-#include <stdlib.h>
 #include <unordered_map>
 #include <utility>
 #include <vector>
--- a/Source/CTest/cmCTestP4.cxx
+++ b/Source/CTest/cmCTestP4.cxx
@ -12,8 +12,8 @@

 #include "cmsys/RegularExpression.hxx"
 #include <algorithm>
+#include <ctime>
 #include <ostream>
-#include <time.h>
 #include <utility>

 cmCTestP4::cmCTestP4(cmCTest* ct, std::ostream& log)
--- a/Source/CTest/cmCTestRunTest.cxx
+++ b/Source/CTest/cmCTestRunTest.cxx
@ -13,11 +13,11 @@
 #include "cmsys/RegularExpression.hxx"
 #include <chrono>
 #include <cstdint>
+#include <cstdio>
 #include <cstring>
 #include <iomanip>
 #include <ratio>
 #include <sstream>
-#include <stdio.h>
 #include <utility>

 #include "cm_memory.hxx"
--- a/Source/CTest/cmCTestSVN.cxx
+++ b/Source/CTest/cmCTestSVN.cxx
@ -12,10 +12,10 @@
 #include "cmXMLWriter.h"

 #include "cmsys/RegularExpression.hxx"
+#include <cstdlib>
+#include <cstring>
 #include <map>
 #include <ostream>
-#include <stdlib.h>
-#include <string.h>

 struct cmCTestSVN::Revision : public cmCTestVC::Revision
 {
--- a/Source/CTest/cmCTestScriptHandler.cxx
+++ b/Source/CTest/cmCTestScriptHandler.cxx
@ -34,13 +34,13 @@
 #include "cmSystemTools.h"
 #include "cmake.h"

+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include <map>
 #include <memory>
 #include <ratio>
 #include <sstream>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
 #include <utility>

 #ifdef _WIN32
--- a/Source/CTest/cmCTestSleepCommand.cxx
+++ b/Source/CTest/cmCTestSleepCommand.cxx
@ -4,7 +4,7 @@

 #include "cmCTestScriptHandler.h"

-#include <stdlib.h>
+#include <cstdlib>

 class cmExecutionStatus;

--- a/Source/CTest/cmCTestStartCommand.cxx
+++ b/Source/CTest/cmCTestStartCommand.cxx
@ -8,8 +8,8 @@
 #include "cmMakefile.h"
 #include "cmSystemTools.h"

+#include <cstddef>
 #include <sstream>
-#include <stddef.h>

 class cmExecutionStatus;

--- a/Source/CTest/cmCTestSubmitHandler.cxx
+++ b/Source/CTest/cmCTestSubmitHandler.cxx
@ -6,9 +6,9 @@
 #include "cm_jsoncpp_reader.h"
 #include "cm_jsoncpp_value.h"
 #include <chrono>
+#include <cstdio>
+#include <cstdlib>
 #include <sstream>
-#include <stdio.h>
-#include <stdlib.h>

 #include "cmAlgorithms.h"
 #include "cmCTest.h"
--- a/Source/CTest/cmCTestTestCommand.cxx
+++ b/Source/CTest/cmCTestTestCommand.cxx
@ -10,8 +10,8 @@
 #include "cmStringAlgorithms.h"

 #include <chrono>
+#include <cstdlib>
 #include <sstream>
-#include <stdlib.h>
 #include <vector>

 cmCTestTestCommand::cmCTestTestCommand()
--- a/Source/CTest/cmCTestTestHandler.cxx
+++ b/Source/CTest/cmCTestTestHandler.cxx
@ -29,15 +29,15 @@
 #include <cmsys/Directory.hxx>
 #include <cmsys/RegularExpression.hxx>
 #include <cstddef>
+#include <cstdio>
+#include <cstdlib>
 #include <cstring>
+#include <ctime>
 #include <functional>
 #include <iomanip>
 #include <iterator>
 #include <set>
 #include <sstream>
-#include <stdio.h>
-#include <stdlib.h>
-#include <time.h>
 #include <utility>

 namespace {
--- a/Source/CTest/cmCTestVC.cxx
+++ b/Source/CTest/cmCTestVC.cxx
@ -8,9 +8,9 @@
 #include "cmXMLWriter.h"

 #include "cmsys/Process.h"
+#include <cstdio>
+#include <ctime>
 #include <sstream>
-#include <stdio.h>
-#include <time.h>
 #include <vector>

 cmCTestVC::cmCTestVC(cmCTest* ct, std::ostream& log)
--- a/Source/CTest/cmParseBlanketJSCoverage.cxx
+++ b/Source/CTest/cmParseBlanketJSCoverage.cxx
@ -7,8 +7,8 @@
 #include "cmSystemTools.h"

 #include "cmsys/FStream.hxx"
-#include <stdio.h>
-#include <stdlib.h>
+#include <cstdio>
+#include <cstdlib>

 class cmParseBlanketJSCoverage::JSONParser
 {
--- a/Source/CTest/cmParseCacheCoverage.cxx
+++ b/Source/CTest/cmParseCacheCoverage.cxx
@ -7,9 +7,9 @@

 #include "cmsys/Directory.hxx"
 #include "cmsys/FStream.hxx"
+#include <cstdio>
+#include <cstdlib>
 #include <map>
-#include <stdio.h>
-#include <stdlib.h>
 #include <utility>

 cmParseCacheCoverage::cmParseCacheCoverage(
--- a/Source/CTest/cmParseCoberturaCoverage.cxx
+++ b/Source/CTest/cmParseCoberturaCoverage.cxx
@ -7,8 +7,8 @@
 #include "cmXMLParser.h"

 #include "cmsys/FStream.hxx"
-#include <stdlib.h>
-#include <string.h>
+#include <cstdlib>
+#include <cstring>

 class cmParseCoberturaCoverage::XMLParser : public cmXMLParser
 {
--- a/Source/CTest/cmParseDelphiCoverage.cxx
+++ b/Source/CTest/cmParseDelphiCoverage.cxx
@ -6,8 +6,8 @@

 #include "cmsys/FStream.hxx"
 #include "cmsys/Glob.hxx"
-#include <stdio.h>
-#include <stdlib.h>
+#include <cstdio>
+#include <cstdlib>

 class cmParseDelphiCoverage::HTMLParser
 {
--- a/Source/CTest/cmParseGTMCoverage.cxx
+++ b/Source/CTest/cmParseGTMCoverage.cxx
@ -7,9 +7,9 @@

 #include "cmsys/Directory.hxx"
 #include "cmsys/FStream.hxx"
+#include <cstdio>
+#include <cstdlib>
 #include <map>
-#include <stdio.h>
-#include <stdlib.h>
 #include <vector>

 cmParseGTMCoverage::cmParseGTMCoverage(cmCTestCoverageHandlerContainer& cont,
--- a/Source/CTest/cmParseJacocoCoverage.cxx
+++ b/Source/CTest/cmParseJacocoCoverage.cxx
@ -9,8 +9,8 @@
 #include "cmsys/Directory.hxx"
 #include "cmsys/FStream.hxx"
 #include "cmsys/Glob.hxx"
-#include <stdlib.h>
-#include <string.h>
+#include <cstdlib>
+#include <cstring>

 class cmParseJacocoCoverage::XMLParser : public cmXMLParser
 {
--- a/Source/CTest/cmParsePHPCoverage.cxx
+++ b/Source/CTest/cmParsePHPCoverage.cxx
@ -7,8 +7,8 @@

 #include "cmsys/Directory.hxx"
 #include "cmsys/FStream.hxx"
-#include <stdlib.h>
-#include <string.h>
+#include <cstdlib>
+#include <cstring>

 /*
  To setup coverage for php.
--- a/Source/CTest/cmProcess.cxx
+++ b/Source/CTest/cmProcess.cxx
@ -10,8 +10,8 @@
 #include "cmStringAlgorithms.h"
 #include "cmsys/Process.h"

+#include <csignal>
 #include <iostream>
-#include <signal.h>
 #include <string>
 #if defined(_WIN32)
 #  include "cm_kwiml.h"
--- a/Source/CursesDialog/ccmake.cxx
+++ b/Source/CursesDialog/ccmake.cxx
@ -11,9 +11,9 @@
 #include "cmake.h"

 #include "cmsys/Encoding.hxx"
+#include <csignal>
+#include <cstring>
 #include <iostream>
-#include <signal.h>
-#include <string.h>
 #include <string>
 #include <vector>

--- a/Source/CursesDialog/cmCursesCacheEntryComposite.cxx
+++ b/Source/CursesDialog/cmCursesCacheEntryComposite.cxx
@ -15,7 +15,7 @@
 #include "cmSystemTools.h"
 #include "cmake.h"

-#include <assert.h>
+#include <cassert>
 #include <vector>

 cmCursesCacheEntryComposite::cmCursesCacheEntryComposite(
--- a/Source/CursesDialog/cmCursesLongMessageForm.cxx
+++ b/Source/CursesDialog/cmCursesLongMessageForm.cxx
@ -7,8 +7,8 @@
 #include "cmCursesStandardIncludes.h"
 #include "cmVersion.h"

-#include <stdio.h>
-#include <string.h>
+#include <cstdio>
+#include <cstring>

 inline int ctrl(int z)
 {
--- a/Source/CursesDialog/cmCursesMainForm.cxx
+++ b/Source/CursesDialog/cmCursesMainForm.cxx
@ -19,8 +19,8 @@
 #include "cmake.h"

 #include <algorithm>
-#include <stdio.h>
-#include <string.h>
+#include <cstdio>
+#include <cstring>
 #include <utility>

 inline int ctrl(int z)
--- a/Source/CursesDialog/cmCursesMainForm.h
+++ b/Source/CursesDialog/cmCursesMainForm.h
@ -9,7 +9,7 @@
 #include "cmCursesStandardIncludes.h"
 #include "cmStateTypes.h"

-#include <stddef.h>
+#include <cstddef>
 #include <string>
 #include <vector>

--- a/Source/CursesDialog/cmCursesStringWidget.cxx
+++ b/Source/CursesDialog/cmCursesStringWidget.cxx
@ -8,8 +8,8 @@
 #include "cmCursesWidget.h"
 #include "cmStateTypes.h"

-#include <stdio.h>
-#include <string.h>
+#include <cstdio>
+#include <cstring>

 inline int ctrl(int z)
 {
--- a/Source/QtDialog/CMakeSetup.cxx
+++ b/Source/QtDialog/CMakeSetup.cxx
@ -229,8 +229,8 @@ int main(int argc, char** argv)

 #if defined(Q_OS_MAC)
 #  include "cm_sys_stat.h"
-#  include <errno.h>
-#  include <string.h>
+#  include <cerrno>
+#  include <cstring>
 #  include <unistd.h>
 static bool cmOSXInstall(std::string const& dir, std::string const& tool)
 {
--- a/Source/cmAddSubDirectoryCommand.cxx
+++ b/Source/cmAddSubDirectoryCommand.cxx
@ -2,8 +2,8 @@
   file Copyright.txt or https://cmake.org/licensing for details.  */
 #include "cmAddSubDirectoryCommand.h"

+#include <cstring>
 #include <sstream>
-#include <string.h>

 #include "cmExecutionStatus.h"
 #include "cmMakefile.h"
--- a/Source/cmAffinity.cxx
+++ b/Source/cmAffinity.cxx
@ -13,7 +13,7 @@
 #    include <pthread.h>
 #    include <sched.h>
 // On some platforms CPU_ZERO needs memset but sched.h forgets string.h
-#    include <string.h> // IWYU pragma: keep
+#    include <cstring> // IWYU pragma: keep
 #    if defined(__FreeBSD__)
 #      include <pthread_np.h>
 #      include <sys/cpuset.h>
--- a/Source/cmArchiveWrite.cxx
+++ b/Source/cmArchiveWrite.cxx
@ -11,10 +11,10 @@
 #include "cmsys/Encoding.hxx"
 #include "cmsys/FStream.hxx"

+#include <cstring>
+#include <ctime>
 #include <iostream>
 #include <sstream>
-#include <string.h>
-#include <time.h>

 #ifndef __LA_SSIZE_T
 #  define __LA_SSIZE_T la_ssize_t
--- a/Source/cmArchiveWrite.h
+++ b/Source/cmArchiveWrite.h
@ -5,8 +5,8 @@

 #include "cmConfigure.h" // IWYU pragma: keep

+#include <cstddef>
 #include <iosfwd>
-#include <stddef.h>
 #include <string>

 #if defined(CMAKE_BOOTSTRAP)
--- a/Source/cmAuxSourceDirectoryCommand.cxx
+++ b/Source/cmAuxSourceDirectoryCommand.cxx
@ -4,7 +4,7 @@

 #include "cmsys/Directory.hxx"
 #include <algorithm>
-#include <stddef.h>
+#include <cstddef>
 #include <utility>

 #include "cmExecutionStatus.h"
--- a/Source/cmBase32.h
+++ b/Source/cmBase32.h
@ -5,7 +5,7 @@

 #include "cmConfigure.h" // IWYU pragma: keep

-#include <stddef.h>
+#include <cstddef>
 #include <string>

 /** \class cmBase32Encoder
--- a/Source/cmCMakeHostSystemInformationCommand.cxx
+++ b/Source/cmCMakeHostSystemInformationCommand.cxx
@ -2,7 +2,7 @@
   file Copyright.txt or https://cmake.org/licensing for details.  */
 #include "cmCMakeHostSystemInformationCommand.h"

-#include <stddef.h>
+#include <cstddef>

 #include "cmExecutionStatus.h"
 #include "cmMakefile.h"
--- a/Source/cmCMakeMinimumRequired.cxx
+++ b/Source/cmCMakeMinimumRequired.cxx
@ -2,8 +2,8 @@
   file Copyright.txt or https://cmake.org/licensing for details.  */
 #include "cmCMakeMinimumRequired.h"

+#include <cstdio>
 #include <sstream>
-#include <stdio.h>

 #include "cmExecutionStatus.h"
 #include "cmMakefile.h"
--- a/Source/cmCPluginAPI.cxx
+++ b/Source/cmCPluginAPI.cxx
@ -14,7 +14,7 @@
 #include "cmState.h"
 #include "cmVersion.h"

-#include <stdlib.h>
+#include <cstdlib>

 #ifdef __QNX__
 #  include <malloc.h> /* for malloc/free on QNX */
--- a/Source/cmCTest.cxx
+++ b/Source/cmCTest.cxx
@ -11,16 +11,16 @@
 #include "cmsys/Process.h"
 #include "cmsys/SystemInformation.hxx"
 #include <algorithm>
+#include <cctype>
 #include <chrono>
-#include <ctype.h>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
+#include <ctime>
 #include <iostream>
 #include <map>
 #include <sstream>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
 #include <string>
-#include <time.h>
 #include <utility>
 #include <vector>
 #if defined(_WIN32)
--- a/Source/cmCTest.h
+++ b/Source/cmCTest.h
@ -9,11 +9,11 @@
 #include "cmProcessOutput.h"

 #include <chrono>
+#include <ctime>
 #include <map>
 #include <memory>
 #include <sstream>
 #include <string>
-#include <time.h>
 #include <vector>

 class cmCTestBuildHandler;
--- a/Source/cmCacheManager.cxx
+++ b/Source/cmCacheManager.cxx
@ -5,9 +5,9 @@
 #include "cmsys/FStream.hxx"
 #include "cmsys/Glob.hxx"
 #include <algorithm>
+#include <cstdio>
+#include <cstring>
 #include <sstream>
-#include <stdio.h>
-#include <string.h>
 #include <string>

 #include "cmGeneratedFileStream.h"
--- a/Source/cmCommandArgumentParserHelper.cxx
+++ b/Source/cmCommandArgumentParserHelper.cxx
@ -8,9 +8,9 @@
 #include "cmStringAlgorithms.h"
 #include "cmSystemTools.h"

+#include <cstring>
 #include <iostream>
 #include <sstream>
-#include <string.h>

 int cmCommandArgument_yyparse(yyscan_t yyscanner);
 //
--- a/Source/cmComputeComponentGraph.cxx
+++ b/Source/cmComputeComponentGraph.cxx
@ -4,7 +4,7 @@

 #include <algorithm>

-#include <assert.h>
+#include <cassert>

 cmComputeComponentGraph::cmComputeComponentGraph(Graph const& input)
  : InputGraph(input)
--- a/Source/cmComputeLinkDepends.cxx
+++ b/Source/cmComputeLinkDepends.cxx
@ -16,11 +16,11 @@
 #include "cmake.h"

 #include <algorithm>
-#include <assert.h>
+#include <cassert>
+#include <cstdio>
+#include <cstring>
 #include <iterator>
 #include <sstream>
-#include <stdio.h>
-#include <string.h>
 #include <utility>

 #include "cm_memory.hxx"
--- a/Source/cmComputeLinkInformation.cxx
+++ b/Source/cmComputeLinkInformation.cxx
@ -20,9 +20,9 @@
 #include "cmake.h"

 #include <algorithm>
-#include <ctype.h>
+#include <cctype>
+#include <cstring>
 #include <sstream>
-#include <string.h>
 #include <utility>

 //#define CM_COMPUTE_LINK_INFO_DEBUG
--- a/Source/cmComputeTargetDepends.cxx
+++ b/Source/cmComputeTargetDepends.cxx
@ -20,9 +20,9 @@
 #include "cmTargetDepend.h"
 #include "cmake.h"

-#include <assert.h>
+#include <cassert>
+#include <cstdio>
 #include <sstream>
-#include <stdio.h>
 #include <utility>

 /*
--- a/Source/cmConditionEvaluator.cxx
+++ b/Source/cmConditionEvaluator.cxx
@ -3,11 +3,11 @@
 #include "cmConditionEvaluator.h"

 #include "cmsys/RegularExpression.hxx"
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include <functional>
 #include <sstream>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
 #include <utility>

 #include "cmAlgorithms.h"
--- a/Source/cmCoreTryCompile.cxx
+++ b/Source/cmCoreTryCompile.cxx
@ -3,10 +3,10 @@
 #include "cmCoreTryCompile.h"

 #include "cmsys/Directory.hxx"
+#include <cstdio>
+#include <cstring>
 #include <set>
 #include <sstream>
-#include <stdio.h>
-#include <string.h>
 #include <utility>

 #include "cmExportTryCompileFileGenerator.h"
--- a/Source/cmCryptoHash.h
+++ b/Source/cmCryptoHash.h
@ -7,8 +7,8 @@

 #include "cm_string_view.hxx"

+#include <cstddef>
 #include <memory>
-#include <stddef.h>
 #include <string>
 #include <vector>

--- a/Source/cmCustomCommandGenerator.cxx
+++ b/Source/cmCustomCommandGenerator.cxx
@ -13,8 +13,8 @@
 #include "cmStringAlgorithms.h"
 #include "cmSystemTools.h"

+#include <cstddef>
 #include <memory>
-#include <stddef.h>
 #include <utility>

 cmCustomCommandGenerator::cmCustomCommandGenerator(cmCustomCommand const& cc,
--- a/Source/cmDefinitions.cxx
+++ b/Source/cmDefinitions.cxx
@ -4,7 +4,7 @@

 #include "cm_string_view.hxx"

-#include <assert.h>
+#include <cassert>
 #include <functional>
 #include <unordered_set>
 #include <utility>
--- a/Source/cmDependsFortran.cxx
+++ b/Source/cmDependsFortran.cxx
@ -3,10 +3,10 @@
 #include "cmDependsFortran.h"

 #include "cmsys/FStream.hxx"
-#include <assert.h>
+#include <cassert>
+#include <cstdlib>
 #include <iostream>
 #include <map>
-#include <stdlib.h>
 #include <utility>

 #include "cmFortranParser.h" /* Interface to parser object.  */
--- a/Source/cmDependsJavaParserHelper.cxx
+++ b/Source/cmDependsJavaParserHelper.cxx
@ -7,10 +7,10 @@

 #include "cm_string_view.hxx"
 #include "cmsys/FStream.hxx"
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include <iostream>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
 #include <utility>

 int cmDependsJava_yyparse(yyscan_t yyscanner);
--- a/Source/cmDocumentation.cxx
+++ b/Source/cmDocumentation.cxx
@ -11,8 +11,8 @@
 #include "cmsys/FStream.hxx"
 #include "cmsys/Glob.hxx"
 #include <algorithm>
-#include <ctype.h>
-#include <string.h>
+#include <cctype>
+#include <cstring>
 #include <utility>

 static const char* cmDocumentationStandardOptions[][2] = {
--- a/Source/cmDocumentationFormatter.cxx
+++ b/Source/cmDocumentationFormatter.cxx
@ -5,9 +5,9 @@
 #include "cmDocumentationEntry.h"
 #include "cmDocumentationSection.h"

+#include <cstring>
 #include <iomanip>
 #include <ostream>
-#include <string.h>
 #include <string>
 #include <vector>

--- a/Source/cmELF.cxx
+++ b/Source/cmELF.cxx
@ -6,10 +6,10 @@
 #include "cm_kwiml.h"
 #include "cm_memory.hxx"
 #include "cmsys/FStream.hxx"
+#include <cstddef>
 #include <map>
 #include <memory>
 #include <sstream>
-#include <stddef.h>
 #include <utility>
 #include <vector>

--- a/Source/cmExecProgramCommand.cxx
+++ b/Source/cmExecProgramCommand.cxx
@ -3,7 +3,7 @@
 #include "cmExecProgramCommand.h"

 #include "cmsys/Process.h"
-#include <stdio.h>
+#include <cstdio>

 #include "cmExecutionStatus.h"
 #include "cmMakefile.h"
--- a/Source/cmExecuteProcessCommand.cxx
+++ b/Source/cmExecuteProcessCommand.cxx
@ -6,10 +6,10 @@
 #include "cmsys/Process.h"

 #include <algorithm>
-#include <ctype.h> /* isspace */
+#include <cctype> /* isspace */
+#include <cstdio>
 #include <iostream>
 #include <memory>
-#include <stdio.h>
 #include <vector>

 #include "cmAlgorithms.h"
--- a/Source/cmExportFileGenerator.cxx
+++ b/Source/cmExportFileGenerator.cxx
@ -19,9 +19,9 @@
 #include "cmTargetExport.h"

 #include "cmsys/FStream.hxx"
-#include <assert.h>
+#include <cassert>
+#include <cstring>
 #include <sstream>
-#include <string.h>
 #include <utility>

 #include "cm_memory.hxx"
--- a/Source/cmExportInstallAndroidMKGenerator.cxx
+++ b/Source/cmExportInstallAndroidMKGenerator.cxx
@ -2,8 +2,8 @@
   file Copyright.txt or https://cmake.org/licensing for details.  */
 #include "cmExportInstallAndroidMKGenerator.h"

+#include <cstddef>
 #include <ostream>
-#include <stddef.h>

 #include "cmExportBuildAndroidMKGenerator.h"
 #include "cmExportSet.h"
--- a/Source/cmExtraCodeLiteGenerator.cxx
+++ b/Source/cmExtraCodeLiteGenerator.cxx
@ -15,10 +15,10 @@
 #include "cmake.h"

 #include "cmsys/SystemInformation.hxx"
+#include <cstring>
 #include <map>
 #include <set>
 #include <sstream>
-#include <string.h>
 #include <utility>

 cmExtraCodeLiteGenerator::cmExtraCodeLiteGenerator()
--- a/Source/cmExtraEclipseCDT4Generator.cxx
+++ b/Source/cmExtraEclipseCDT4Generator.cxx
@ -4,10 +4,10 @@

 #include "cmsys/RegularExpression.hxx"
 #include <algorithm>
-#include <assert.h>
+#include <cassert>
+#include <cstdio>
 #include <map>
 #include <sstream>
-#include <stdio.h>
 #include <utility>

 #include "cmGeneratedFileStream.h"
--- a/Source/cmExtraKateGenerator.cxx
+++ b/Source/cmExtraKateGenerator.cxx
@ -12,9 +12,9 @@
 #include "cmStringAlgorithms.h"
 #include "cmSystemTools.h"

+#include <cstring>
 #include <ostream>
 #include <set>
-#include <string.h>
 #include <vector>

 cmExtraKateGenerator::cmExtraKateGenerator() = default;
--- a/Source/cmExtraSublimeTextGenerator.cxx
+++ b/Source/cmExtraSublimeTextGenerator.cxx
@ -3,9 +3,9 @@
 #include "cmExtraSublimeTextGenerator.h"

 #include "cmsys/RegularExpression.hxx"
+#include <cstring>
 #include <set>
 #include <sstream>
-#include <string.h>
 #include <utility>

 #include "cmGeneratedFileStream.h"
--- a/Source/cmFLTKWrapUICommand.cxx
+++ b/Source/cmFLTKWrapUICommand.cxx
@ -2,7 +2,7 @@
   file Copyright.txt or https://cmake.org/licensing for details.  */
 #include "cmFLTKWrapUICommand.h"

-#include <stddef.h>
+#include <cstddef>

 #include "cmCustomCommandLines.h"
 #include "cmMakefile.h"
--- a/Source/cmFileCommand.cxx
+++ b/Source/cmFileCommand.cxx
@ -9,14 +9,14 @@
 #include "cmsys/RegularExpression.hxx"

 #include <algorithm>
-#include <assert.h>
+#include <cassert>
+#include <cctype>
 #include <cmath>
-#include <ctype.h>
+#include <cstdio>
+#include <cstdlib>
 #include <map>
 #include <set>
 #include <sstream>
-#include <stdio.h>
-#include <stdlib.h>
 #include <utility>
 #include <vector>

--- a/Source/cmFileCopier.cxx
+++ b/Source/cmFileCopier.cxx
@ -16,8 +16,8 @@
 #  include "cmsys/FStream.hxx"
 #endif

+#include <cstring>
 #include <sstream>
-#include <string.h>

 using namespace cmFSPermissions;

--- a/Source/cmFileLock.cxx
+++ b/Source/cmFileLock.cxx
@ -3,7 +3,7 @@
 #include "cmFileLock.h"

 #include "cmFileLockResult.h"
-#include <assert.h>
+#include <cassert>

 // Common implementation

--- a/Source/cmFileLockPool.cxx
+++ b/Source/cmFileLockPool.cxx
@ -2,7 +2,7 @@
   file Copyright.txt or https://cmake.org/licensing for details.  */
 #include "cmFileLockPool.h"

-#include <assert.h>
+#include <cassert>

 #include "cmAlgorithms.h"
 #include "cmFileLock.h"
--- a/Source/cmFileLockResult.cxx
+++ b/Source/cmFileLockResult.cxx
@ -2,8 +2,8 @@
   file Copyright.txt or https://cmake.org/licensing for details.  */
 #include "cmFileLockResult.h"

-#include <errno.h>
-#include <string.h>
+#include <cerrno>
+#include <cstring>

 #define WINMSG_BUF_LEN (1024)
 cmFileLockResult cmFileLockResult::MakeOk()
--- a/Source/cmFileLockUnix.cxx
+++ b/Source/cmFileLockUnix.cxx
@ -3,9 +3,9 @@
 #include "cmFileLock.h"

 #include "cmSystemTools.h"
-#include <errno.h> // errno
+#include <cerrno> // errno
+#include <cstdio> // SEEK_SET
 #include <fcntl.h>
-#include <stdio.h> // SEEK_SET
 #include <unistd.h>

 cmFileLock::cmFileLock() = default;
--- a/Source/cmFileMonitor.cxx
+++ b/Source/cmFileMonitor.cxx
@ -6,7 +6,7 @@
 #include "cmsys/SystemTools.hxx"

 #include <cassert>
-#include <stddef.h>
+#include <cstddef>
 #include <unordered_map>
 #include <utility>

--- a/Source/cmFilePathChecksum.h
+++ b/Source/cmFilePathChecksum.h
@ -6,7 +6,7 @@
 #include "cmConfigure.h" // IWYU pragma: keep

 #include <array>
-#include <stddef.h>
+#include <cstddef>
 #include <string>
 #include <utility>

--- a/Source/cmFileTime.cxx
+++ b/Source/cmFileTime.cxx
@ -2,8 +2,8 @@
   file Copyright.txt or https://cmake.org/licensing for details.  */
 #include "cmFileTime.h"

+#include <ctime>
 #include <string>
-#include <time.h>

 // Use a platform-specific API to get file times efficiently.
 #if !defined(_WIN32) || defined(__CYGWIN__)
--- a/Source/cmFindBase.cxx
+++ b/Source/cmFindBase.cxx
@ -2,10 +2,10 @@
   file Copyright.txt or https://cmake.org/licensing for details.  */
 #include "cmFindBase.h"

+#include <cstddef>
 #include <deque>
 #include <iostream>
 #include <map>
-#include <stddef.h>

 #include "cmAlgorithms.h"
 #include "cmMakefile.h"
--- a/Source/cmFindCommon.cxx
+++ b/Source/cmFindCommon.cxx
@ -4,7 +4,7 @@

 #include <algorithm>
 #include <array>
-#include <string.h>
+#include <cstring>
 #include <utility>

 #include "cmAlgorithms.h"
--- a/Source/cmFindLibraryCommand.cxx
+++ b/Source/cmFindLibraryCommand.cxx
@ -4,9 +4,9 @@

 #include "cmsys/RegularExpression.hxx"
 #include <algorithm>
+#include <cstdio>
+#include <cstring>
 #include <set>
-#include <stdio.h>
-#include <string.h>
 #include <utility>

 #include "cmGlobalGenerator.h"
--- a/Source/cmFindPackageCommand.cxx
+++ b/Source/cmFindPackageCommand.cxx
@ -9,13 +9,13 @@
 #include "cmsys/RegularExpression.hxx"
 #include "cmsys/String.h"
 #include <algorithm>
-#include <assert.h>
+#include <cassert>
+#include <cstdio>
+#include <cstring>
 #include <deque>
 #include <functional>
 #include <iterator>
 #include <sstream>
-#include <stdio.h>
-#include <string.h>
 #include <utility>

 #include "cm_memory.hxx"
--- a/Source/cmForEachCommand.cxx
+++ b/Source/cmForEachCommand.cxx
@ -2,9 +2,9 @@
   file Copyright.txt or https://cmake.org/licensing for details.  */
 #include "cmForEachCommand.h"

+#include <cstdio>
+#include <cstdlib>
 #include <sstream>
-#include <stdio.h>
-#include <stdlib.h>
 #include <utility>

 #include "cm_memory.hxx"
--- a/Show More
+++ b/Show More