manage stl includes

This commit is contained in:
Garux 2021-10-31 12:38:53 +03:00
parent 512f0a959b
commit b0b997e493
73 changed files with 120 additions and 126 deletions

View File

@ -34,7 +34,7 @@
and the external dependencies (such as GLib, STL, mathlib etc.) and the external dependencies (such as GLib, STL, mathlib etc.)
*/ */
#include <stdio.h> #include <cstdio>
// for CPtrArray for idata.h // for CPtrArray for idata.h
#include "missing.h" #include "missing.h"

View File

@ -23,7 +23,7 @@
#pragma once #pragma once
#include <stdio.h> #include <cstdio>
#include <list> #include <list>
#include "mathlib.h" #include "mathlib.h"
#include "str.h" #include "str.h"

View File

@ -24,7 +24,7 @@
#pragma once #pragma once
#include <list> #include <list>
#include <stdlib.h> #include <cstdlib>
typedef struct typedef struct
{ {

View File

@ -24,7 +24,7 @@
#include "DShape.h" #include "DShape.h"
#include <list> #include <list>
#include <time.h> #include <ctime>
#include "str.h" #include "str.h"
#include "DPoint.h" #include "DPoint.h"

View File

@ -23,7 +23,7 @@
#pragma once #pragma once
#include <stdlib.h> #include <cstdlib>
#include "mathlib.h" #include "mathlib.h"
#include "DMap.h" #include "DMap.h"
class DBrush; class DBrush;

View File

@ -18,7 +18,7 @@
*/ */
#include "ScriptParser.h" #include "ScriptParser.h"
#include <string.h> #include <cstring>
CScriptParser::CScriptParser( void ) : CScriptParser::CScriptParser( void ) :
m_pScript( NULL ), m_pScript( NULL ),

View File

@ -19,8 +19,8 @@
#include "CPortals.h" #include "CPortals.h"
#include <string.h> #include <cstring>
#include <math.h> #include <cmath>
#include "misc.h" #include "misc.h"

View File

@ -40,7 +40,7 @@
#include <list> #include <list>
#include <map> #include <map>
#include <algorithm> #include <algorithm>
#include <time.h> #include <ctime>
#include "scenelib.h" #include "scenelib.h"
#include "texturelib.h" #include "texturelib.h"

View File

@ -4,10 +4,6 @@
#pragma once #pragma once
#ifdef HAVE_CONFIG_H
# include <config.h>
#endif
#include <gtk/gtk.h> #include <gtk/gtk.h>
/* /*

View File

@ -22,9 +22,9 @@
#pragma once #pragma once
#include "mathlib.h" #include "mathlib.h"
#include <string.h> #include <cstring>
#include "qertypes.h" #include "qertypes.h"
#include <stdio.h> #include <cstdio>
#define USE_QERTABLE_DEFINE #define USE_QERTABLE_DEFINE
#include "iscenegraph.h" #include "iscenegraph.h"
@ -35,8 +35,7 @@
#include "ientity.h" #include "ientity.h"
#include <gtk/gtk.h> #include <gtk/gtk.h>
#include <stdio.h> #include <cstdlib>
#include <stdlib.h>
#include "iplugin.h" #include "iplugin.h"

View File

@ -18,7 +18,7 @@
*/ */
#include "ConfigDialog.h" #include "ConfigDialog.h"
#include <stdio.h> #include <cstdio>
#include <gtk/gtk.h> #include <gtk/gtk.h>
#include "gtkutil/pointer.h" #include "gtkutil/pointer.h"

View File

@ -18,12 +18,12 @@
*/ */
#include "portals.h" #include "portals.h"
#include <string.h> #include <cstring>
#include <stdlib.h> #include <cstdlib>
#ifndef __APPLE__ #ifndef __APPLE__
#include <search.h> #include <search.h>
#endif #endif
#include <stdio.h> #include <cstdio>
#include "iglrender.h" #include "iglrender.h"
#include "cullable.h" #include "cullable.h"

View File

@ -19,8 +19,8 @@
#include "prtview.h" #include "prtview.h"
#include <stdio.h> #include <cstdio>
#include <stdlib.h> #include <cstdlib>
#include "profile/profile.h" #include "profile/profile.h"

View File

@ -22,7 +22,7 @@
#pragma once #pragma once
#include <cstddef> #include <cstddef>
#include <string.h> #include <cstring>
#include "generic/constant.h" #include "generic/constant.h"
#if defined( WIN32 ) #if defined( WIN32 )

View File

@ -29,7 +29,7 @@
#define __USE_ISOC9X 1 #define __USE_ISOC9X 1
#define __USE_ISOC99 1 #define __USE_ISOC99 1
#include <stdint.h> #include <cstdint>
#endif #endif

View File

@ -25,7 +25,7 @@
#pragma once #pragma once
#include <time.h> #include <ctime>
// TTimo started adding portability code: // TTimo started adding portability code:

View File

@ -25,8 +25,8 @@
#include "cmdlib.h" #include "cmdlib.h"
#include <string.h> #include <cstring>
#include <stdio.h> #include <cstdio>
#include "string/string.h" #include "string/string.h"
#include "os/path.h" #include "os/path.h"

View File

@ -33,7 +33,7 @@
#elif ( defined ( __i386__ ) || defined ( __x86_64__ ) ) && defined ( __GNUC__ ) && __GNUC__ >= 2 #elif ( defined ( __i386__ ) || defined ( __x86_64__ ) ) && defined ( __GNUC__ ) && __GNUC__ >= 2
#define DEBUGGER_BREAKPOINT() __asm__ __volatile__ ( "int $03" ) #define DEBUGGER_BREAKPOINT() __asm__ __volatile__ ( "int $03" )
#else #else
#include <signal.h> #include <csignal>
#define DEBUGGER_BREAKPOINT() raise( SIGTRAP ); #define DEBUGGER_BREAKPOINT() raise( SIGTRAP );
#endif #endif

View File

@ -21,8 +21,8 @@
#pragma once #pragma once
#include <stdio.h> #include <cstdio>
#include <stdlib.h> #include <cstdlib>
#include <list> #include <list>
#include <map> #include <map>
#include <vector> #include <vector>

View File

@ -23,7 +23,7 @@
#include "stream/textstream.h" #include "stream/textstream.h"
#include <string.h> #include <cstring>
#include <gdk/gdk.h> #include <gdk/gdk.h>
#if 0 #if 0

View File

@ -21,8 +21,8 @@
#pragma once #pragma once
#include <stdio.h> #include <cstdio>
#include <stdlib.h> #include <cstdlib>
#include <gtk/gtk.h> #include <gtk/gtk.h>
inline void entry_set_string( GtkEntry* entry, const char* string ){ inline void entry_set_string( GtkEntry* entry, const char* string ){

View File

@ -21,7 +21,7 @@
#include "menu.h" #include "menu.h"
#include <ctype.h> #include <cctype>
#include <gtk/gtk.h> #include <gtk/gtk.h>
#include "generic/callback.h" #include "generic/callback.h"

View File

@ -24,7 +24,7 @@
#include "iimage.h" #include "iimage.h"
#include "iarchive.h" #include "iarchive.h"
#include "idatastream.h" #include "idatastream.h"
#include <stdlib.h> #include <cstdlib>
struct RGBAPixel struct RGBAPixel
{ {

View File

@ -68,7 +68,7 @@ inline long long llrint( double f ){
#endif #endif
#include <cmath> #include <cmath>
#include <float.h> #include <cfloat>
#include <algorithm> #include <algorithm>

View File

@ -22,7 +22,7 @@
#pragma once #pragma once
#include <memory> #include <memory>
#include <stddef.h> #include <cstddef>
#if 0 #if 0

View File

@ -45,7 +45,7 @@
#include <unistd.h> // access() #include <unistd.h> // access()
#endif #endif
#include <stdio.h> // rename(), remove() #include <cstdio> // rename(), remove()
#include <sys/stat.h> // stat() #include <sys/stat.h> // stat()
#include <sys/types.h> // this is included by stat.h on win32 #include <sys/types.h> // this is included by stat.h on win32
#include <cstddef> #include <cstddef>

View File

@ -35,7 +35,6 @@
/* dependencies */ /* dependencies */
#include <string.h>
#include "picointernal.h" #include "picointernal.h"

View File

@ -37,10 +37,10 @@
#include "file.h" #include "file.h"
#include <memory.h> #include <memory>
#include <stdlib.h> #include <cstdlib>
#include <string.h> #include <cstring>
#include <stdarg.h> #include <cstdarg>
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// File construction/destruction // File construction/destruction

View File

@ -71,7 +71,7 @@ public:
virtual void Close() = 0; virtual void Close() = 0;
}; };
#include <stdio.h> #include <cstdio>
class MemStream : public IDataStream class MemStream : public IDataStream
{ {

View File

@ -36,13 +36,13 @@
#include "profile.h" #include "profile.h"
#include <string.h> #include <cstring>
#include <stdio.h> #include <cstdio>
#include <math.h> #include <cmath>
#include "file.h" #include "file.h"
#include <stdlib.h> #include <cstdlib>
#include "str.h" #include "str.h"

View File

@ -26,7 +26,7 @@
#include "warnings.h" #include "warnings.h"
#include <cstddef> #include <cstddef>
#include <string.h> #include <cstring>
#include "math/aabb.h" #include "math/aabb.h"
#include "transformlib.h" #include "transformlib.h"

View File

@ -24,7 +24,7 @@
#include "iselection.h" #include "iselection.h"
#include "generic/callback.h" #include "generic/callback.h"
#include "scenelib.h" #include "scenelib.h"
#include <stdlib.h> #include <cstdlib>
class SelectableBool : public Selectable class SelectableBool : public Selectable
{ {

View File

@ -35,11 +35,11 @@
// loose replacement for CString from MFC // loose replacement for CString from MFC
// //
#include <string.h> #include <cstring>
#include <ctype.h> #include <cctype>
#include <stdio.h> #include <cstdio>
#include <stdarg.h> #include <cstdarg>
#include <cstdio> #include <cstdio>

View File

@ -22,7 +22,7 @@
#pragma once #pragma once
#include "itextstream.h" #include "itextstream.h"
#include <stdio.h> #include <cstdio>
/// \brief A wrapper around a file input stream opened for reading in text mode. Similar to std::ifstream. /// \brief A wrapper around a file input stream opened for reading in text mode. Similar to std::ifstream.
class TextFileInputStream : public TextInputStream class TextFileInputStream : public TextInputStream

View File

@ -29,8 +29,8 @@
#include <cctype> #include <cctype>
#include <cstddef> #include <cstddef>
#include <cmath> #include <cmath>
#include <stdio.h> #include <cstdio>
#include <string.h> #include <cstring>
#include <algorithm> #include <algorithm>
#include "generic/arrayrange.h" #include "generic/arrayrange.h"

View File

@ -21,7 +21,7 @@
#pragma once #pragma once
#include <stdlib.h> #include <cstdlib>
#include <cctype> #include <cctype>
#include "generic/vector.h" #include "generic/vector.h"

View File

@ -22,7 +22,7 @@
#pragma once #pragma once
#include <cstddef> #include <cstddef>
#include <string.h> #include <cstring>
#include <algorithm> #include <algorithm>
class Version class Version

View File

@ -22,7 +22,7 @@
#pragma once #pragma once
#include <cstdio> #include <cstdio>
#include <string.h> #include <cstring>
#include "ixml.h" #include "ixml.h"
#include "libxml/parser.h" #include "libxml/parser.h"
#include "convert.h" #include "convert.h"
@ -62,7 +62,7 @@ private:
const char** m_atts; const char** m_atts;
}; };
#include <stdarg.h> #include <cstdarg>
class FormattedVA class FormattedVA
{ {

View File

@ -21,9 +21,9 @@
#include "plugin.h" #include "plugin.h"
#include <stdio.h> #include <cstdio>
typedef unsigned char byte; typedef unsigned char byte;
#include <stdlib.h> #include <cstdlib>
#include <algorithm> #include <algorithm>
#include <list> #include <list>

View File

@ -36,7 +36,7 @@
#include "light.h" #include "light.h"
#include <stdlib.h> #include <cstdlib>
#include "cullable.h" #include "cullable.h"
#include "renderable.h" #include "renderable.h"

View File

@ -21,7 +21,7 @@
#pragma once #pragma once
#include <stdio.h> #include <cstdio>
#include <map> #include <map>
#include "generic/static.h" #include "generic/static.h"
#include "entitylib.h" #include "entitylib.h"

View File

@ -21,7 +21,7 @@
#include "dds.h" #include "dds.h"
#include <stdlib.h> #include <cstdlib>
#include "ifilesystem.h" #include "ifilesystem.h"
#include "iarchive.h" #include "iarchive.h"

View File

@ -36,10 +36,10 @@
#include "jpeg.h" #include "jpeg.h"
#include <setjmp.h> #include <csetjmp>
#include <stdlib.h> #include <cstdlib>
#include <stdio.h> #include <cstdio>
#include <string.h> #include <cstring>
extern "C" { extern "C" {
#include <jpeglib.h> #include <jpeglib.h>

View File

@ -21,7 +21,7 @@
#include "ktx.h" #include "ktx.h"
#include <string.h> #include <cstring>
#include "bytestreamutils.h" #include "bytestreamutils.h"
#include "etclib.h" #include "etclib.h"

View File

@ -25,7 +25,7 @@
typedef unsigned char byte; typedef unsigned char byte;
#include <stdlib.h> #include <cstdlib>
#include "imagelib.h" #include "imagelib.h"
#include "bytestreamutils.h" #include "bytestreamutils.h"

View File

@ -27,7 +27,7 @@
typedef unsigned char byte; typedef unsigned char byte;
#include <stdlib.h> #include <cstdlib>
#include "generic/bitfield.h" #include "generic/bitfield.h"
#include "imagelib.h" #include "imagelib.h"

View File

@ -29,9 +29,9 @@
#include "hlw.h" #include "hlw.h"
#include <stdlib.h> #include <cstdlib>
#include <string.h> #include <cstring>
#include <stdio.h> #include <cstdio>
typedef unsigned char byte; typedef unsigned char byte;

View File

@ -21,9 +21,9 @@
#include "mip.h" #include "mip.h"
#include <stdlib.h> #include <cstdlib>
#include <string.h> #include <cstring>
#include <stdio.h> #include <cstdio>
typedef unsigned char byte; typedef unsigned char byte;

View File

@ -23,9 +23,9 @@
#include "sprite.h" #include "sprite.h"
#include <stdlib.h> #include <cstdlib>
#include <string.h> #include <cstring>
#include <stdio.h> #include <cstdio>
typedef unsigned char byte; typedef unsigned char byte;

View File

@ -31,7 +31,7 @@
// ====== PNG loader functionality ====== // ====== PNG loader functionality ======
#include "png.h" #include "png.h"
#include <stdlib.h> #include <cstdlib>
void user_warning_fn( png_structp png_ptr, png_const_charp warning_msg ){ void user_warning_fn( png_structp png_ptr, png_const_charp warning_msg ){
globalWarningStream() << "libpng warning: " << warning_msg << "\n"; globalWarningStream() << "libpng warning: " << warning_msg << "\n";

View File

@ -21,7 +21,7 @@
#pragma once #pragma once
#include <string.h> #include <cstring>
// equality comparison for two 4-byte ident strings // equality comparison for two 4-byte ident strings
inline bool ident_equal( const unsigned char* ident, const unsigned char* other ){ inline bool ident_equal( const unsigned char* ident, const unsigned char* other ){

View File

@ -21,8 +21,8 @@
#include "mdlimage.h" #include "mdlimage.h"
#include <math.h> #include <cmath>
#include <stdlib.h> #include <cstdlib>
#include "ifilesystem.h" #include "ifilesystem.h"
#include "bytestreamutils.h" #include "bytestreamutils.h"

View File

@ -21,10 +21,10 @@
#include "plugin.h" #include "plugin.h"
#include <stdio.h> #include <cstdio>
#include "picomodel.h" #include "picomodel.h"
typedef unsigned char byte; typedef unsigned char byte;
#include <stdlib.h> #include <cstdlib>
#include <algorithm> #include <algorithm>
#include <list> #include <list>

View File

@ -36,8 +36,8 @@
#include "shaders.h" #include "shaders.h"
#include <stdio.h> #include <cstdio>
#include <stdlib.h> #include <cstdlib>
#include <map> #include <map>
#include <list> #include <list>

View File

@ -29,9 +29,9 @@
#pragma once #pragma once
#include "mathlib.h" #include "mathlib.h"
#include <string.h> #include <cstring>
#include "qertypes.h" #include "qertypes.h"
#include <stdio.h> #include <cstdio>
#define USE_QERTABLE_DEFINE #define USE_QERTABLE_DEFINE
#include "qerplugin.h" #include "qerplugin.h"

View File

@ -25,8 +25,8 @@
// standard headers // standard headers
#include <gdk/gdkkeysyms.h> #include <gdk/gdkkeysyms.h>
#include <gtk/gtk.h> #include <gtk/gtk.h>
#include <stdio.h> #include <cstdio>
#include <stdlib.h> #include <cstdlib>
#if !defined( WIN32 ) #if !defined( WIN32 )

View File

@ -24,8 +24,8 @@
#include "idatastream.h" #include "idatastream.h"
#include "iarchive.h" #include "iarchive.h"
#include <stdio.h> #include <cstdio>
#include <stdlib.h> #include <cstdlib>
#include <vector> #include <vector>
#include "stream/filestream.h" #include "stream/filestream.h"

View File

@ -43,8 +43,8 @@
#include "vfs.h" #include "vfs.h"
#include <stdio.h> #include <cstdio>
#include <stdlib.h> #include <cstdlib>
#include <glib.h> #include <glib.h>
#include "qerplugin.h" #include "qerplugin.h"

View File

@ -21,7 +21,7 @@
#include "console.h" #include "console.h"
#include <time.h> #include <ctime>
#include <gtk/gtk.h> #include <gtk/gtk.h>
#include "gtkutil/accelerator.h" #include "gtkutil/accelerator.h"

View File

@ -33,7 +33,7 @@
#include "mainframe.h" #include "mainframe.h"
#include <stdlib.h> #include <cstdlib>
#include <gtk/gtk.h> #include <gtk/gtk.h>

View File

@ -66,7 +66,7 @@ StaticRegisterModule staticRegisterEclassDef( StaticEclassDefModule::instance()
#include "string/string.h" #include "string/string.h"
#include <stdlib.h> #include <cstdlib>
char com_token[1024]; char com_token[1024];

View File

@ -207,7 +207,7 @@ void cmdMap(){
#if defined( POSIX ) #if defined( POSIX )
#include <stdlib.h> #include <cstdlib>
#include <pwd.h> #include <pwd.h>
#include <unistd.h> #include <unistd.h>

View File

@ -33,7 +33,7 @@
#define UNICODE #define UNICODE
#include <windows.h> #include <windows.h>
#else #else
#include <errno.h> #include <cerrno>
#include <unistd.h> #include <unistd.h>
#endif #endif

View File

@ -21,7 +21,7 @@
#include "grid.h" #include "grid.h"
#include <math.h> #include <cmath>
#include <vector> #include <vector>
#include <algorithm> #include <algorithm>

View File

@ -9,7 +9,7 @@
#include <iostream> #include <iostream>
#include <fstream> #include <fstream>
#include <stdlib.h> #include <cstdlib>
#include <sstream> #include <sstream>
#include <gtk/gtk.h> #include <gtk/gtk.h>
@ -22,8 +22,8 @@
#include <unistd.h> #include <unistd.h>
#include <sys/types.h> #include <sys/types.h>
#include <string.h> #include <cstring>
#include <stdio.h> #include <cstdio>
#include <gdk/gdkkeysyms.h> #include <gdk/gdkkeysyms.h>
#include "gtktheme.h" #include "gtktheme.h"

View File

@ -21,8 +21,8 @@
#include "mru.h" #include "mru.h"
#include <string.h> #include <cstring>
#include <stdio.h> #include <cstdio>
#include <gtk/gtk.h> #include <gtk/gtk.h>
#include "os/file.h" #include "os/file.h"

View File

@ -24,9 +24,9 @@
#include "debugging/debugging.h" #include "debugging/debugging.h"
#include <stdio.h> #include <cstdio>
#include <stdlib.h> #include <cstdlib>
#include <string.h> #include <cstring>
#if defined( _WIN32 ) #if defined( _WIN32 )
#define WINGDIAPI __declspec( dllimport ) #define WINGDIAPI __declspec( dllimport )

View File

@ -31,7 +31,7 @@
#include "texmanip.h" #include "texmanip.h"
#include <stdlib.h> #include <cstdlib>
#include "stream/textstream.h" #include "stream/textstream.h"
static byte *row1 = NULL, *row2 = NULL; static byte *row1 = NULL, *row2 = NULL;

View File

@ -64,8 +64,8 @@ MillisecondTime MillisecondTime::current(){
#elif defined( POSIX ) #elif defined( POSIX )
#include <time.h> #include <ctime>
#include "sys/time.h" #include <sys/time.h>
MillisecondTime MillisecondTime::current(){ MillisecondTime MillisecondTime::current(){
static class Cached static class Cached

View File

@ -33,7 +33,7 @@ bool open_url( const char* url ){
#endif #endif
#if defined( __linux__ ) || defined( __FreeBSD__ ) #if defined( __linux__ ) || defined( __FreeBSD__ )
#include <stdlib.h> #include <cstdlib>
bool open_url( const char* url ){ bool open_url( const char* url ){
char command[2 * PATH_MAX]; char command[2 * PATH_MAX];
snprintf( command, sizeof( command ), snprintf( command, sizeof( command ),
@ -43,7 +43,7 @@ bool open_url( const char* url ){
#endif #endif
#ifdef __APPLE__ #ifdef __APPLE__
#include <stdlib.h> #include <cstdlib>
bool open_url( const char* url ){ bool open_url( const char* url ){
char command[2 * PATH_MAX]; char command[2 * PATH_MAX];
snprintf( command, sizeof( command ), "open \"%s\" &", url ); snprintf( command, sizeof( command ), "open \"%s\" &", url );

View File

@ -23,7 +23,7 @@
#if defined( DEBUG_CULLING ) #if defined( DEBUG_CULLING )
#include <stdio.h> #include <cstdio>
char g_cull_stats[1024]; char g_cull_stats[1024];
int g_count_dots; int g_count_dots;

View File

@ -34,10 +34,10 @@
// Leonardo Zide (leo@lokigames.com) // Leonardo Zide (leo@lokigames.com)
// //
#include <setjmp.h> #include <csetjmp>
#include <stdlib.h> #include <cstdlib>
#include <stdio.h> #include <cstdio>
#include <string.h> #include <cstring>
#include <jpeglib.h> #include <jpeglib.h>
#include <jerror.h> #include <jerror.h>

View File

@ -33,9 +33,9 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
* *
*****************************************************************************/ *****************************************************************************/
#include <stdlib.h> #include <cstdlib>
#include <stdio.h> #include <cstdio>
#include <string.h> #include <cstring>
#include "unzip.h" #include "unzip.h"
// TTimo added for safe_malloc wrapping // TTimo added for safe_malloc wrapping