use #pragma once

This commit is contained in:
Garux 2021-10-22 02:19:50 +03:00
parent 3362f29500
commit bf6389fc26
374 changed files with 400 additions and 1565 deletions

View File

@ -17,6 +17,8 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/ */
#pragma once
class CBspPoint { class CBspPoint {
public: public:
float p[3]; float p[3];

View File

@ -21,8 +21,7 @@
// //
////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////
#if !defined( AFX_BOBVIEW_H__6E36062A_EF0B_11D4_ACF7_004095A18133__INCLUDED_ ) #pragma once
#define AFX_BOBVIEW_H__6E36062A_EF0B_11D4_ACF7_004095A18133__INCLUDED_
#include "ientity.h" #include "ientity.h"
#include "irender.h" #include "irender.h"
@ -35,10 +34,6 @@ class Shader;
#define BOUNDS_ALL 0 #define BOUNDS_ALL 0
#define BOUNDS_APEX 1 #define BOUNDS_APEX 1
#if _MSC_VER > 1000
#pragma once
#endif // _MSC_VER > 1000
class DBobView : public Renderable, public OpenGLRenderable, public Entity::Observer class DBobView : public Renderable, public OpenGLRenderable, public Entity::Observer
{ {
Shader* m_shader_line; Shader* m_shader_line;
@ -97,5 +92,3 @@ public:
class Entity; class Entity;
void DBobView_setEntity( Entity& entity, float multiplier, int points, float varGravity, bool bNoUpdate, bool bShowExtra ); void DBobView_setEntity( Entity& entity, float multiplier, int points, float varGravity, bool bNoUpdate, bool bShowExtra );
#endif // !defined(AFX_BOBVIEW_H__6E36062A_EF0B_11D4_ACF7_004095A18133__INCLUDED_)

View File

@ -21,12 +21,7 @@
// //
////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////
#if !defined( AFX_DBRUSH_H__35B2C522_F0A7_11D4_ACF7_004095A18133__INCLUDED_ )
#define AFX_DBRUSH_H__35B2C522_F0A7_11D4_ACF7_004095A18133__INCLUDED_
#if _MSC_VER > 1000
#pragma once #pragma once
#endif // _MSC_VER > 1000
#include <stdio.h> #include <stdio.h>
#include <list> #include <list>
@ -111,5 +106,3 @@ public:
}; };
//typedef CList<DBrush*, DBrush*> DBrushList; //typedef CList<DBrush*, DBrush*> DBrushList;
#endif // !defined(AFX_DBRUSH_H__35B2C522_F0A7_11D4_ACF7_004095A18133__INCLUDED_)

View File

@ -21,12 +21,7 @@
// //
////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////
#if !defined( AFX_DEPAIR_H__35B2C521_F0A7_11D4_ACF7_004095A18133__INCLUDED_ )
#define AFX_DEPAIR_H__35B2C521_F0A7_11D4_ACF7_004095A18133__INCLUDED_
#if _MSC_VER > 1000
#pragma once #pragma once
#endif // _MSC_VER > 1000
#include "str.h" #include "str.h"
@ -43,5 +38,3 @@ public:
}; };
//typedef CList<DEPair*, DEPair*> DEPairList; //typedef CList<DEPair*, DEPair*> DEPairList;
#endif // !defined(AFX_DEPAIR_H__35B2C521_F0A7_11D4_ACF7_004095A18133__INCLUDED_)

View File

@ -21,12 +21,7 @@
// //
////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////
#if !defined( AFX_DENTITY_H__35B2C523_F0A7_11D4_ACF7_004095A18133__INCLUDED_ )
#define AFX_DENTITY_H__35B2C523_F0A7_11D4_ACF7_004095A18133__INCLUDED_
#if _MSC_VER > 1000
#pragma once #pragma once
#endif // _MSC_VER > 1000
#include <list> #include <list>
#include "str.h" #include "str.h"
@ -121,5 +116,3 @@ public:
void SpawnFloat( const char* key, const char* defaultstring, float* out ); void SpawnFloat( const char* key, const char* defaultstring, float* out );
void SpawnVector( const char* key, const char* defaultstring, vec_t* out ); void SpawnVector( const char* key, const char* defaultstring, vec_t* out );
}; };
#endif // !defined(AFX_DENTITY_H__35B2C523_F0A7_11D4_ACF7_004095A18133__INCLUDED_)

View File

@ -21,12 +21,7 @@
// //
////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////
#if !defined( AFX_DMAP_H__ACAE597A_D26D_49AD_AA69_EDE743DB54FA__INCLUDED_ )
#define AFX_DMAP_H__ACAE597A_D26D_49AD_AA69_EDE743DB54FA__INCLUDED_
#if _MSC_VER > 1000
#pragma once #pragma once
#endif // _MSC_VER > 1000
#include <list> #include <list>
@ -54,5 +49,3 @@ public:
int FixBrushes(); int FixBrushes();
}; };
#endif // !defined(AFX_DMAP_H__ACAE597A_D26D_49AD_AA69_EDE743DB54FA__INCLUDED_)

View File

@ -21,8 +21,7 @@
// //
////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////
#if !defined( AFX_DPATCH_H__26C6B083_CE5B_420B_836B_1DDA733C04CE__INCLUDED_ ) #pragma once
#define AFX_DPATCH_H__26C6B083_CE5B_420B_836B_1DDA733C04CE__INCLUDED_
#include <list> #include <list>
#include <stdlib.h> #include <stdlib.h>
@ -77,5 +76,3 @@ public:
virtual ~DPatch(); virtual ~DPatch();
}; };
#endif // !defined(AFX_DPATCH_H__26C6B083_CE5B_420B_836B_1DDA733C04CE__INCLUDED_)

View File

@ -21,8 +21,7 @@
// //
////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////
#if !defined( AFX_DPLANE_H__FC37C021_F0A1_11D4_ACF7_004095A18133__INCLUDED_ ) #pragma once
#define AFX_DPLANE_H__FC37C021_F0A1_11D4_ACF7_004095A18133__INCLUDED_
#include <list> #include <list>
#include "ibrush.h" #include "ibrush.h"
@ -34,10 +33,6 @@ class DPoint;
#define FACE_DETAIL 0x8000000 #define FACE_DETAIL 0x8000000
#if _MSC_VER > 1000
#pragma once
#endif // _MSC_VER > 1000
class DWinding; class DWinding;
class DPlane class DPlane
@ -70,5 +65,4 @@ public:
float _d; float _d;
}; };
//typedef CList<DPlane*, DPlane*> DPlaneList; //typedef CList<DPlane*, DPlane*> DPlaneList;
#endif // !defined(AFX_DPLANE_H__FC37C021_F0A1_11D4_ACF7_004095A18133__INCLUDED_)

View File

