diff options
author | Andrei Karas <akaras@inbox.ru> | 2013-10-08 11:44:02 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2013-10-08 13:04:49 +0300 |
commit | b13beb3c1d965dd1a2a8dd3bdbea3d66242c3298 (patch) | |
tree | 09e94834279ae54b19403805e7f77766cf38bcce | |
parent | 57c8ddb516edcf88de31a6bcd7724d4329839c0a (diff) | |
download | plus-b13beb3c1d965dd1a2a8dd3bdbea3d66242c3298.tar.gz plus-b13beb3c1d965dd1a2a8dd3bdbea3d66242c3298.tar.bz2 plus-b13beb3c1d965dd1a2a8dd3bdbea3d66242c3298.tar.xz plus-b13beb3c1d965dd1a2a8dd3bdbea3d66242c3298.zip |
remove unused system headers.
also remplace legacy headers.
-rw-r--r-- | src/configuration.cpp | 2 | ||||
-rw-r--r-- | src/debug/debug_new.cpp | 1 | ||||
-rw-r--r-- | src/debug/debug_new.h | 1 | ||||
-rw-r--r-- | src/debug/fast_mutex.h | 1 | ||||
-rw-r--r-- | src/gui/palette.cpp | 2 | ||||
-rw-r--r-- | src/gui/windows/itemamountwindow.cpp | 2 | ||||
-rw-r--r-- | src/logger.cpp | 2 | ||||
-rw-r--r-- | src/map.cpp | 2 | ||||
-rw-r--r-- | src/mumblemanager.cpp | 5 | ||||
-rw-r--r-- | src/mumblemanager.h | 1 | ||||
-rw-r--r-- | src/net/download.h | 1 | ||||
-rw-r--r-- | src/net/ea/network.cpp | 1 | ||||
-rw-r--r-- | src/particle/rotationalparticle.cpp | 2 | ||||
-rw-r--r-- | src/resources/db/npcdb.h | 2 | ||||
-rw-r--r-- | src/resources/dye.cpp | 2 | ||||
-rw-r--r-- | src/resources/wallpaper.cpp | 2 | ||||
-rw-r--r-- | src/utils/base64.cpp | 3 | ||||
-rw-r--r-- | src/utils/mathutils.h | 1 | ||||
-rw-r--r-- | src/utils/paths.cpp | 4 | ||||
-rw-r--r-- | src/utils/physfsrwops.cpp | 2 | ||||
-rw-r--r-- | src/utils/process.cpp | 1 | ||||
-rw-r--r-- | src/utils/stringutils.cpp | 6 | ||||
-rw-r--r-- | src/utils/translation/poparser.cpp | 2 | ||||
-rw-r--r-- | src/utils/translation/translationmanager.cpp | 2 | ||||
-rw-r--r-- | src/vector.h | 2 |
25 files changed, 12 insertions, 40 deletions
diff --git a/src/configuration.cpp b/src/configuration.cpp index 3fb323dd2..489755341 100644 --- a/src/configuration.cpp +++ b/src/configuration.cpp @@ -27,8 +27,6 @@ #include "utils/paths.h" -#include <stdlib.h> - #include "debug.h" #ifdef DEBUG_CONFIG diff --git a/src/debug/debug_new.cpp b/src/debug/debug_new.cpp index b1242cc09..572a96e08 100644 --- a/src/debug/debug_new.cpp +++ b/src/debug/debug_new.cpp @@ -42,7 +42,6 @@ #ifdef ENABLE_MEM_DEBUG #include <new> #include <assert.h> -#include <stdio.h> #include <stdlib.h> #include <string.h> #ifdef __unix__ diff --git a/src/debug/debug_new.h b/src/debug/debug_new.h index 00861f0bf..67b588f32 100644 --- a/src/debug/debug_new.h +++ b/src/debug/debug_new.h @@ -43,7 +43,6 @@ #define M_DEBUG_NEW_H #include <new> -#include <stdio.h> /** * @def HAVE_PLACEMENT_DELETE diff --git a/src/debug/fast_mutex.h b/src/debug/fast_mutex.h index 6fe51e6d8..d54f2e353 100644 --- a/src/debug/fast_mutex.h +++ b/src/debug/fast_mutex.h @@ -92,7 +92,6 @@ # endif # ifdef _DEBUG -# include <stdio.h> # include <stdlib.h> /** Macro for fast_mutex assertions. Real version (for debug mode). */ # define _FAST_MUTEX_ASSERT(_Expr, _Msg) \ diff --git a/src/gui/palette.cpp b/src/gui/palette.cpp index ada4f2e5b..0f7d76e85 100644 --- a/src/gui/palette.cpp +++ b/src/gui/palette.cpp @@ -25,7 +25,7 @@ #include "client.h" -#include <math.h> +#include <cmath> #include "debug.h" diff --git a/src/gui/windows/itemamountwindow.cpp b/src/gui/windows/itemamountwindow.cpp index 8816be8dc..7ad559c92 100644 --- a/src/gui/windows/itemamountwindow.cpp +++ b/src/gui/windows/itemamountwindow.cpp @@ -48,8 +48,6 @@ #include "utils/gettext.h" -#include <math.h> - #include "debug.h" class ItemsModal final : public gcn::ListModel diff --git a/src/logger.cpp b/src/logger.cpp index a7760a472..12a51070d 100644 --- a/src/logger.cpp +++ b/src/logger.cpp @@ -31,8 +31,6 @@ #include <windows.h> #elif defined __APPLE__ #include <Carbon/Carbon.h> -#elif defined(__linux__) || defined(__linux) -#include <stdlib.h> #endif #include <sys/time.h> diff --git a/src/map.cpp b/src/map.cpp index 3ff62e88d..d02507180 100644 --- a/src/map.cpp +++ b/src/map.cpp @@ -46,7 +46,7 @@ #include "utils/mkdir.h" #include "utils/physfstools.h" -#include <limits.h> +#include <limits> #include <queue> #include <sys/stat.h> diff --git a/src/mumblemanager.cpp b/src/mumblemanager.cpp index 3bd961bac..b69094519 100644 --- a/src/mumblemanager.cpp +++ b/src/mumblemanager.cpp @@ -19,12 +19,9 @@ #ifdef __OpenBSD__ #include <sys/param.h> #endif -#include <stdio.h> -#include <stdlib.h> #include <wchar.h> -#include <ctype.h> +#include <cctype> -#include <stdint.h> #include <fcntl.h> #include <unistd.h> #include <sys/types.h> diff --git a/src/mumblemanager.h b/src/mumblemanager.h index 039312c17..8c5354a6c 100644 --- a/src/mumblemanager.h +++ b/src/mumblemanager.h @@ -18,7 +18,6 @@ #if defined (__FreeBSD__) || (defined __DragonFly__) #include <sys/stat.h> #endif -#include <stdint.h> #include "localconsts.h" diff --git a/src/net/download.h b/src/net/download.h index 8850b3512..43821a0e2 100644 --- a/src/net/download.h +++ b/src/net/download.h @@ -23,7 +23,6 @@ #ifndef NET_DOWNLOAD_H #define NET_DOWNLOAD_H -#include <stdio.h> #include <string> #include "localconsts.h" diff --git a/src/net/ea/network.cpp b/src/net/ea/network.cpp index 2ad8fbf03..87ab01722 100644 --- a/src/net/ea/network.cpp +++ b/src/net/ea/network.cpp @@ -28,7 +28,6 @@ #include "utils/gettext.h" #include "utils/sdlhelper.h" -#include <assert.h> #include <sstream> #include "debug.h" diff --git a/src/particle/rotationalparticle.cpp b/src/particle/rotationalparticle.cpp index a6588acba..c16baf391 100644 --- a/src/particle/rotationalparticle.cpp +++ b/src/particle/rotationalparticle.cpp @@ -24,7 +24,7 @@ #include "simpleanimation.h" -#include <math.h> +#include <cmath> #include "debug.h" diff --git a/src/resources/db/npcdb.h b/src/resources/db/npcdb.h index 75215e0dd..ac4b0d417 100644 --- a/src/resources/db/npcdb.h +++ b/src/resources/db/npcdb.h @@ -23,8 +23,6 @@ #ifndef RESOURCES_DB_NPCDB_H #define RESOURCES_DB_NPCDB_H -#include <stdint.h> - #include <string> #include "localconsts.h" diff --git a/src/resources/dye.cpp b/src/resources/dye.cpp index 873c2a8fe..aebb8f009 100644 --- a/src/resources/dye.cpp +++ b/src/resources/dye.cpp @@ -26,7 +26,7 @@ #include "resources/db/palettedb.h" -#include <math.h> +#include <cmath> #include <sstream> #include <SDL_endian.h> diff --git a/src/resources/wallpaper.cpp b/src/resources/wallpaper.cpp index 513e1c8fc..17449f898 100644 --- a/src/resources/wallpaper.cpp +++ b/src/resources/wallpaper.cpp @@ -30,7 +30,7 @@ #include <algorithm> #include <cstring> -#include <time.h> +#include <ctime> #include "debug.h" diff --git a/src/utils/base64.cpp b/src/utils/base64.cpp index 4e1061b6e..4ba721177 100644 --- a/src/utils/base64.cpp +++ b/src/utils/base64.cpp @@ -29,8 +29,7 @@ #include "utils/base64.h" -#include <stdlib.h> -#include <string.h> +#include <string> #include "debug.h" diff --git a/src/utils/mathutils.h b/src/utils/mathutils.h index 094ae984c..01078baf3 100644 --- a/src/utils/mathutils.h +++ b/src/utils/mathutils.h @@ -24,7 +24,6 @@ #define UTILS_MATHUTILS_H #include <string> -#include <stdint.h> #include <cstring> #include "localconsts.h" diff --git a/src/utils/paths.cpp b/src/utils/paths.cpp index dbbdf6b31..e3992cd72 100644 --- a/src/utils/paths.cpp +++ b/src/utils/paths.cpp @@ -30,13 +30,11 @@ #include "resources/resourcemanager.h" -#include <stdlib.h> - #ifdef WIN32 #include "utils/specialfolder.h" #define realpath(N, R) _fullpath((R), (N), _MAX_PATH) #elif defined __OpenBSD__ -#include <limits.h> +#include <limits> #endif #ifdef ANDROID diff --git a/src/utils/physfsrwops.cpp b/src/utils/physfsrwops.cpp index aa5caf7c7..d6a1e891a 100644 --- a/src/utils/physfsrwops.cpp +++ b/src/utils/physfsrwops.cpp @@ -29,8 +29,6 @@ #include "utils/fuzzer.h" #include "utils/physfscheckutils.h" -#include <stdio.h> - #include "debug.h" #ifdef USE_SDL2 diff --git a/src/utils/process.cpp b/src/utils/process.cpp index 0675adae3..1bd8430b5 100644 --- a/src/utils/process.cpp +++ b/src/utils/process.cpp @@ -23,7 +23,6 @@ #include <cstdarg> #include <cstdio> -#include <stdlib.h> #include <unistd.h> #include "localconsts.h" diff --git a/src/utils/stringutils.cpp b/src/utils/stringutils.cpp index 9c5a53791..e1486d91b 100644 --- a/src/utils/stringutils.cpp +++ b/src/utils/stringutils.cpp @@ -22,13 +22,13 @@ #include "utils/stringutils.h" -#include <string.h> +#include <string> #include <algorithm> #include <cstdarg> #include <cstdio> -#include <ctype.h> +#include <cctype> #include <list> -#include <time.h> +#include <ctime> #include "debug.h" diff --git a/src/utils/translation/poparser.cpp b/src/utils/translation/poparser.cpp index b2034903d..6405e5f85 100644 --- a/src/utils/translation/poparser.cpp +++ b/src/utils/translation/poparser.cpp @@ -26,8 +26,6 @@ #include "logger.h" -#include <stdlib.h> - #include "debug.h" PoParser::PoParser() : diff --git a/src/utils/translation/translationmanager.cpp b/src/utils/translation/translationmanager.cpp index 6036ddeab..ebe7c8436 100644 --- a/src/utils/translation/translationmanager.cpp +++ b/src/utils/translation/translationmanager.cpp @@ -28,8 +28,6 @@ #include "resources/resourcemanager.h" -#include <stdlib.h> - #include "logger.h" #include "debug.h" diff --git a/src/vector.h b/src/vector.h index 4ba524c0d..66a0d501f 100644 --- a/src/vector.h +++ b/src/vector.h @@ -23,7 +23,7 @@ #ifndef VECTOR_H #define VECTOR_H -#include <math.h> +#include <cmath> #include <iostream> |