From 33a94fe1bb541a82e29454f2949a3f207994a90d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Janiszewski?= <janisozaur+signed@gmail.com>
Date: Thu, 4 Jan 2018 00:36:33 +0100
Subject: [PATCH] Use C++ headers in C++ code

---
 src/openrct2-ui/input/Input.cpp                   | 2 +-
 src/openrct2-ui/windows/EditorObjectSelection.cpp | 2 +-
 src/openrct2-ui/windows/LoadSave.cpp              | 2 +-
 src/openrct2/Diagnostic.cpp                       | 6 +++---
 src/openrct2/cmdline/RootCommands.cpp             | 2 +-
 src/openrct2/core/Guard.cpp                       | 4 ++--
 src/openrct2/network/TcpSocket.cpp                | 4 ++--
 src/openrct2/platform/Platform.Posix.cpp          | 2 +-
 src/openrct2/util/Util.cpp                        | 4 ++--
 src/openrct2/world/MapGen.cpp                     | 2 +-
 10 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/src/openrct2-ui/input/Input.cpp b/src/openrct2-ui/input/Input.cpp
index 5157fd1590..ec44c9de0a 100644
--- a/src/openrct2-ui/input/Input.cpp
+++ b/src/openrct2-ui/input/Input.cpp
@@ -15,7 +15,7 @@
 #pragma endregion
 
 #include <SDL.h>
-#include <ctype.h>
+#include <cctype>
 #include <openrct2/Context.h>
 #include <openrct2/OpenRCT2.h>
 #include <openrct2/common.h>
diff --git a/src/openrct2-ui/windows/EditorObjectSelection.cpp b/src/openrct2-ui/windows/EditorObjectSelection.cpp
index 655650ab94..eab0648234 100644
--- a/src/openrct2-ui/windows/EditorObjectSelection.cpp
+++ b/src/openrct2-ui/windows/EditorObjectSelection.cpp
@@ -16,7 +16,7 @@
 
 #include <openrct2-ui/windows/Window.h>
 
-#include <ctype.h>
+#include <cctype>
 #include <string>
 
 #include <openrct2/audio/audio.h>
diff --git a/src/openrct2-ui/windows/LoadSave.cpp b/src/openrct2-ui/windows/LoadSave.cpp
index 4053ae11bb..676720a073 100644
--- a/src/openrct2-ui/windows/LoadSave.cpp
+++ b/src/openrct2-ui/windows/LoadSave.cpp
@@ -23,7 +23,7 @@
 #include <openrct2/windows/Intent.h>
 #include <openrct2-ui/windows/Window.h>
 
-#include <time.h>
+#include <ctime>
 #include <openrct2/core/Guard.hpp>
 #include <openrct2/Editor.h>
 #include <openrct2/Game.h>
diff --git a/src/openrct2/Diagnostic.cpp b/src/openrct2/Diagnostic.cpp
index 4ceef4ac20..3ee06326e7 100644
--- a/src/openrct2/Diagnostic.cpp
+++ b/src/openrct2/Diagnostic.cpp
@@ -14,9 +14,9 @@
  *****************************************************************************/
 #pragma endregion
 
-#include <assert.h>
-#include <stdarg.h>
-#include <stdio.h>
+#include <cassert>
+#include <cstdarg>
+#include <cstdio>
 #include "Diagnostic.h"
 
 #ifdef __ANDROID__
diff --git a/src/openrct2/cmdline/RootCommands.cpp b/src/openrct2/cmdline/RootCommands.cpp
index 886f079539..64e70430c8 100644
--- a/src/openrct2/cmdline/RootCommands.cpp
+++ b/src/openrct2/cmdline/RootCommands.cpp
@@ -14,7 +14,7 @@
  *****************************************************************************/
 #pragma endregion
 
-#include <time.h>
+#include <ctime>
 
 #include "../core/Guard.hpp"
 
diff --git a/src/openrct2/core/Guard.cpp b/src/openrct2/core/Guard.cpp
index 6ac3bee231..265b27ec99 100644
--- a/src/openrct2/core/Guard.cpp
+++ b/src/openrct2/core/Guard.cpp
@@ -15,8 +15,8 @@
 #pragma endregion
 
 #include <cassert>
-#include <stdarg.h>
-#include <stdio.h>
+#include <cstdarg>
+#include <cstdio>
 
 #include "../common.h"
 
diff --git a/src/openrct2/network/TcpSocket.cpp b/src/openrct2/network/TcpSocket.cpp
index 30949f128d..624212f16f 100644
--- a/src/openrct2/network/TcpSocket.cpp
+++ b/src/openrct2/network/TcpSocket.cpp
@@ -21,7 +21,7 @@
 #include <thread>
 
 // MSVC: include <math.h> here otherwise PI gets defined twice
-#include <math.h>
+#include <cmath>
 
 #ifdef _WIN32
     // winsock2 must be included before windows.h
@@ -40,7 +40,7 @@
     #endif
     #define FLAG_NO_PIPE 0
 #else
-    #include <errno.h>
+    #include <cerrno>
     #include <arpa/inet.h>
     #include <netdb.h>
     #include <netinet/tcp.h>
diff --git a/src/openrct2/platform/Platform.Posix.cpp b/src/openrct2/platform/Platform.Posix.cpp
index 18b258cbae..15f5f5faae 100644
--- a/src/openrct2/platform/Platform.Posix.cpp
+++ b/src/openrct2/platform/Platform.Posix.cpp
@@ -18,7 +18,7 @@
 
 #include <cstring>
 #include <pwd.h>
-#include <stdlib.h>
+#include <cstdlib>
 #include "../core/String.hpp"
 #include "Platform2.h"
 #include "platform.h"
diff --git a/src/openrct2/util/Util.cpp b/src/openrct2/util/Util.cpp
index fa7f704976..f41efc495c 100644
--- a/src/openrct2/util/Util.cpp
+++ b/src/openrct2/util/Util.cpp
@@ -14,8 +14,8 @@
  *****************************************************************************/
 #pragma endregion
 
-#include <ctype.h>
-#include <time.h>
+#include <cctype>
+#include <ctime>
 #include "../common.h"
 #include "../core/Guard.hpp"
 #include "../core/Math.hpp"
diff --git a/src/openrct2/world/MapGen.cpp b/src/openrct2/world/MapGen.cpp
index 5a5a8eb829..dd4ab4d1fd 100644
--- a/src/openrct2/world/MapGen.cpp
+++ b/src/openrct2/world/MapGen.cpp
@@ -15,7 +15,7 @@
 #pragma endregion
 
 #include "../common.h"
-#include <math.h>
+#include <cmath>
 #include <vector>
 
 #include "../Context.h"