@ -21,12 +21,7 @@
// //
////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////
#if !defined( AFX_DPOINT_H__FC37C022_F0A1_11D4_ACF7_004095A18133__INCLUDED_ )
#define AFX_DPOINT_H__FC37C022_F0A1_11D4_ACF7_004095A18133__INCLUDED_
#if _MSC_VER > 1000
#pragma once #pragma once
#endif // _MSC_VER > 1000
#include "mathlib.h" #include "mathlib.h"
@ -43,5 +38,3 @@ public:
}; };
//typedef CList<DPoint*, DPoint*> DPointList; //typedef CList<DPoint*, DPoint*> DPointList;
#endif // !defined(AFX_DPOINT_H__FC37C022_F0A1_11D4_ACF7_004095A18133__INCLUDED_)

View File

@ -21,12 +21,7 @@
// //
////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////
#if !defined( AFX_DSHAPE_H__0B30B302_9D21_4C2D_836A_61F3C8D4244D__INCLUDED_ )
#define AFX_DSHAPE_H__0B30B302_9D21_4C2D_836A_61F3C8D4244D__INCLUDED_
#if _MSC_VER > 1000
#pragma once #pragma once
#endif // _MSC_VER > 1000
#include <stdlib.h> #include <stdlib.h>
#include "mathlib.h" #include "mathlib.h"
@ -59,5 +54,3 @@ private:
DMap m_Container; DMap m_Container;
}; };
#endif // !defined(AFX_DSHAPE_H__0B30B302_9D21_4C2D_836A_61F3C8D4244D__INCLUDED_)

View File

@ -21,13 +21,7 @@
// //
////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////
#if !defined( AFX_TRAINDRAWER_H__6E36062A_EF0B_11D4_ACF7_004095A18133__INCLUDED_ )
#define AFX_TRAINDRAWER_H__6E36062A_EF0B_11D4_ACF7_004095A18133__INCLUDED_
#if _MSC_VER > 1000
#pragma once #pragma once
#endif // _MSC_VER > 1000
#include <list> #include <list>
#include "mathlib.h" #include "mathlib.h"
@ -84,5 +78,3 @@ public:
splinePoint_t* AddSplinePoint( const char* name, const char* target, vec_t* origin ); splinePoint_t* AddSplinePoint( const char* name, const char* target, vec_t* origin );
controlPoint_t* FindControlPoint( const char* name ); controlPoint_t* FindControlPoint( const char* name );
}; };
#endif // !defined(AFX_TRAINDRAWER_H__6E36062A_EF0B_11D4_ACF7_004095A18133__INCLUDED_)

View File

@ -17,8 +17,7 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/ */
#ifndef __DTREE_H__ #pragma once
#define __DTREE_H__
#include "qerplugin.h" #include "qerplugin.h"
#include "signal/isignal.h" #include "signal/isignal.h"
@ -224,5 +223,3 @@ private:
bool m_setAngles; bool m_setAngles;
bool m_autoLink; bool m_autoLink;
}; };
#endif

View File

@ -21,13 +21,7 @@
// //
////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////
#if !defined( AFX_VISDRAWER_H__6E36062A_EF0B_11D4_ACF7_004095A18133__INCLUDED_ )
#define AFX_VISDRAWER_H__6E36062A_EF0B_11D4_ACF7_004095A18133__INCLUDED_
#if _MSC_VER > 1000
#pragma once #pragma once
#endif // _MSC_VER > 1000
#include <list> #include <list>
#include "renderable.h" #include "renderable.h"
@ -78,5 +72,3 @@ public:
void destroyShaders(); void destroyShaders();
}; };
#endif // !defined(AFX_VISDRAWER_H__6E36062A_EF0B_11D4_ACF7_004095A18133__INCLUDED_)

View File

@ -21,12 +21,7 @@
// //
////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////
#if !defined( AFX_DWINDING_H__35B2C524_F0A7_11D4_ACF7_004095A18133__INCLUDED_ )
#define AFX_DWINDING_H__35B2C524_F0A7_11D4_ACF7_004095A18133__INCLUDED_
#if _MSC_VER > 1000
#pragma once #pragma once
#endif // _MSC_VER > 1000
#include "mathlib.h" #include "mathlib.h"
@ -66,5 +61,3 @@ public:
#define MAX_POINTS_ON_WINDING 64 #define MAX_POINTS_ON_WINDING 64
#define ON_EPSILON 0.01 #define ON_EPSILON 0.01
#endif // !defined(AFX_DWINDING_H__35B2C524_F0A7_11D4_ACF7_004095A18133__INCLUDED_)

View File

@ -18,8 +18,7 @@
*/ */
#ifndef _SCRIPTPARSER_H_ #pragma once
#define _SCRIPTPARSER_H_
//#include "interfaces/IScriptParser.h" //#include "interfaces/IScriptParser.h"
@ -57,5 +56,3 @@ public:
void AddBreakChar( char c ); void AddBreakChar( char c );
private: private:
}; };
#endif

View File

@ -17,9 +17,4 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/ */
#ifndef __STDAFX_BOBTOOLZ__ #pragma once
#define __STDAFX_BOBTOOLZ__
#endif

View File

@ -1,7 +1,4 @@
#if !defined(INCLUDED_BOBTOOLZGTK_H) #pragma once
#define INCLUDED_BOBTOOLZGTK_H
extern GtkWidget *g_pRadiantWnd; extern GtkWidget *g_pRadiantWnd;
#endif

View File

@ -20,12 +20,7 @@
// plugin.h : main header file for the PLUGIN DLL // plugin.h : main header file for the PLUGIN DLL
// //
#if !defined( AFX_PLUGIN_H__3BA55F6A_1D27_11D3_BC7B_F7EFD9765E37__INCLUDED_ )
#define AFX_PLUGIN_H__3BA55F6A_1D27_11D3_BC7B_F7EFD9765E37__INCLUDED_
#if _MSC_VER >= 1000
#pragma once #pragma once
#endif // _MSC_VER >= 1000
#ifndef __AFXWIN_H__ #ifndef __AFXWIN_H__
#error include 'StdAfx.h' before including this file for PCH #error include 'StdAfx.h' before including this file for PCH
@ -60,5 +55,3 @@ public:
//{{AFX_INSERT_LOCATION}} //{{AFX_INSERT_LOCATION}}
// Microsoft Developer Studio will insert additional declarations immediately before the previous line. // Microsoft Developer Studio will insert additional declarations immediately before the previous line.
#endif // !defined(AFX_PLUGIN_H__3BA55F6A_1D27_11D3_BC7B_F7EFD9765E37__INCLUDED_)

View File

@ -1,4 +1,6 @@
#pragma once
#include "mathlib.h" #include "mathlib.h"
#define LUMP_ENTITIES 0 #define LUMP_ENTITIES 0

View File

@ -17,6 +17,8 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/ */
#pragma once
class DBobView; class DBobView;
class DVisDrawer; class DVisDrawer;
class DTrainDrawer; class DTrainDrawer;

View File

@ -17,6 +17,8 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/ */
#pragma once
#include <list> #include <list>
#include "str.h" #include "str.h"
typedef struct _GtkListStore GtkListStore; typedef struct _GtkListStore GtkListStore;

View File

@ -17,8 +17,7 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/ */
#if !defined( INCLUDED_MISC_H ) #pragma once
#define INCLUDED_MISC_H
#include "mathlib.h" #include "mathlib.h"
#include <list> #include <list>
@ -53,5 +52,3 @@ float Determinant3x3( float a1, float a2, float a3,
bool GetEntityCentre( const char* entity, vec3_t centre ); bool GetEntityCentre( const char* entity, vec3_t centre );
void MakeNormal( const vec_t* va, const vec_t* vb, const vec_t* vc, vec_t* out ); void MakeNormal( const vec_t* va, const vec_t* vb, const vec_t* vc, vec_t* out );
#endif

View File

@ -17,6 +17,8 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/ */
#pragma once
// TODO: implement all this stuff via DBrush class. started with DShape // TODO: implement all this stuff via DBrush class. started with DShape
// TODO: Auto Face Scaling, no need to pass parms, calculated via brush. // TODO: Auto Face Scaling, no need to pass parms, calculated via brush.

View File

@ -1,4 +1,6 @@
#pragma once
#include <list> #include <list>
#include "mathlib.h" #include "mathlib.h"

View File

@ -1,3 +1,6 @@
#pragma once
typedef struct _GtkWidget GtkWidget; typedef struct _GtkWidget GtkWidget;
typedef struct _GtkButton GtkButton; typedef struct _GtkButton GtkButton;

View File

@ -1,5 +1,6 @@
#ifndef EXPORT_H
#define EXPORT_H #pragma once
#include <set> #include <set>
#include <string> #include <string>
@ -13,5 +14,3 @@ enum collapsemode
typedef std::set<std::string, bool (*)( const std::string&, const std::string& )> StringSetWithLambda; typedef std::set<std::string, bool (*)( const std::string&, const std::string& )> StringSetWithLambda;
bool ExportSelection( const StringSetWithLambda& ignorelist, collapsemode m, bool exmat, const std::string& path, bool limitMatNames, bool objects, bool weld ); bool ExportSelection( const StringSetWithLambda& ignorelist, collapsemode m, bool exmat, const std::string& path, bool limitMatNames, bool objects, bool weld );
#endif

View File

@ -19,10 +19,7 @@
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#if !defined( INCLUDED_BRUSH_EXPORT_H ) #pragma once
#define INCLUDED_BRUSH_EXPORT_H
typedef struct _GtkWidget GtkWidget; typedef struct _GtkWidget GtkWidget;
extern GtkWidget *g_pRadiantWnd; extern GtkWidget *g_pRadiantWnd;
#endif

View File

@ -2,6 +2,8 @@
* DO NOT EDIT THIS FILE - it is generated by Glade. * DO NOT EDIT THIS FILE - it is generated by Glade.
*/ */
#pragma once
#ifdef HAVE_CONFIG_H #ifdef HAVE_CONFIG_H
# include <config.h> # include <config.h>
#endif #endif

View File

@ -19,8 +19,7 @@
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#ifndef _PLUGIN_H_ #pragma once
#define _PLUGIN_H_
#include "mathlib.h" #include "mathlib.h"
#include <string.h> #include <string.h>
@ -54,5 +53,3 @@ public:
CSynapseClientHydraToolz() { } CSynapseClientHydraToolz() { }
virtual ~CSynapseClientHydraToolz() { } virtual ~CSynapseClientHydraToolz() { }
}; };
#endif // _PLUGIN_H_

View File

@ -17,9 +17,6 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/ */
#if !defined( INCLUDED_ABOUTDIALOG_H ) #pragma once
#define INCLUDED_ABOUTDIALOG_H
void DoAboutDlg(); void DoAboutDlg();
#endif

View File

@ -17,9 +17,6 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/ */
#if !defined( INCLUDED_CONFIGDIALOG_H ) #pragma once
#define INCLUDED_CONFIGDIALOG_H
void DoConfigDialog(); void DoConfigDialog();
#endif

View File

@ -17,9 +17,6 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/ */
#if !defined( INCLUDED_LOADPORTALFILEDIALOG_H ) #pragma once
#define INCLUDED_LOADPORTALFILEDIALOG_H
int DoLoadPortalFileDialog(); int DoLoadPortalFileDialog();
#endif

View File

@ -17,8 +17,7 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/ */
#ifndef _PORTALS_H_ #pragma once
#define _PORTALS_H_
#include <glib.h> #include <glib.h>
#include "irender.h" #include "irender.h"
@ -157,6 +156,3 @@ void Portals_constructShaders();
void Portals_destroyShaders(); void Portals_destroyShaders();
void Portals_shadersChanged(); void Portals_shadersChanged();
#endif // _PORTALS_H_

View File

@ -17,8 +17,7 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/ */
#if !defined( INCLUDED_PRTVIEW_H ) #pragma once
#define INCLUDED_PRTVIEW_H
#define MSG_PREFIX "Portal Viewer plugin: " #define MSG_PREFIX "Portal Viewer plugin: "
@ -33,6 +32,3 @@ extern GtkWidget *g_pRadiantWnd;
#define IDOK 1 #define IDOK 1
#define IDCANCEL 2 #define IDCANCEL 2
#endif

View File

@ -19,9 +19,6 @@
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#if !defined( INCLUDED_SHADERPLUG_H ) #pragma once
#define INCLUDED_SHADERPLUG_H
#include "xml/xmltextags.h" #include "xml/xmltextags.h"
#endif

View File

@ -18,8 +18,4 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/ */
#ifndef _PLUGIN_SUNPLUG_ #pragma once
#define _PLUGIN_SUNPLUG_
#endif // _PLUGIN_SUNPLUG_

View File

@ -16,7 +16,4 @@
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#if !defined( INCLUDED_UFOAI_H ) #pragma once
#define INCLUDED_UFOAI_H
#endif

View File

@ -16,8 +16,7 @@
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#if !defined( INCLUDED_FILTERS_H ) #pragma once
#define INCLUDED_FILTERS_H
void filter_level( int flag ); void filter_level( int flag );
void filter_stepon( void ); void filter_stepon( void );
@ -38,5 +37,3 @@ void filter_nodraw( void );
#define CONTENTS_ACTORCLIP 0x10000 #define CONTENTS_ACTORCLIP 0x10000
#define CONTENTS_WEAPONCLIP 0x2000000 #define CONTENTS_WEAPONCLIP 0x2000000
#define CONTENTS_STEPON 0x40000000 #define CONTENTS_STEPON 0x40000000
#endif

View File

@ -16,8 +16,7 @@
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#if !defined( INCLUDED_UFOAI_GTK_H ) #pragma once
#define INCLUDED_UFOAI_GTK_H
#include "itoolbar.h" #include "itoolbar.h"
#include <gtk/gtk.h> #include <gtk/gtk.h>
@ -26,5 +25,3 @@ const IToolbarButton* GetToolbarButton( std::size_t index );
const IToolbarButton* GetToolbarNoButton( std::size_t index ); const IToolbarButton* GetToolbarNoButton( std::size_t index );
std::size_t ToolbarButtonCount( void ); std::size_t ToolbarButtonCount( void );
std::size_t ToolbarNoButtons( void ); std::size_t ToolbarNoButtons( void );
#endif

View File

@ -16,11 +16,8 @@
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#if !defined( INCLUDED_UFOAI_LEVEL_H ) #pragma once
#define INCLUDED_UFOAI_LEVEL_H
void assign_default_values_to_worldspawn( bool override, const char **returnMsg ); void assign_default_values_to_worldspawn( bool override, const char **returnMsg );
void check_map_values( const char **returnMsg ); void check_map_values( const char **returnMsg );
void get_team_count( const char *classname, int *count, int *team ); void get_team_count( const char *classname, int *count, int *team );
#endif

View File

@ -19,8 +19,7 @@
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#if !defined( INCLUDED_CULLABLE_H ) #pragma once
#define INCLUDED_CULLABLE_H
#include "generic/constant.h" #include "generic/constant.h"
@ -71,6 +70,3 @@ public:
virtual VolumeIntersectionValue intersectVolume( const VolumeTest& test, const Matrix4& localToWorld ) const = 0; virtual VolumeIntersectionValue intersectVolume( const VolumeTest& test, const Matrix4& localToWorld ) const = 0;
}; };
#endif

View File

@ -19,8 +19,7 @@
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#if !defined( INCLUDED_EDITABLE_H ) #pragma once
#define INCLUDED_EDITABLE_H
class Matrix4; class Matrix4;
@ -49,5 +48,3 @@ public:
inline Snappable* Node_getSnappable( scene::Node& node ){ inline Snappable* Node_getSnappable( scene::Node& node ){
return NodeTypeCast<Snappable>::cast( node ); return NodeTypeCast<Snappable>::cast( node );
} }
#endif

View File

@ -19,8 +19,7 @@
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#if !defined( INCLUDED_IARCHIVE_H ) #pragma once
#define INCLUDED_IARCHIVE_H
#include <cstddef> #include <cstddef>
#include "generic/constant.h" #include "generic/constant.h"
@ -156,5 +155,3 @@ typedef Modules<_QERArchiveTable> ArchiveModules;
template<typename Type> template<typename Type>
class ModulesRef; class ModulesRef;
typedef ModulesRef<_QERArchiveTable> ArchiveModulesRef; typedef ModulesRef<_QERArchiveTable> ArchiveModulesRef;
#endif

View File

@ -19,8 +19,7 @@
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#if !defined( INCLUDED_IBRUSH_H ) #pragma once
#define INCLUDED_IBRUSH_H
#include "generic/constant.h" #include "generic/constant.h"
#include "generic/callback.h" #include "generic/callback.h"
@ -137,5 +136,3 @@ typedef GlobalModuleRef<BrushCreator> GlobalBrushModuleRef;
inline BrushCreator& GlobalBrushCreator(){ inline BrushCreator& GlobalBrushCreator(){
return GlobalBrushModule::getTable(); return GlobalBrushModule::getTable();
} }
#endif

View File

@ -25,8 +25,7 @@
// camera interface // camera interface
// //
#if !defined( INCLUDED_ICAMERA_H ) #pragma once
#define INCLUDED_ICAMERA_H
#include "generic/constant.h" #include "generic/constant.h"
#include "generic/callbackfwd.h" #include "generic/callbackfwd.h"
@ -63,5 +62,3 @@ struct _QERCameraTable
PFN_SETCAMERA m_pfnSetCamera; PFN_SETCAMERA m_pfnSetCamera;
PFN_GETCAMWINDOWEXTENTS m_pfnGetCamWindowExtents; PFN_GETCAMWINDOWEXTENTS m_pfnGetCamWindowExtents;
}; };
#endif

View File

@ -19,8 +19,7 @@
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#if !defined( INCLUDED_IDATASTREAM_H ) #pragma once
#define INCLUDED_IDATASTREAM_H
#include <cstddef> #include <cstddef>
@ -79,5 +78,3 @@ class SeekableInputStream : public InputStream, public SeekableStream
class SeekableOutputStream : public OutputStream, public SeekableStream class SeekableOutputStream : public OutputStream, public SeekableStream
{ {
}; };
#endif

View File

@ -23,8 +23,7 @@
/// \brief Entity Class definition loader API. /// \brief Entity Class definition loader API.
#if !defined( INCLUDED_IECLASS_H ) #pragma once
#define INCLUDED_IECLASS_H
#include "generic/constant.h" #include "generic/constant.h"
@ -112,5 +111,3 @@ typedef GlobalModuleRef<EntityClassManager> GlobalEntityClassManagerModuleRef;
inline EntityClassManager& GlobalEntityClassManager(){ inline EntityClassManager& GlobalEntityClassManager(){
return GlobalEntityClassManagerModule::getTable(); return GlobalEntityClassManagerModule::getTable();
} }
#endif

View File

@ -19,8 +19,7 @@
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#if !defined( INCLUDED_IENTITY_H ) #pragma once
#define INCLUDED_IENTITY_H
#include "generic/constant.h" #include "generic/constant.h"
@ -157,5 +156,3 @@ typedef GlobalModuleRef<EntityCreator> GlobalEntityModuleRef;
inline EntityCreator& GlobalEntityCreator(){ inline EntityCreator& GlobalEntityCreator(){
return GlobalEntityModule::getTable(); return GlobalEntityModule::getTable();
} }
#endif

View File

@ -19,8 +19,7 @@
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#if !defined( INCLUDED_IFILESYSTEM_H ) #pragma once
#define INCLUDED_IFILESYSTEM_H
#include <cstddef> #include <cstddef>
#include "generic/constant.h" #include "generic/constant.h"
@ -114,5 +113,3 @@ inline int vfsLoadFile( const char* filename, void** buffer, int index = 0 ){
inline void vfsFreeFile( void* p ){ inline void vfsFreeFile( void* p ){
GlobalFileSystem().freeFile( p ); GlobalFileSystem().freeFile( p );
} }
#endif

View File

@ -19,8 +19,7 @@
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#if !defined( INCLUDED_IFILETYPES_H ) #pragma once
#define INCLUDED_IFILETYPES_H
#include "generic/constant.h" #include "generic/constant.h"
@ -70,7 +69,3 @@ typedef GlobalModuleRef<IFileTypeRegistry> GlobalFiletypesModuleRef;
inline IFileTypeRegistry& GlobalFiletypes(){ inline IFileTypeRegistry& GlobalFiletypes(){
return GlobalFiletypesModule::getTable(); return GlobalFiletypesModule::getTable();
} }
#endif

View File

@ -19,8 +19,7 @@
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#if !defined( INCLUDED_IFILTER_H ) #pragma once
#define INCLUDED_IFILTER_H
#include "generic/constant.h" #include "generic/constant.h"
@ -86,5 +85,3 @@ typedef GlobalModuleRef<FilterSystem> GlobalFilterModuleRef;
inline FilterSystem& GlobalFilterSystem(){ inline FilterSystem& GlobalFilterSystem(){
return GlobalFilterModule::getTable(); return GlobalFilterModule::getTable();
} }
#endif

View File

@ -19,8 +19,7 @@
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#if !defined( INCLUDED_IGL_H ) #pragma once
#define INCLUDED_IGL_H
#include <cstddef> #include <cstddef>
#include <string.h> #include <string.h>
@ -2945,6 +2944,3 @@ inline OpenGLBinding& GlobalOpenGL(){
#else #else
#define GlobalOpenGL_debugAssertNoErrors() #define GlobalOpenGL_debugAssertNoErrors()
#endif #endif
#endif

View File

@ -19,8 +19,7 @@
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#if !defined( INCLUDED_IGLRENDER_H ) #pragma once
#define INCLUDED_IGLRENDER_H
#include "igl.h" #include "igl.h"
#include "generic/vector.h" #include "generic/vector.h"
@ -124,5 +123,3 @@ typedef GlobalModuleRef<OpenGLStateLibrary> GlobalOpenGLStateLibraryModuleRef;
inline OpenGLStateLibrary& GlobalOpenGLStateLibrary(){ inline OpenGLStateLibrary& GlobalOpenGLStateLibrary(){
return GlobalOpenGLStateLibraryModule::getTable(); return GlobalOpenGLStateLibraryModule::getTable();
} }
#endif

View File

@ -19,8 +19,7 @@
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#if !defined( INCLUDED_IGTKGL_H ) #pragma once
#define INCLUDED_IGTKGL_H
#include "generic/constant.h" #include "generic/constant.h"
@ -39,5 +38,3 @@ struct _QERGtkGLTable
void ( *glwidget_destroy_context )( GtkWidget* widget ); void ( *glwidget_destroy_context )( GtkWidget* widget );
void ( *glwidget_create_context )( GtkWidget* widget ); void ( *glwidget_create_context )( GtkWidget* widget );
}; };
#endif

View File

@ -19,8 +19,7 @@
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#if !defined( INCLUDED_IIMAGE_H ) #pragma once
#define INCLUDED_IIMAGE_H
#include "generic/constant.h" #include "generic/constant.h"
@ -68,5 +67,3 @@ typedef Modules<_QERPlugImageTable> ImageModules;
template<typename Type> template<typename Type>
class ModulesRef; class ModulesRef;
typedef ModulesRef<_QERPlugImageTable> ImageModulesRef; typedef ModulesRef<_QERPlugImageTable> ImageModulesRef;
#endif // _IIMAGE_H

View File

@ -19,8 +19,7 @@
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#if !defined( INCLUDED_IMAP_H ) #pragma once
#define INCLUDED_IMAP_H
#include "generic/constant.h" #include "generic/constant.h"
@ -76,6 +75,3 @@ typedef Modules<MapFormat> MapModules;
template<typename Type> template<typename Type>
class ModulesRef; class ModulesRef;
typedef ModulesRef<MapFormat> MapModulesRef; typedef ModulesRef<MapFormat> MapModulesRef;
#endif

View File

@ -19,8 +19,7 @@
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#if !defined( INCLUDED_IMODEL_H ) #pragma once
#define INCLUDED_IMODEL_H
#include "generic/constant.h" #include "generic/constant.h"
@ -46,5 +45,3 @@ typedef Modules<ModelLoader> ModelModules;
template<typename Type> template<typename Type>
class ModulesRef; class ModulesRef;
typedef ModulesRef<ModelLoader> ModelModulesRef; typedef ModulesRef<ModelLoader> ModelModulesRef;
#endif /* _IMODEL_H_ */

View File

@ -19,8 +19,7 @@
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#if !defined( INCLUDED_IPATCH_H ) #pragma once
#define INCLUDED_IPATCH_H
#include "generic/constant.h" #include "generic/constant.h"
#include "generic/vector.h" #include "generic/vector.h"
@ -250,5 +249,3 @@ typedef GlobalModuleRef<PatchCreator> GlobalPatchModuleRef;
inline PatchCreator& GlobalPatchCreator(){ inline PatchCreator& GlobalPatchCreator(){
return GlobalPatchModule::getTable(); return GlobalPatchModule::getTable();
} }
#endif

View File

@ -19,8 +19,7 @@
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#if !defined( INCLUDED_IPLUGIN_H ) #pragma once
#define INCLUDED_IPLUGIN_H
#include "generic/constant.h" #include "generic/constant.h"
@ -49,5 +48,3 @@ typedef Modules<_QERPluginTable> PluginModules;
template<typename Type> template<typename Type>
class ModulesRef; class ModulesRef;
typedef ModulesRef<_QERPluginTable> PluginModulesRef; typedef ModulesRef<_QERPluginTable> PluginModulesRef;
#endif

View File

@ -19,8 +19,7 @@
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#if !defined( INCLUDED_IREFERENCE_H ) #pragma once
#define INCLUDED_IREFERENCE_H
#include "generic/constant.h" #include "generic/constant.h"
@ -73,5 +72,3 @@ typedef GlobalModuleRef<ReferenceCache> GlobalReferenceModuleRef;
inline ReferenceCache& GlobalReferenceCache(){ inline ReferenceCache& GlobalReferenceCache(){
return GlobalReferenceModule::getTable(); return GlobalReferenceModule::getTable();
} }
#endif

View File

@ -19,8 +19,7 @@
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#if !defined( INCLUDED_IRENDER_H ) #pragma once
#define INCLUDED_IRENDER_H
#include "generic/constant.h" #include "generic/constant.h"
#include "generic/callbackfwd.h" #include "generic/callbackfwd.h"
@ -167,5 +166,3 @@ typedef GlobalModuleRef<ShaderCache> GlobalShaderCacheModuleRef;
inline ShaderCache& GlobalShaderCache(){ inline ShaderCache& GlobalShaderCache(){
return GlobalShaderCacheModule::getTable(); return GlobalShaderCacheModule::getTable();
} }
#endif

View File

@ -19,8 +19,7 @@
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#if !defined ( INCLUDED_ISCENEGRAPH_H ) #pragma once
#define INCLUDED_ISCENEGRAPH_H
#include <cstddef> #include <cstddef>
#include "generic/constant.h" #include "generic/constant.h"
@ -208,7 +207,3 @@ inline void AddSceneChangeCallback( const SignalHandler& handler ){
inline void SceneChangeNotify(){ inline void SceneChangeNotify(){
GlobalSceneGraph().sceneChanged(); GlobalSceneGraph().sceneChanged();
} }
#endif

View File

@ -19,8 +19,7 @@
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#if !defined( INCLUDED_ISCRIPLIB_H ) #pragma once
#define INCLUDED_ISCRIPLIB_H
/// \file iscriplib.h /// \file iscriplib.h
/// \brief Token input/output stream module. /// \brief Token input/output stream module.
@ -81,5 +80,3 @@ typedef GlobalModuleRef<_QERScripLibTable> GlobalScripLibModuleRef;
inline _QERScripLibTable& GlobalScriptLibrary(){ inline _QERScripLibTable& GlobalScriptLibrary(){
return GlobalScripLibModule::getTable(); return GlobalScripLibModule::getTable();
} }
#endif

View File

@ -19,8 +19,7 @@
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#if !defined( INCLUDED_ISELECTION_H ) #pragma once
#define INCLUDED_ISELECTION_H
#include <cstddef> #include <cstddef>
#include "generic/constant.h" #include "generic/constant.h"
@ -149,6 +148,3 @@ typedef GlobalModuleRef<SelectionSystem> GlobalSelectionModuleRef;
inline SelectionSystem& GlobalSelectionSystem(){ inline SelectionSystem& GlobalSelectionSystem(){
return GlobalSelectionModule::getTable(); return GlobalSelectionModule::getTable();
} }
#endif

View File

@ -19,8 +19,7 @@
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#if !defined( INCLUDED_ISHADERS_H ) #pragma once
#define INCLUDED_ISHADERS_H
#include "generic/constant.h" #include "generic/constant.h"
#include "generic/callbackfwd.h" #include "generic/callbackfwd.h"
@ -183,5 +182,3 @@ inline ShaderSystem& GlobalShaderSystem(){
#define QERApp_ActiveShaders_IteratorAtEnd GlobalShaderSystem().endActiveShadersIterator #define QERApp_ActiveShaders_IteratorAtEnd GlobalShaderSystem().endActiveShadersIterator
#define QERApp_ActiveShaders_IteratorCurrent GlobalShaderSystem().dereferenceActiveShadersIterator #define QERApp_ActiveShaders_IteratorCurrent GlobalShaderSystem().dereferenceActiveShadersIterator
#define QERApp_ActiveShaders_IteratorIncrement GlobalShaderSystem().incrementActiveShadersIterator #define QERApp_ActiveShaders_IteratorIncrement GlobalShaderSystem().incrementActiveShadersIterator
#endif

View File

@ -19,8 +19,7 @@
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#if !defined ( INCLUDED_ITEXDEF_H ) #pragma once
#define INCLUDED_ITEXDEF_H
class texdef_t class texdef_t
{ {
@ -37,5 +36,3 @@ public:
scale[1] = 1; scale[1] = 1;
} }
}; };
#endif

View File

@ -19,8 +19,7 @@
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#if !defined( INCLUDED_ITEXTSTREAM_H ) #pragma once
#define INCLUDED_ITEXTSTREAM_H
/// \file /// \file
/// \brief Text-stream interfaces. /// \brief Text-stream interfaces.
@ -111,5 +110,3 @@ typedef Static<ErrorStreamHolder> GlobalErrorStream;
inline TextOutputStream& globalErrorStream(){ inline TextOutputStream& globalErrorStream(){
return GlobalErrorStream::instance().getOutputStream(); return GlobalErrorStream::instance().getOutputStream();
} }
#endif

View File

@ -19,8 +19,7 @@
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#if !defined( INCLUDED_ITEXTURES_H ) #pragma once
#define INCLUDED_ITEXTURES_H
#include "iimage.h" #include "iimage.h"
#include "generic/constant.h" #include "generic/constant.h"
@ -83,5 +82,3 @@ typedef GlobalModuleRef<TexturesCache> GlobalTexturesModuleRef;
inline TexturesCache& GlobalTexturesCache(){ inline TexturesCache& GlobalTexturesCache(){
return GlobalTexturesModule::getTable(); return GlobalTexturesModule::getTable();
} }
#endif

View File

@ -19,8 +19,7 @@
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#if !defined( INCLUDED_IPLUGTOOLBAR_H ) #pragma once
#define INCLUDED_IPLUGTOOLBAR_H
#include <cstddef> #include <cstddef>
#include "generic/constant.h" #include "generic/constant.h"
@ -62,5 +61,3 @@ typedef Modules<_QERPlugToolbarTable> ToolbarModules;
template<typename Type> template<typename Type>
class ModulesRef; class ModulesRef;
typedef ModulesRef<_QERPlugToolbarTable> ToolbarModulesRef; typedef ModulesRef<_QERPlugToolbarTable> ToolbarModulesRef;
#endif

View File

@ -19,8 +19,7 @@
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#if !defined( INCLUDED_IUNDO_H ) #pragma once
#define INCLUDED_IUNDO_H
/// \file /// \file
/// \brief The undo-system interface. Uses the 'memento' pattern. /// \brief The undo-system interface. Uses the 'memento' pattern.
@ -113,6 +112,3 @@ public:
GlobalUndoSystem().finish( m_command ); GlobalUndoSystem().finish( m_command );
} }
}; };
#endif

View File

@ -19,8 +19,7 @@
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#if !defined( INCLUDED_MAPFILE_H ) #pragma once
#define INCLUDED_MAPFILE_H
#include <limits> #include <limits>
@ -66,7 +65,3 @@ inline MapFile* path_find_mapfile( Iterator first, Iterator last ){
ERROR_MESSAGE( "failed to find parent mapfile for path" ); ERROR_MESSAGE( "failed to find parent mapfile for path" );
return 0; return 0;
} }
#endif

View File

@ -19,8 +19,7 @@
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#if !defined( INCLUDED_MODELSKIN_H ) #pragma once
#define INCLUDED_MODELSKIN_H
#include "generic/constant.h" #include "generic/constant.h"
#include "generic/callbackfwd.h" #include "generic/callbackfwd.h"
@ -86,5 +85,3 @@ typedef GlobalModuleRef<ModelSkinCache> GlobalModelSkinCacheModuleRef;
inline ModelSkinCache& GlobalModelSkinCache(){ inline ModelSkinCache& GlobalModelSkinCache(){
return GlobalModelSkinCacheModule::getTable(); return GlobalModelSkinCacheModule::getTable();
} }
#endif

View File

@ -19,8 +19,7 @@
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#if !defined( INCLUDED_MODULEOBSERVER_H ) #pragma once
#define INCLUDED_MODULEOBSERVER_H
class ModuleObserver class ModuleObserver
{ {
@ -28,5 +27,3 @@ public:
virtual void unrealise() = 0; virtual void unrealise() = 0;
virtual void realise() = 0; virtual void realise() = 0;
}; };
#endif

View File

@ -19,8 +19,7 @@
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#if !defined( INCLUDED_MODULESYSTEM_H ) #pragma once
#define INCLUDED_MODULESYSTEM_H
#include "generic/static.h" #include "generic/static.h"
#include "debugging/debugging.h" #include "debugging/debugging.h"
@ -233,5 +232,3 @@ public:
return GlobalModule<Type>::getTable(); return GlobalModule<Type>::getTable();
} }
}; };
#endif

View File

@ -19,8 +19,7 @@
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#if !defined( INCLUDED_NAMEABLE_H ) #pragma once
#define INCLUDED_NAMEABLE_H
#include "generic/constant.h" #include "generic/constant.h"
#include "generic/callbackfwd.h" #include "generic/callbackfwd.h"
@ -36,6 +35,3 @@ public:
virtual void attach( const NameCallback& callback ) = 0; virtual void attach( const NameCallback& callback ) = 0;
virtual void detach( const NameCallback& callback ) = 0; virtual void detach( const NameCallback& callback ) = 0;
}; };
#endif

View File

@ -19,8 +19,7 @@
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#if !defined( INCLUDED_NAMESPACE_H ) #pragma once
#define INCLUDED_NAMESPACE_H
#include "generic/constant.h" #include "generic/constant.h"
#include "generic/callbackfwd.h" #include "generic/callbackfwd.h"
@ -59,4 +58,3 @@ typedef GlobalModuleRef<Namespace> GlobalNamespaceModuleRef;
inline Namespace& GlobalNamespace(){ inline Namespace& GlobalNamespace(){
return GlobalNamespaceModule::getTable(); return GlobalNamespaceModule::getTable();
} }
#endif

View File

@ -19,8 +19,7 @@
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#if !defined( INCLUDED_PREFERENCESYSTEM_H ) #pragma once
#define INCLUDED_PREFERENCESYSTEM_H
#include "generic/constant.h" #include "generic/constant.h"
#include "generic/callbackfwd.h" #include "generic/callbackfwd.h"
@ -50,6 +49,3 @@ typedef GlobalModuleRef<PreferenceSystem> GlobalPreferenceSystemModuleRef;
inline PreferenceSystem& GlobalPreferenceSystem(){ inline PreferenceSystem& GlobalPreferenceSystem(){
return GlobalPreferenceSystemModule::getTable(); return GlobalPreferenceSystemModule::getTable();
} }
#endif

View File

@ -23,8 +23,7 @@
// //
// //
#ifndef __QERPLUGIN_H__ #pragma once
#define __QERPLUGIN_H__
#include "generic/constant.h" #include "generic/constant.h"
@ -179,5 +178,3 @@ typedef GlobalModuleRef<_QERFuncTable_1> GlobalRadiantModuleRef;
inline _QERFuncTable_1& GlobalRadiant(){ inline _QERFuncTable_1& GlobalRadiant(){
return GlobalRadiantModule::getTable(); return GlobalRadiantModule::getTable();
} }
#endif

View File

@ -19,8 +19,7 @@
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#if !defined( INCLUDED_RENDERABLE_H ) #pragma once
#define INCLUDED_RENDERABLE_H
#include "generic/constant.h" #include "generic/constant.h"
@ -71,5 +70,3 @@ public:
virtual void viewChanged() const { virtual void viewChanged() const {
} }
}; };
#endif

View File

@ -19,8 +19,7 @@
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#if !defined( INCLUDED_SELECTABLE_H ) #pragma once
#define INCLUDED_SELECTABLE_H
#include <cstddef> #include <cstddef>
@ -305,7 +304,3 @@ public:
virtual void selectByPlane( const Plane3& plane ) = 0; virtual void selectByPlane( const Plane3& plane ) = 0;
virtual void gatherPolygonsByPlane( const Plane3& plane, std::vector<std::vector<Vector3>>& polygons ) const = 0; virtual void gatherPolygonsByPlane( const Plane3& plane, std::vector<std::vector<Vector3>>& polygons ) const = 0;
}; };
#endif

View File

@ -19,12 +19,9 @@
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#if !defined ( INCLUDED_WARNINGS_H ) #pragma once
#define INCLUDED_WARNINGS_H
#if _MSC_VER > 1000 && defined( WIN32 ) #if _MSC_VER > 1000 && defined( WIN32 )
#pragma warning(disable:4355) // 'this' : used in base member initializer list #pragma warning(disable:4355) // 'this' : used in base member initializer list
#pragma warning(disable:4503) // '[symbol]' : decorated name length exceeded, name was truncated #pragma warning(disable:4503) // '[symbol]' : decorated name length exceeded, name was truncated
#endif #endif
#endif

View File

@ -19,8 +19,7 @@
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#if !defined( INCLUDED_WINDOWOBSERVER_H ) #pragma once
#define INCLUDED_WINDOWOBSERVER_H
template<typename Enumeration> class BitFieldValue; template<typename Enumeration> class BitFieldValue;
struct ModifierEnumeration; struct ModifierEnumeration;
@ -87,5 +86,3 @@ public:
virtual void onModifierDown( ModifierFlags modifier ) = 0; virtual void onModifierDown( ModifierFlags modifier ) = 0;
virtual void onModifierUp( ModifierFlags modifier ) = 0; virtual void onModifierUp( ModifierFlags modifier ) = 0;
}; };
#endif

View File

@ -19,8 +19,7 @@
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#if !defined ( INCLUDED_ARCHIVELIB_H ) #pragma once
#define INCLUDED_ARCHIVELIB_H
#include "debugging/debugging.h" #include "debugging/debugging.h"
#include "iarchive.h" #include "iarchive.h"
@ -219,6 +218,3 @@ public:
return m_inputStream; return m_inputStream;
} }
}; };
#endif

View File

@ -19,8 +19,7 @@
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#ifndef __BYTEBOOL__ #pragma once
#define __BYTEBOOL__
// defines boolean and byte types usable in both c and c++ code // defines boolean and byte types usable in both c and c++ code
// this header is not really meant for direct inclusion, // this header is not really meant for direct inclusion,
@ -31,5 +30,3 @@
typedef bool qboolean; typedef bool qboolean;
//typedef enum { qfalse, qtrue } qboolean; //typedef enum { qfalse, qtrue } qboolean;
typedef unsigned char byte; typedef unsigned char byte;
#endif

View File

@ -19,8 +19,7 @@
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#if !defined( INCLUDED_BYTESTREAMUTILS_H ) #pragma once
#define INCLUDED_BYTESTREAMUTILS_H
#if defined( __GNUC__ ) #if defined( __GNUC__ )
@ -151,5 +150,3 @@ inline typename InputStreamType::byte_type istream_read_byte( InputStreamType& i
istream.read( &b, sizeof( typename InputStreamType::byte_type ) ); istream.read( &b, sizeof( typename InputStreamType::byte_type ) );
return b; return b;
} }
#endif

View File

@ -19,8 +19,7 @@
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#if !defined( INCLUDED_CHARACTER_H ) #pragma once
#define INCLUDED_CHARACTER_H
/// \file /// \file
/// \brief Character encoding. /// \brief Character encoding.
@ -40,5 +39,3 @@ inline bool string_is_ascii( const char* string ){
} }
return true; return true;
} }
#endif

View File

@ -23,8 +23,7 @@
// start of shared cmdlib stuff // start of shared cmdlib stuff
// //
#ifndef __CMDLIB__ #pragma once
#define __CMDLIB__
#include <time.h> #include <time.h>
@ -94,7 +93,3 @@ inline bool Q_mkdir( const char* name ){
inline double Sys_DoubleTime( void ){ inline double Sys_DoubleTime( void ){
return clock() / 1000.0; return clock() / 1000.0;
} }
#endif

View File

@ -19,8 +19,7 @@
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#if !defined( INCLUDED_CONTAINER_ARRAY_H ) #pragma once
#define INCLUDED_CONTAINER_ARRAY_H
#include <cstddef> #include <cstddef>
#include <algorithm> #include <algorithm>
@ -166,5 +165,3 @@ inline void swap( Array<Element, Allocator>& self, Array<Element, Allocator>& ot
self.swap( other ); self.swap( other );
} }
} }
#endif

View File

@ -19,8 +19,7 @@
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#if !defined( INCLUDED_CONTAINER_CACHE_H ) #pragma once
#define INCLUDED_CONTAINER_CACHE_H
#include <cstddef> #include <cstddef>
#include "container/hashtable.h" #include "container/hashtable.h"
@ -173,6 +172,3 @@ public:
m_map.clear(); m_map.clear();
} }
}; };
#endif

View File

@ -19,8 +19,7 @@
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#if !defined( INCLUDED_CONTAINER_CONTAINER_H ) #pragma once
#define INCLUDED_CONTAINER_CONTAINER_H
#include <list> #include <list>
#include <set> #include <set>
@ -366,6 +365,3 @@ public:
} }
} }
}; };
#endif

View File

@ -19,8 +19,7 @@
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#if !defined( INCLUDED_CONTAINER_HASHFUNC_H ) #pragma once
#define INCLUDED_CONTAINER_HASHFUNC_H
#include <cctype> #include <cctype>
#include "string/string.h" #include "string/string.h"
@ -398,7 +397,3 @@ struct HashKeyHasher
return key.hash(); return key.hash();
} }
}; };
#endif

View File

@ -19,8 +19,7 @@
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#if !defined( INCLUDED_CONTAINER_HASHTABLE_H ) #pragma once
#define INCLUDED_CONTAINER_HASHTABLE_H
#include <cstddef> #include <cstddef>
#include <algorithm> #include <algorithm>
@ -406,5 +405,3 @@ public:
tmp.swap( *this ); tmp.swap( *this );
} }
}; };
#endif

View File

@ -19,8 +19,7 @@
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#if !defined( INCLUDED_CONTAINER_STACK_H ) #pragma once
#define INCLUDED_CONTAINER_STACK_H
#include "memory/allocator.h" #include "memory/allocator.h"
#include <algorithm> #include <algorithm>
@ -207,5 +206,3 @@ inline void swap( Stack<Type>& self, Stack<Type>& other ){
self.swap( other ); self.swap( other );
} }
} }
#endif

View File

@ -19,8 +19,7 @@
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#if !defined( INCLUDED_CONVERT_H ) #pragma once
#define INCLUDED_CONVERT_H
/// \file /// \file
/// \brief Character encoding conversion. /// \brief Character encoding conversion.
@ -261,6 +260,3 @@ inline TextOutputStreamType& ostream_write( TextOutputStreamType& ostream, const
} }
return ostream; return ostream;
} }
#endif

View File

@ -36,11 +36,7 @@
----------------------------------------------------------------------------- */ ----------------------------------------------------------------------------- */
#pragma once
/* marker */
#ifndef DDSLIB_H
#define DDSLIB_H
/* dependencies */ /* dependencies */
@ -245,6 +241,3 @@ int DDSDecompress( ddsBuffer_t *dds, unsigned char *pixels )
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif
/* end marker */
#endif

View File

@ -19,8 +19,7 @@
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#if !defined( INCLUDED_DEBUGGING_DEBUGGING_H ) #pragma once
#define INCLUDED_DEBUGGING_DEBUGGING_H
/// \file /// \file
/// \brief Debugging macros for fatal error/assert messages. /// \brief Debugging macros for fatal error/assert messages.
@ -125,5 +124,3 @@ inline DebugMessageHandler& globalDebugMessageHandler(){
#define ASSERT_NOTNULL( ptr ) #define ASSERT_NOTNULL( ptr )
#endif #endif
#endif

View File

@ -19,8 +19,7 @@
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#if !defined( INCLUDED_DRAGPLANES_H ) #pragma once
#define INCLUDED_DRAGPLANES_H
#include "selectable.h" #include "selectable.h"
#include "cullable.h" #include "cullable.h"
@ -380,5 +379,3 @@ public:
return tra[0] * len; return tra[0] * len;
} }
}; };
#endif

View File

@ -19,8 +19,7 @@
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#if !defined ( INCLUDED_ECLASSLIB_H ) #pragma once
#define INCLUDED_ECLASSLIB_H
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
@ -339,5 +338,3 @@ inline EntityClass *EntityClass_Create_Default( const char *name, bool has_brush
return EClass_Create_FixedSize( name, Vector3( 0.0f, 0.5f, 0.0f ), smallbox[0], smallbox[1], "Not found in source." ); return EClass_Create_FixedSize( name, Vector3( 0.0f, 0.5f, 0.0f ), smallbox[0], smallbox[1], "Not found in source." );
} }
} }
#endif

View File

@ -19,8 +19,7 @@
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#if !defined ( INCLUDED_ENTITYLIB_H ) #pragma once
#define INCLUDED_ENTITYLIB_H
#include "ireference.h" #include "ireference.h"
#include "debugging/debugging.h" #include "debugging/debugging.h"
@ -709,5 +708,3 @@ inline bool aabb_fits_view( const AABB& aabb, const Matrix4& modelview, const Ma
//return ( aabb.extents[0] / viewport[0] ) > 0.25f || ( aabb.extents[1] / viewport[5] ) > 0.25f; //return ( aabb.extents[0] / viewport[0] ) > 0.25f || ( aabb.extents[1] / viewport[5] ) > 0.25f;
return ( viewport[0] + viewport[5] ) / ( transformed_bounds.extents[0] + transformed_bounds.extents[1] ) < ratio; return ( viewport[0] + viewport[5] ) / ( transformed_bounds.extents[0] + transformed_bounds.extents[1] ) < ratio;
} }
#endif

View File

@ -19,8 +19,7 @@
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#if !defined( INCLUDED_ENTITYXML_H ) #pragma once
#define INCLUDED_ENTITYXML_H
#include "ientity.h" #include "ientity.h"
#include "xml/ixml.h" #include "xml/ixml.h"
@ -92,7 +91,3 @@ public:
entity_copy( entity.getEntity(), other.getEntity() ); entity_copy( entity.getEntity(), other.getEntity() );
} }
}; };
#endif

Some files were not shown because too many files have changed in this diff Show More