From e884d7a2165fa3b7a71777b6f61a295f73c0c902 Mon Sep 17 00:00:00 2001 From: Michael Lemaire Date: Tue, 12 Jul 2016 19:40:45 +0200 Subject: [PATCH] Use pragma once instead of include guards --- src/basics/BoundingBox.h | 5 +---- src/basics/CappedCylinder.h | 5 +---- src/basics/Color.h | 5 +---- src/basics/ColorHSL.h | 5 +---- src/basics/Curve.h | 5 +---- src/basics/Disk.h | 5 +---- src/basics/FractalNoise.h | 5 +---- src/basics/Geometry.h | 5 +---- src/basics/InfiniteCylinder.h | 5 +---- src/basics/InfinitePlane.h | 5 +---- src/basics/InfiniteRay.h | 5 +---- src/basics/Interpolation.h | 5 +---- src/basics/Maths.h | 5 +---- src/basics/Matrix4.h | 5 +---- src/basics/NoiseFunctionPerlin.h | 5 +---- src/basics/NoiseFunctionSimplex.h | 5 +---- src/basics/NoiseGenerator.h | 5 +---- src/basics/NoiseState.h | 5 +---- src/basics/SpaceGridIterator.h | 5 +---- src/basics/SpaceSegment.h | 5 +---- src/basics/Sphere.h | 5 +---- src/basics/Texture2D.h | 5 +---- src/basics/Texture3D.h | 5 +---- src/basics/Texture4D.h | 5 +---- src/basics/Vector3.h | 5 +---- src/basics/basics_global.h | 5 +---- src/definition/AtmosphereDefinition.h | 5 +---- src/definition/CameraDefinition.h | 5 +---- src/definition/CelestialBodyDefinition.h | 5 +---- src/definition/CloudLayerDefinition.h | 5 +---- src/definition/CloudsDefinition.h | 5 +---- src/definition/ColorDiff.h | 5 +---- src/definition/ColorNode.h | 5 +---- src/definition/DefinitionDiff.h | 5 +---- src/definition/DefinitionNode.h | 5 +---- src/definition/DefinitionWatcher.h | 5 +---- src/definition/DiffManager.h | 5 +---- src/definition/FloatDiff.h | 5 +---- src/definition/FloatNode.h | 5 +---- src/definition/GodRaysDefinition.h | 5 +---- src/definition/IntDiff.h | 5 +---- src/definition/IntNode.h | 5 +---- src/definition/Layers.h | 5 +---- src/definition/LayersDiff.h | 5 +---- src/definition/MaterialNode.h | 5 +---- src/definition/NoiseNode.h | 5 +---- src/definition/PaintedGrid.h | 5 +---- src/definition/PaintedGridBrush.h | 5 +---- src/definition/PaintedGridData.h | 5 +---- src/definition/Scenery.h | 5 +---- src/definition/SurfaceMaterial.h | 5 +---- src/definition/TerrainDefinition.h | 5 +---- src/definition/TerrainHeightMap.h | 5 +---- src/definition/TextureLayerDefinition.h | 5 +---- src/definition/TexturesDefinition.h | 5 +---- src/definition/TimeManager.h | 5 +---- src/definition/VegetationDefinition.h | 5 +---- src/definition/VegetationInstance.h | 5 +---- src/definition/VegetationLayerDefinition.h | 5 +---- src/definition/VegetationModelDefinition.h | 5 +---- src/definition/VegetationPresenceDefinition.h | 5 +---- src/definition/WaterDefinition.h | 5 +---- src/definition/Zone.h | 5 +---- src/definition/definition_global.h | 5 +---- src/interface/modeler/AtmosphereModeler.h | 5 +---- src/interface/modeler/BaseModelerTool.h | 5 +---- src/interface/modeler/FloatPropertyBind.h | 5 +---- src/interface/modeler/IntPropertyBind.h | 4 +--- src/interface/modeler/MainModelerWindow.h | 5 +---- src/interface/modeler/ModelerCameras.h | 5 +---- src/interface/modeler/OpenGLView.h | 5 +---- src/interface/modeler/PropertyBind.h | 5 +---- src/interface/modeler/RenderPreviewProvider.h | 5 +---- src/interface/modeler/RenderProcess.h | 5 +---- src/interface/modeler/WaterModeler.h | 5 +---- src/interface/modeler/modeler_global.h | 5 +---- src/render/opengl/OpenGLFunctions.h | 5 +---- src/render/opengl/OpenGLPart.h | 5 +---- src/render/opengl/OpenGLRenderer.h | 5 +---- src/render/opengl/OpenGLShaderProgram.h | 5 +---- src/render/opengl/OpenGLSharedState.h | 5 +---- src/render/opengl/OpenGLSkybox.h | 5 +---- src/render/opengl/OpenGLTerrain.h | 5 +---- src/render/opengl/OpenGLTerrainChunk.h | 5 +---- src/render/opengl/OpenGLVariable.h | 5 +---- src/render/opengl/OpenGLVegetation.h | 5 +---- src/render/opengl/OpenGLVegetationImpostor.h | 5 +---- src/render/opengl/OpenGLVegetationInstance.h | 5 +---- src/render/opengl/OpenGLVegetationLayer.h | 5 +---- src/render/opengl/OpenGLVertexArray.h | 5 +---- src/render/opengl/OpenGLWater.h | 5 +---- src/render/opengl/opengl_global.h | 5 +---- src/render/software/AtmosphereModelBruneton.h | 5 +---- src/render/software/AtmosphereRenderer.h | 5 +---- src/render/software/AtmosphereResult.h | 5 +---- src/render/software/BaseCloudLayerRenderer.h | 5 +---- src/render/software/Canvas.h | 5 +---- src/render/software/CanvasFragment.h | 5 +---- src/render/software/CanvasLiveClient.h | 5 +---- src/render/software/CanvasPictureWriter.h | 5 +---- src/render/software/CanvasPixel.h | 5 +---- src/render/software/CanvasPixelShader.h | 5 +---- src/render/software/CanvasPortion.h | 5 +---- src/render/software/CanvasPreview.h | 5 +---- src/render/software/CloudBasicLayerRenderer.h | 5 +---- src/render/software/CloudsRenderer.h | 5 +---- src/render/software/FluidMediumInterface.h | 5 +---- src/render/software/FluidMediumManager.h | 5 +---- src/render/software/GodRaysResult.h | 5 +---- src/render/software/GodRaysSampler.h | 5 +---- src/render/software/LightComponent.h | 5 +---- src/render/software/LightFilter.h | 5 +---- src/render/software/LightSource.h | 5 +---- src/render/software/LightStatus.h | 5 +---- src/render/software/LightingManager.h | 5 +---- src/render/software/MoonRenderer.h | 5 +---- src/render/software/NightSky.h | 5 +---- src/render/software/OverlayRasterizer.h | 5 +---- src/render/software/Rasterizer.h | 5 +---- src/render/software/RayCastingManager.h | 5 +---- src/render/software/RayCastingResult.h | 5 +---- src/render/software/RenderConfig.h | 5 +---- src/render/software/RenderProgress.h | 5 +---- src/render/software/SkyRasterizer.h | 5 +---- src/render/software/SoftwareCanvasRenderer.h | 5 +---- src/render/software/SoftwareRenderer.h | 5 +---- src/render/software/TerrainRasterizer.h | 5 +---- src/render/software/TerrainRayWalker.h | 5 +---- src/render/software/TerrainRenderer.h | 5 +---- src/render/software/TexturesRenderer.h | 5 +---- src/render/software/VegetationModelRenderer.h | 5 +---- src/render/software/VegetationRasterizer.h | 5 +---- src/render/software/VegetationRenderer.h | 5 +---- src/render/software/VegetationResult.h | 5 +---- src/render/software/WaterRasterizer.h | 5 +---- src/render/software/WaterRenderer.h | 5 +---- src/render/software/clouds/BaseCloudsModel.h | 5 +---- src/render/software/clouds/CloudModelAltoCumulus.h | 5 +---- src/render/software/clouds/CloudModelCirrus.h | 5 +---- src/render/software/clouds/CloudModelCumuloNimbus.h | 5 +---- src/render/software/clouds/CloudModelStratoCumulus.h | 5 +---- src/render/software/software_global.h | 5 +---- src/system/CacheFile.h | 5 +---- src/system/DataFile.h | 5 +---- src/system/FileSystem.h | 5 +---- src/system/Logs.h | 5 +---- src/system/Memory.h | 5 +---- src/system/Mutex.h | 5 +---- src/system/PackStream.h | 5 +---- src/system/ParallelPool.h | 5 +---- src/system/ParallelWork.h | 5 +---- src/system/ParallelWorker.h | 5 +---- src/system/PictureWriter.h | 5 +---- src/system/RandomGenerator.h | 5 +---- src/system/Semaphore.h | 5 +---- src/system/System.h | 5 +---- src/system/Thread.h | 5 +---- src/system/Timing.h | 5 +---- src/system/system_global.h | 5 +---- src/tests/BaseTestCase.h | 5 +---- 160 files changed, 160 insertions(+), 639 deletions(-) diff --git a/src/basics/BoundingBox.h b/src/basics/BoundingBox.h index 1eb74f4..cb56adf 100644 --- a/src/basics/BoundingBox.h +++ b/src/basics/BoundingBox.h @@ -1,5 +1,4 @@ -#ifndef BOUNDINGBOX_H -#define BOUNDINGBOX_H +#pragma once #include "basics_global.h" @@ -24,5 +23,3 @@ class BASICSSHARED_EXPORT BoundingBox { }; } } - -#endif // BOUNDINGBOX_H diff --git a/src/basics/CappedCylinder.h b/src/basics/CappedCylinder.h index 185379c..40675a4 100644 --- a/src/basics/CappedCylinder.h +++ b/src/basics/CappedCylinder.h @@ -1,5 +1,4 @@ -#ifndef CAPPEDCYLINDER_H -#define CAPPEDCYLINDER_H +#pragma once #include "basics_global.h" @@ -42,5 +41,3 @@ class BASICSSHARED_EXPORT CappedCylinder : public InfiniteCylinder { }; } } - -#endif // CAPPEDCYLINDER_H diff --git a/src/basics/Color.h b/src/basics/Color.h index 32e8a9b..1efa01c 100644 --- a/src/basics/Color.h +++ b/src/basics/Color.h @@ -1,5 +1,4 @@ -#ifndef COLOR_H -#define COLOR_H +#pragma once #include "basics_global.h" @@ -65,5 +64,3 @@ BASICSSHARED_EXPORT extern const Color COLOR_WHITE; BASICSSHARED_EXPORT extern const Color COLOR_GREY; } } - -#endif // COLOR_H diff --git a/src/basics/ColorHSL.h b/src/basics/ColorHSL.h index 025639d..be8871e 100644 --- a/src/basics/ColorHSL.h +++ b/src/basics/ColorHSL.h @@ -1,5 +1,4 @@ -#ifndef COLORHSL_H -#define COLORHSL_H +#pragma once #include "basics_global.h" @@ -14,5 +13,3 @@ BASICSSHARED_EXPORT Color colorFromHSL(const ColorHSL &col); BASICSSHARED_EXPORT ColorHSL colorToHSL(const Color &col); BASICSSHARED_EXPORT ColorHSL colorHSLFromValues(double h, double s, double l, double a); - -#endif // COLORHSL_H diff --git a/src/basics/Curve.h b/src/basics/Curve.h index e4f5218..71e74bd 100644 --- a/src/basics/Curve.h +++ b/src/basics/Curve.h @@ -1,5 +1,4 @@ -#ifndef CURVE_H -#define CURVE_H +#pragma once #include "basics_global.h" @@ -43,5 +42,3 @@ class BASICSSHARED_EXPORT Curve { }; } } - -#endif // CURVE_H diff --git a/src/basics/Disk.h b/src/basics/Disk.h index 99ab773..e0c4176 100644 --- a/src/basics/Disk.h +++ b/src/basics/Disk.h @@ -1,5 +1,4 @@ -#ifndef DISK_H -#define DISK_H +#pragma once #include "basics_global.h" @@ -38,5 +37,3 @@ class BASICSSHARED_EXPORT Disk : public InfinitePlane { }; } } - -#endif // DISK_H diff --git a/src/basics/FractalNoise.h b/src/basics/FractalNoise.h index c9560e9..0356ff5 100644 --- a/src/basics/FractalNoise.h +++ b/src/basics/FractalNoise.h @@ -1,5 +1,4 @@ -#ifndef FRACTALNOISE_H -#define FRACTALNOISE_H +#pragma once #include "basics_global.h" @@ -83,5 +82,3 @@ class BASICSSHARED_EXPORT FractalNoise { }; } } - -#endif // FRACTALNOISE_H diff --git a/src/basics/Geometry.h b/src/basics/Geometry.h index faf7b11..83ae48d 100644 --- a/src/basics/Geometry.h +++ b/src/basics/Geometry.h @@ -1,5 +1,4 @@ -#ifndef GEOMETRY_H -#define GEOMETRY_H +#pragma once #include "basics_global.h" @@ -16,5 +15,3 @@ class BASICSSHARED_EXPORT Geometry { }; } } - -#endif // GEOMETRY_H diff --git a/src/basics/InfiniteCylinder.h b/src/basics/InfiniteCylinder.h index a26dfba..fa70e60 100644 --- a/src/basics/InfiniteCylinder.h +++ b/src/basics/InfiniteCylinder.h @@ -1,5 +1,4 @@ -#ifndef INFINITECYLINDER_H -#define INFINITECYLINDER_H +#pragma once #include "basics_global.h" @@ -52,5 +51,3 @@ class BASICSSHARED_EXPORT InfiniteCylinder { }; } } - -#endif // INFINITECYLINDER_H diff --git a/src/basics/InfinitePlane.h b/src/basics/InfinitePlane.h index e0198da..c6359e7 100644 --- a/src/basics/InfinitePlane.h +++ b/src/basics/InfinitePlane.h @@ -1,5 +1,4 @@ -#ifndef INFINITEPLANE_H -#define INFINITEPLANE_H +#pragma once #include "basics_global.h" @@ -41,5 +40,3 @@ class BASICSSHARED_EXPORT InfinitePlane { }; } } - -#endif // INFINITEPLANE_H diff --git a/src/basics/InfiniteRay.h b/src/basics/InfiniteRay.h index dce5bed..edf77f2 100644 --- a/src/basics/InfiniteRay.h +++ b/src/basics/InfiniteRay.h @@ -1,5 +1,4 @@ -#ifndef INFINITERAY_H -#define INFINITERAY_H +#pragma once #include "basics_global.h" @@ -41,5 +40,3 @@ class BASICSSHARED_EXPORT InfiniteRay { }; } } - -#endif // INFINITERAY_H diff --git a/src/basics/Interpolation.h b/src/basics/Interpolation.h index 2b3a90b..17b1d5f 100644 --- a/src/basics/Interpolation.h +++ b/src/basics/Interpolation.h @@ -1,5 +1,4 @@ -#ifndef INTERPOLATION_H -#define INTERPOLATION_H +#pragma once #include "basics_global.h" @@ -23,5 +22,3 @@ class BASICSSHARED_EXPORT Interpolation { }; } } - -#endif // INTERPOLATION_H diff --git a/src/basics/Maths.h b/src/basics/Maths.h index 98cca49..1e0bd45 100644 --- a/src/basics/Maths.h +++ b/src/basics/Maths.h @@ -1,5 +1,4 @@ -#ifndef MATHS_H -#define MATHS_H +#pragma once #include "basics_global.h" @@ -40,5 +39,3 @@ class BASICSSHARED_EXPORT Maths { }; } } - -#endif // MATHS_H diff --git a/src/basics/Matrix4.h b/src/basics/Matrix4.h index db99193..0e6dc4c 100644 --- a/src/basics/Matrix4.h +++ b/src/basics/Matrix4.h @@ -1,5 +1,4 @@ -#ifndef MATRIX4_H -#define MATRIX4_H +#pragma once #include "basics_global.h" @@ -103,5 +102,3 @@ class BASICSSHARED_EXPORT Matrix4 { }; } } - -#endif // MATRIX4_H diff --git a/src/basics/NoiseFunctionPerlin.h b/src/basics/NoiseFunctionPerlin.h index b80bf92..a1b8ecd 100644 --- a/src/basics/NoiseFunctionPerlin.h +++ b/src/basics/NoiseFunctionPerlin.h @@ -1,5 +1,4 @@ -#ifndef NOISEFUNCTIONPERLIN_H -#define NOISEFUNCTIONPERLIN_H +#pragma once #include "basics_global.h" @@ -17,5 +16,3 @@ double noisePerlinGet1DValue(double x); double noisePerlinGet2DValue(double x, double y); double noisePerlinGet3DValue(double x, double y, double z); /*double noiseSimplexGet4DValue(double x, double y, double z, double w);*/ - -#endif // NOISEFUNCTIONPERLIN_H diff --git a/src/basics/NoiseFunctionSimplex.h b/src/basics/NoiseFunctionSimplex.h index 7712983..2821644 100644 --- a/src/basics/NoiseFunctionSimplex.h +++ b/src/basics/NoiseFunctionSimplex.h @@ -1,5 +1,4 @@ -#ifndef NOISEFUNCTIONSIMPLEX_H -#define NOISEFUNCTIONSIMPLEX_H +#pragma once #include "basics_global.h" @@ -23,5 +22,3 @@ double noiseSimplexGet1DValue(double x); double noiseSimplexGet2DValue(double x, double y); double noiseSimplexGet3DValue(double x, double y, double z); double noiseSimplexGet4DValue(double x, double y, double z, double w); - -#endif // NOISEFUNCTIONSIMPLEX_H diff --git a/src/basics/NoiseGenerator.h b/src/basics/NoiseGenerator.h index cfcec14..82f73aa 100644 --- a/src/basics/NoiseGenerator.h +++ b/src/basics/NoiseGenerator.h @@ -1,5 +1,4 @@ -#ifndef NOISEGENERATOR_H -#define NOISEGENERATOR_H +#pragma once #include "basics_global.h" @@ -90,5 +89,3 @@ class BASICSSHARED_EXPORT NoiseGenerator { }; } } - -#endif // NOISEGENERATOR_H diff --git a/src/basics/NoiseState.h b/src/basics/NoiseState.h index 05810ea..267d446 100644 --- a/src/basics/NoiseState.h +++ b/src/basics/NoiseState.h @@ -1,5 +1,4 @@ -#ifndef NOISESTATE_H -#define NOISESTATE_H +#pragma once #include "basics_global.h" @@ -42,5 +41,3 @@ class BASICSSHARED_EXPORT NoiseState { }; } } - -#endif // NOISESTATE_H diff --git a/src/basics/SpaceGridIterator.h b/src/basics/SpaceGridIterator.h index 749535e..8b7fb63 100644 --- a/src/basics/SpaceGridIterator.h +++ b/src/basics/SpaceGridIterator.h @@ -1,5 +1,4 @@ -#ifndef SPACEGRIDITERATOR_H -#define SPACEGRIDITERATOR_H +#pragma once #include "basics_global.h" @@ -24,5 +23,3 @@ class BASICSSHARED_EXPORT SpaceGridIterator { }; } } - -#endif // SPACEGRIDITERATOR_H diff --git a/src/basics/SpaceSegment.h b/src/basics/SpaceSegment.h index 5b48470..b9dae10 100644 --- a/src/basics/SpaceSegment.h +++ b/src/basics/SpaceSegment.h @@ -1,5 +1,4 @@ -#ifndef SPACESEGMENT_H -#define SPACESEGMENT_H +#pragma once #include "basics_global.h" @@ -89,5 +88,3 @@ class BASICSSHARED_EXPORT SpaceSegment { }; } } - -#endif // SPACESEGMENT_H diff --git a/src/basics/Sphere.h b/src/basics/Sphere.h index 6067f35..7c49d0f 100644 --- a/src/basics/Sphere.h +++ b/src/basics/Sphere.h @@ -1,5 +1,4 @@ -#ifndef SPHERE_H -#define SPHERE_H +#pragma once #include "basics_global.h" @@ -47,5 +46,3 @@ class BASICSSHARED_EXPORT Sphere { }; } } - -#endif // SPHERE_H diff --git a/src/basics/Texture2D.h b/src/basics/Texture2D.h index a2eab4e..a13b4e3 100644 --- a/src/basics/Texture2D.h +++ b/src/basics/Texture2D.h @@ -1,5 +1,4 @@ -#ifndef TEXTURE2D_H -#define TEXTURE2D_H +#pragma once #include "basics_global.h" @@ -32,5 +31,3 @@ class BASICSSHARED_EXPORT Texture2D { }; } } - -#endif // TEXTURE2D_H diff --git a/src/basics/Texture3D.h b/src/basics/Texture3D.h index 0c765c2..f77f08f 100644 --- a/src/basics/Texture3D.h +++ b/src/basics/Texture3D.h @@ -1,5 +1,4 @@ -#ifndef TEXTURE3D_H -#define TEXTURE3D_H +#pragma once #include "basics_global.h" @@ -33,5 +32,3 @@ class BASICSSHARED_EXPORT Texture3D { }; } } - -#endif // TEXTURE3D_H diff --git a/src/basics/Texture4D.h b/src/basics/Texture4D.h index 4651751..f0dddf7 100644 --- a/src/basics/Texture4D.h +++ b/src/basics/Texture4D.h @@ -1,5 +1,4 @@ -#ifndef TEXTURE4D_H -#define TEXTURE4D_H +#pragma once #include "basics_global.h" @@ -34,5 +33,3 @@ class BASICSSHARED_EXPORT Texture4D { }; } } - -#endif // TEXTURE4D_H diff --git a/src/basics/Vector3.h b/src/basics/Vector3.h index 88df3ae..4571292 100644 --- a/src/basics/Vector3.h +++ b/src/basics/Vector3.h @@ -1,5 +1,4 @@ -#ifndef VECTOR3_H -#define VECTOR3_H +#pragma once #include "basics_global.h" @@ -106,5 +105,3 @@ BASICSSHARED_EXPORT extern const Vector3 VECTOR_EAST; BASICSSHARED_EXPORT extern const Vector3 VECTOR_WEST; } } - -#endif // VECTOR3_H diff --git a/src/basics/basics_global.h b/src/basics/basics_global.h index 6d120b0..d8e73f0 100644 --- a/src/basics/basics_global.h +++ b/src/basics/basics_global.h @@ -1,5 +1,4 @@ -#ifndef BASICS_GLOBAL_H -#define BASICS_GLOBAL_H +#pragma once #include "system_global.h" @@ -33,5 +32,3 @@ class InfinitePlane; } } using namespace paysages::basics; - -#endif // BASICS_GLOBAL_H diff --git a/src/definition/AtmosphereDefinition.h b/src/definition/AtmosphereDefinition.h index 70d93f0..27d848a 100644 --- a/src/definition/AtmosphereDefinition.h +++ b/src/definition/AtmosphereDefinition.h @@ -1,5 +1,4 @@ -#ifndef ATMOSPHEREDEFINITION_H -#define ATMOSPHEREDEFINITION_H +#pragma once #include "definition_global.h" @@ -86,5 +85,3 @@ class DEFINITIONSHARED_EXPORT AtmosphereDefinition : public DefinitionNode { }; } } - -#endif // ATMOSPHEREDEFINITION_H diff --git a/src/definition/CameraDefinition.h b/src/definition/CameraDefinition.h index 91631a3..e23369a 100644 --- a/src/definition/CameraDefinition.h +++ b/src/definition/CameraDefinition.h @@ -1,5 +1,4 @@ -#ifndef CAMERADEFINITION_H -#define CAMERADEFINITION_H +#pragma once #include "definition_global.h" @@ -112,5 +111,3 @@ class DEFINITIONSHARED_EXPORT CameraDefinition : public DefinitionNode { }; } } - -#endif // CAMERADEFINITION_H diff --git a/src/definition/CelestialBodyDefinition.h b/src/definition/CelestialBodyDefinition.h index e7191a4..14e820e 100644 --- a/src/definition/CelestialBodyDefinition.h +++ b/src/definition/CelestialBodyDefinition.h @@ -1,5 +1,4 @@ -#ifndef CELESTIALBODYDEFINITION_H -#define CELESTIALBODYDEFINITION_H +#pragma once #include "definition_global.h" @@ -55,5 +54,3 @@ class DEFINITIONSHARED_EXPORT CelestialBodyDefinition : public DefinitionNode { }; } } - -#endif // CELESTIALBODYDEFINITION_H diff --git a/src/definition/CloudLayerDefinition.h b/src/definition/CloudLayerDefinition.h index d0e3b52..99332c0 100644 --- a/src/definition/CloudLayerDefinition.h +++ b/src/definition/CloudLayerDefinition.h @@ -1,5 +1,4 @@ -#ifndef CLOUDLAYERDEFINITION_H -#define CLOUDLAYERDEFINITION_H +#pragma once #include "definition_global.h" @@ -62,5 +61,3 @@ class DEFINITIONSHARED_EXPORT CloudLayerDefinition : public DefinitionNode { }; } } - -#endif // CLOUDLAYERDEFINITION_H diff --git a/src/definition/CloudsDefinition.h b/src/definition/CloudsDefinition.h index 08eaf3f..ac56eef 100644 --- a/src/definition/CloudsDefinition.h +++ b/src/definition/CloudsDefinition.h @@ -1,5 +1,4 @@ -#ifndef CLOUDSDEFINITION_H -#define CLOUDSDEFINITION_H +#pragma once #include "definition_global.h" @@ -21,5 +20,3 @@ class DEFINITIONSHARED_EXPORT CloudsDefinition : public Layers { }; } } - -#endif // CLOUDSDEFINITION_H diff --git a/src/definition/ColorDiff.h b/src/definition/ColorDiff.h index 65ff39b..7efcbfd 100644 --- a/src/definition/ColorDiff.h +++ b/src/definition/ColorDiff.h @@ -1,5 +1,4 @@ -#ifndef COLORDIFF_H -#define COLORDIFF_H +#pragma once #include "definition_global.h" @@ -32,5 +31,3 @@ class DEFINITIONSHARED_EXPORT ColorDiff : public DefinitionDiff { }; } } - -#endif // COLORDIFF_H diff --git a/src/definition/ColorNode.h b/src/definition/ColorNode.h index 544d4a2..b69cc97 100644 --- a/src/definition/ColorNode.h +++ b/src/definition/ColorNode.h @@ -1,5 +1,4 @@ -#ifndef COLORNODE_H -#define COLORNODE_H +#pragma once #include "definition_global.h" @@ -40,5 +39,3 @@ class DEFINITIONSHARED_EXPORT ColorNode : public DefinitionNode { }; } } - -#endif // COLORNODE_H diff --git a/src/definition/DefinitionDiff.h b/src/definition/DefinitionDiff.h index 1e8a161..5c12e58 100644 --- a/src/definition/DefinitionDiff.h +++ b/src/definition/DefinitionDiff.h @@ -1,5 +1,4 @@ -#ifndef DEFINITIONDIFF_H -#define DEFINITIONDIFF_H +#pragma once #include "definition_global.h" @@ -39,5 +38,3 @@ class DEFINITIONSHARED_EXPORT DefinitionDiff { }; } } - -#endif // DEFINITIONDIFF_H diff --git a/src/definition/DefinitionNode.h b/src/definition/DefinitionNode.h index 57b1ae6..bcdb86f 100644 --- a/src/definition/DefinitionNode.h +++ b/src/definition/DefinitionNode.h @@ -1,5 +1,4 @@ -#ifndef DEFINITIONNODE_H -#define DEFINITIONNODE_H +#pragma once #include "definition_global.h" @@ -132,5 +131,3 @@ class DEFINITIONSHARED_EXPORT DefinitionNode { }; } } - -#endif // DEFINITIONNODE_H diff --git a/src/definition/DefinitionWatcher.h b/src/definition/DefinitionWatcher.h index 90fd237..c9b9524 100644 --- a/src/definition/DefinitionWatcher.h +++ b/src/definition/DefinitionWatcher.h @@ -1,5 +1,4 @@ -#ifndef DEFINITIONWATCHER_H -#define DEFINITIONWATCHER_H +#pragma once #include "definition_global.h" @@ -63,5 +62,3 @@ class DEFINITIONSHARED_EXPORT DefinitionWatcher { }; } } - -#endif // DEFINITIONWATCHER_H diff --git a/src/definition/DiffManager.h b/src/definition/DiffManager.h index 0bb8cf3..d93d59d 100644 --- a/src/definition/DiffManager.h +++ b/src/definition/DiffManager.h @@ -1,5 +1,4 @@ -#ifndef DIFFMANAGER_H -#define DIFFMANAGER_H +#pragma once #include "definition_global.h" @@ -70,5 +69,3 @@ class DEFINITIONSHARED_EXPORT DiffManager { }; } } - -#endif // DIFFMANAGER_H diff --git a/src/definition/FloatDiff.h b/src/definition/FloatDiff.h index 4f21aa9..ba332b5 100644 --- a/src/definition/FloatDiff.h +++ b/src/definition/FloatDiff.h @@ -1,5 +1,4 @@ -#ifndef FLOATDIFF_H -#define FLOATDIFF_H +#pragma once #include "definition_global.h" @@ -31,5 +30,3 @@ class DEFINITIONSHARED_EXPORT FloatDiff : public DefinitionDiff { }; } } - -#endif // FLOATDIFF_H diff --git a/src/definition/FloatNode.h b/src/definition/FloatNode.h index c424018..99a3dc8 100644 --- a/src/definition/FloatNode.h +++ b/src/definition/FloatNode.h @@ -1,5 +1,4 @@ -#ifndef FLOATNODE_H -#define FLOATNODE_H +#pragma once #include "definition_global.h" @@ -41,5 +40,3 @@ class DEFINITIONSHARED_EXPORT FloatNode : public DefinitionNode { }; } } - -#endif // FLOATNODE_H diff --git a/src/definition/GodRaysDefinition.h b/src/definition/GodRaysDefinition.h index e9c09dc..3b612c9 100644 --- a/src/definition/GodRaysDefinition.h +++ b/src/definition/GodRaysDefinition.h @@ -1,5 +1,4 @@ -#ifndef GODRAYSDEFINITION_H -#define GODRAYSDEFINITION_H +#pragma once #include "definition_global.h" @@ -29,5 +28,3 @@ class DEFINITIONSHARED_EXPORT GodRaysDefinition : public DefinitionNode { }; } } - -#endif // GODRAYSDEFINITION_H diff --git a/src/definition/IntDiff.h b/src/definition/IntDiff.h index 0bf1e98..7b0e9e7 100644 --- a/src/definition/IntDiff.h +++ b/src/definition/IntDiff.h @@ -1,5 +1,4 @@ -#ifndef INTDIFF_H -#define INTDIFF_H +#pragma once #include "definition_global.h" @@ -31,5 +30,3 @@ class DEFINITIONSHARED_EXPORT IntDiff : public DefinitionDiff { }; } } - -#endif // INTDIFF_H diff --git a/src/definition/IntNode.h b/src/definition/IntNode.h index 5c84a0d..a7183d6 100644 --- a/src/definition/IntNode.h +++ b/src/definition/IntNode.h @@ -1,5 +1,4 @@ -#ifndef INTNODE_H -#define INTNODE_H +#pragma once #include "definition_global.h" @@ -39,5 +38,3 @@ class DEFINITIONSHARED_EXPORT IntNode : public DefinitionNode { }; } } - -#endif // INTNODE_H diff --git a/src/definition/Layers.h b/src/definition/Layers.h index dce26d5..b84e711 100644 --- a/src/definition/Layers.h +++ b/src/definition/Layers.h @@ -1,5 +1,4 @@ -#ifndef LAYERS_H -#define LAYERS_H +#pragma once #include "definition_global.h" @@ -73,5 +72,3 @@ class DEFINITIONSHARED_EXPORT Layers : public DefinitionNode { }; } } - -#endif // LAYERS_H diff --git a/src/definition/LayersDiff.h b/src/definition/LayersDiff.h index 53c72a8..e93f819 100644 --- a/src/definition/LayersDiff.h +++ b/src/definition/LayersDiff.h @@ -1,5 +1,4 @@ -#ifndef LAYERSDIFF_H -#define LAYERSDIFF_H +#pragma once #include "definition_global.h" @@ -46,5 +45,3 @@ class DEFINITIONSHARED_EXPORT LayersDiff : public DefinitionDiff { }; } } - -#endif // LAYERSDIFF_H diff --git a/src/definition/MaterialNode.h b/src/definition/MaterialNode.h index 07d85d9..fe1192b 100644 --- a/src/definition/MaterialNode.h +++ b/src/definition/MaterialNode.h @@ -1,5 +1,4 @@ -#ifndef MATERIALNODE_H -#define MATERIALNODE_H +#pragma once #include "definition_global.h" @@ -59,5 +58,3 @@ class DEFINITIONSHARED_EXPORT MaterialNode : public DefinitionNode { }; } } - -#endif // MATERIALNODE_H diff --git a/src/definition/NoiseNode.h b/src/definition/NoiseNode.h index b14b98d..074f845 100644 --- a/src/definition/NoiseNode.h +++ b/src/definition/NoiseNode.h @@ -1,5 +1,4 @@ -#ifndef NOISENODE_H -#define NOISENODE_H +#pragma once #include "definition_global.h" @@ -50,5 +49,3 @@ class DEFINITIONSHARED_EXPORT NoiseNode : public DefinitionNode { }; } } - -#endif // NOISENODE_H diff --git a/src/definition/PaintedGrid.h b/src/definition/PaintedGrid.h index 63bca66..df02745 100644 --- a/src/definition/PaintedGrid.h +++ b/src/definition/PaintedGrid.h @@ -1,5 +1,4 @@ -#ifndef PAINTEDGRID_H -#define PAINTEDGRID_H +#pragma once #include "definition_global.h" @@ -89,5 +88,3 @@ class DEFINITIONSHARED_EXPORT PaintedGrid : public DefinitionNode { }; } } - -#endif // PAINTEDGRID_H diff --git a/src/definition/PaintedGridBrush.h b/src/definition/PaintedGridBrush.h index 02db785..3863e0d 100644 --- a/src/definition/PaintedGridBrush.h +++ b/src/definition/PaintedGridBrush.h @@ -1,5 +1,4 @@ -#ifndef PAINTEDGRIDBRUSH_H -#define PAINTEDGRIDBRUSH_H +#pragma once #include "definition_global.h" @@ -98,5 +97,3 @@ class DEFINITIONSHARED_EXPORT PaintedGridBrushFlatten : public PaintedGridBrush }; } } - -#endif // PAINTEDGRIDBRUSH_H diff --git a/src/definition/PaintedGridData.h b/src/definition/PaintedGridData.h index 1417822..4c1ae2f 100644 --- a/src/definition/PaintedGridData.h +++ b/src/definition/PaintedGridData.h @@ -1,5 +1,4 @@ -#ifndef PAINTEDGRIDDATA_H -#define PAINTEDGRIDDATA_H +#pragma once #include "definition_global.h" @@ -48,5 +47,3 @@ class PaintedGridData { }; } } - -#endif // PAINTEDGRIDDATA_H diff --git a/src/definition/Scenery.h b/src/definition/Scenery.h index 678363b..834c9ee 100644 --- a/src/definition/Scenery.h +++ b/src/definition/Scenery.h @@ -1,5 +1,4 @@ -#ifndef SCENERY_H -#define SCENERY_H +#pragma once #include "definition_global.h" @@ -126,5 +125,3 @@ class DEFINITIONSHARED_EXPORT Scenery : public DefinitionNode { }; } } - -#endif // SCENERY_H diff --git a/src/definition/SurfaceMaterial.h b/src/definition/SurfaceMaterial.h index 0b89557..4873233 100644 --- a/src/definition/SurfaceMaterial.h +++ b/src/definition/SurfaceMaterial.h @@ -1,5 +1,4 @@ -#ifndef SURFACEMATERIAL_H -#define SURFACEMATERIAL_H +#pragma once #include "definition_global.h" @@ -32,5 +31,3 @@ class DEFINITIONSHARED_EXPORT SurfaceMaterial { }; } } - -#endif // SURFACEMATERIAL_H diff --git a/src/definition/TerrainDefinition.h b/src/definition/TerrainDefinition.h index 478a4cc..fabd954 100644 --- a/src/definition/TerrainDefinition.h +++ b/src/definition/TerrainDefinition.h @@ -1,5 +1,4 @@ -#ifndef TERRAINDEFINITION_H -#define TERRAINDEFINITION_H +#pragma once #include "definition_global.h" @@ -57,5 +56,3 @@ class DEFINITIONSHARED_EXPORT TerrainDefinition : public DefinitionNode { }; } } - -#endif // TERRAINDEFINITION_H diff --git a/src/definition/TerrainHeightMap.h b/src/definition/TerrainHeightMap.h index 6cc4866..aa76f5d 100644 --- a/src/definition/TerrainHeightMap.h +++ b/src/definition/TerrainHeightMap.h @@ -1,5 +1,4 @@ -#ifndef TERRAINHEIGHTMAP_H -#define TERRAINHEIGHTMAP_H +#pragma once #include "definition_global.h" @@ -36,5 +35,3 @@ class DEFINITIONSHARED_EXPORT TerrainHeightMap : public PaintedGrid { }; } } - -#endif // TERRAINHEIGHTMAP_H diff --git a/src/definition/TextureLayerDefinition.h b/src/definition/TextureLayerDefinition.h index aec3ed0..b694b75 100644 --- a/src/definition/TextureLayerDefinition.h +++ b/src/definition/TextureLayerDefinition.h @@ -1,5 +1,4 @@ -#ifndef TEXTURELAYERDEFINITION_H -#define TEXTURELAYERDEFINITION_H +#pragma once #include "definition_global.h" @@ -58,5 +57,3 @@ class DEFINITIONSHARED_EXPORT TextureLayerDefinition : public DefinitionNode { }; } } - -#endif // TEXTURELAYERDEFINITION_H diff --git a/src/definition/TexturesDefinition.h b/src/definition/TexturesDefinition.h index 99b9678..45ed224 100644 --- a/src/definition/TexturesDefinition.h +++ b/src/definition/TexturesDefinition.h @@ -1,5 +1,4 @@ -#ifndef TEXTURESDEFINITION_H -#define TEXTURESDEFINITION_H +#pragma once #include "definition_global.h" @@ -23,5 +22,3 @@ class DEFINITIONSHARED_EXPORT TexturesDefinition : public Layers { }; } } - -#endif // TEXTURESDEFINITION_H diff --git a/src/definition/TimeManager.h b/src/definition/TimeManager.h index eb2a58c..cb14f3b 100644 --- a/src/definition/TimeManager.h +++ b/src/definition/TimeManager.h @@ -1,5 +1,4 @@ -#ifndef TIMEMANAGER_H -#define TIMEMANAGER_H +#pragma once #include "definition_global.h" @@ -31,5 +30,3 @@ class DEFINITIONSHARED_EXPORT TimeManager { }; } } - -#endif // TIMEMANAGER_H diff --git a/src/definition/VegetationDefinition.h b/src/definition/VegetationDefinition.h index cbf926e..800422b 100644 --- a/src/definition/VegetationDefinition.h +++ b/src/definition/VegetationDefinition.h @@ -1,5 +1,4 @@ -#ifndef VEGETATIONDEFINITION_H -#define VEGETATIONDEFINITION_H +#pragma once #include "definition_global.h" @@ -32,5 +31,3 @@ class DEFINITIONSHARED_EXPORT VegetationDefinition : public Layers { }; } } - -#endif // VEGETATIONDEFINITION_H diff --git a/src/definition/VegetationInstance.h b/src/definition/VegetationInstance.h index a400160..ab69bf4 100644 --- a/src/definition/VegetationInstance.h +++ b/src/definition/VegetationInstance.h @@ -1,5 +1,4 @@ -#ifndef VEGETATIONINSTANCE_H -#define VEGETATIONINSTANCE_H +#pragma once #include "definition_global.h" @@ -41,5 +40,3 @@ class DEFINITIONSHARED_EXPORT VegetationInstance { }; } } - -#endif // VEGETATIONINSTANCE_H diff --git a/src/definition/VegetationLayerDefinition.h b/src/definition/VegetationLayerDefinition.h index 8650e6a..cc1aba5 100644 --- a/src/definition/VegetationLayerDefinition.h +++ b/src/definition/VegetationLayerDefinition.h @@ -1,5 +1,4 @@ -#ifndef VEGETATIONLAYERDEFINITION_H -#define VEGETATIONLAYERDEFINITION_H +#pragma once #include "definition_global.h" @@ -40,5 +39,3 @@ class DEFINITIONSHARED_EXPORT VegetationLayerDefinition : public DefinitionNode }; } } - -#endif // VEGETATIONLAYERDEFINITION_H diff --git a/src/definition/VegetationModelDefinition.h b/src/definition/VegetationModelDefinition.h index c7d2b95..621f508 100644 --- a/src/definition/VegetationModelDefinition.h +++ b/src/definition/VegetationModelDefinition.h @@ -1,5 +1,4 @@ -#ifndef VEGETATIONMODELDEFINITION_H -#define VEGETATIONMODELDEFINITION_H +#pragma once #include "definition_global.h" @@ -56,5 +55,3 @@ class DEFINITIONSHARED_EXPORT VegetationModelDefinition : public DefinitionNode }; } } - -#endif // VEGETATIONMODELDEFINITION_H diff --git a/src/definition/VegetationPresenceDefinition.h b/src/definition/VegetationPresenceDefinition.h index 81f4a51..c79fc40 100644 --- a/src/definition/VegetationPresenceDefinition.h +++ b/src/definition/VegetationPresenceDefinition.h @@ -1,5 +1,4 @@ -#ifndef VEGETATIONPRESENCEDEFINITION_H -#define VEGETATIONPRESENCEDEFINITION_H +#pragma once #include "definition_global.h" @@ -36,5 +35,3 @@ class DEFINITIONSHARED_EXPORT VegetationPresenceDefinition : public DefinitionNo }; } } - -#endif // VEGETATIONPRESENCEDEFINITION_H diff --git a/src/definition/WaterDefinition.h b/src/definition/WaterDefinition.h index 2563d01..51781b6 100644 --- a/src/definition/WaterDefinition.h +++ b/src/definition/WaterDefinition.h @@ -1,5 +1,4 @@ -#ifndef WATERDEFINITION_H -#define WATERDEFINITION_H +#pragma once #include "definition_global.h" @@ -67,5 +66,3 @@ class DEFINITIONSHARED_EXPORT WaterDefinition : public DefinitionNode { }; } } - -#endif // WATERDEFINITION_H diff --git a/src/definition/Zone.h b/src/definition/Zone.h index b7a3823..8cd5137 100644 --- a/src/definition/Zone.h +++ b/src/definition/Zone.h @@ -1,5 +1,4 @@ -#ifndef ZONE_H -#define ZONE_H +#pragma once #include "definition_global.h" @@ -44,5 +43,3 @@ class DEFINITIONSHARED_EXPORT Zone : public DefinitionNode { }; } } - -#endif // ZONE_H diff --git a/src/definition/definition_global.h b/src/definition/definition_global.h index 5398299..8f8deb8 100644 --- a/src/definition/definition_global.h +++ b/src/definition/definition_global.h @@ -1,5 +1,4 @@ -#ifndef DEFINITION_GLOBAL_H -#define DEFINITION_GLOBAL_H +#pragma once #include "basics_global.h" @@ -56,5 +55,3 @@ class TimeManager; } } using namespace paysages::definition; - -#endif // DEFINITION_GLOBAL_H diff --git a/src/interface/modeler/AtmosphereModeler.h b/src/interface/modeler/AtmosphereModeler.h index 6656a09..d6e244d 100644 --- a/src/interface/modeler/AtmosphereModeler.h +++ b/src/interface/modeler/AtmosphereModeler.h @@ -1,5 +1,4 @@ -#ifndef ATMOSPHEREMODELER_H -#define ATMOSPHEREMODELER_H +#pragma once #include "modeler_global.h" @@ -17,5 +16,3 @@ class AtmosphereModeler : public BaseModelerTool { }; } } - -#endif // ATMOSPHEREMODELER_H diff --git a/src/interface/modeler/BaseModelerTool.h b/src/interface/modeler/BaseModelerTool.h index 7d96328..7ec7826 100644 --- a/src/interface/modeler/BaseModelerTool.h +++ b/src/interface/modeler/BaseModelerTool.h @@ -1,5 +1,4 @@ -#ifndef BASEMODELERTOOL_H -#define BASEMODELERTOOL_H +#pragma once #include "modeler_global.h" @@ -47,5 +46,3 @@ class BaseModelerTool : protected DefinitionWatcher { }; } } - -#endif // BASEMODELERTOOL_H diff --git a/src/interface/modeler/FloatPropertyBind.h b/src/interface/modeler/FloatPropertyBind.h index 584732d..ca9ae48 100644 --- a/src/interface/modeler/FloatPropertyBind.h +++ b/src/interface/modeler/FloatPropertyBind.h @@ -1,5 +1,4 @@ -#ifndef FLOATPROPERTYBIND_H -#define FLOATPROPERTYBIND_H +#pragma once #include "modeler_global.h" @@ -33,5 +32,3 @@ class FloatPropertyBind : public QObject, public DefinitionWatcher { }; } } - -#endif // FLOATPROPERTYBIND_H diff --git a/src/interface/modeler/IntPropertyBind.h b/src/interface/modeler/IntPropertyBind.h index d6abf70..dead287 100644 --- a/src/interface/modeler/IntPropertyBind.h +++ b/src/interface/modeler/IntPropertyBind.h @@ -1,5 +1,4 @@ -#ifndef INTPROPERTYBIND_H -#define INTPROPERTYBIND_H +#pragma once #include "modeler_global.h" @@ -32,4 +31,3 @@ class IntPropertyBind : public QObject, public DefinitionWatcher { }; } } -#endif // INTPROPERTYBIND_H diff --git a/src/interface/modeler/MainModelerWindow.h b/src/interface/modeler/MainModelerWindow.h index 939a26f..f60301c 100644 --- a/src/interface/modeler/MainModelerWindow.h +++ b/src/interface/modeler/MainModelerWindow.h @@ -1,5 +1,4 @@ -#ifndef MAINMODELERWINDOW_H -#define MAINMODELERWINDOW_H +#pragma once #include "modeler_global.h" @@ -57,5 +56,3 @@ class MainModelerWindow : public QQuickView { }; } } - -#endif // MAINMODELERWINDOW_H diff --git a/src/interface/modeler/ModelerCameras.h b/src/interface/modeler/ModelerCameras.h index d62d87e..792e8cf 100644 --- a/src/interface/modeler/ModelerCameras.h +++ b/src/interface/modeler/ModelerCameras.h @@ -1,5 +1,4 @@ -#ifndef MODELERCAMERAS_H -#define MODELERCAMERAS_H +#pragma once #include "modeler_global.h" @@ -77,5 +76,3 @@ class ModelerCameras : public QObject, public DefinitionWatcher { }; } } - -#endif // MODELERCAMERAS_H diff --git a/src/interface/modeler/OpenGLView.h b/src/interface/modeler/OpenGLView.h index 4cd8eb3..dbbca90 100644 --- a/src/interface/modeler/OpenGLView.h +++ b/src/interface/modeler/OpenGLView.h @@ -1,5 +1,4 @@ -#ifndef OPENGLVIEW_H -#define OPENGLVIEW_H +#pragma once #include "modeler_global.h" @@ -46,5 +45,3 @@ class OpenGLView : public QQuickItem { }; } } - -#endif // OPENGLVIEW_H diff --git a/src/interface/modeler/PropertyBind.h b/src/interface/modeler/PropertyBind.h index 9d0a10e..42832e2 100644 --- a/src/interface/modeler/PropertyBind.h +++ b/src/interface/modeler/PropertyBind.h @@ -1,5 +1,4 @@ -#ifndef PROPERTYBIND_H -#define PROPERTYBIND_H +#pragma once #include @@ -12,5 +11,3 @@ class PropertyBind : public QObject { public slots: }; - -#endif // PROPERTYBIND_H diff --git a/src/interface/modeler/RenderPreviewProvider.h b/src/interface/modeler/RenderPreviewProvider.h index 462e5e0..99c4d8c 100644 --- a/src/interface/modeler/RenderPreviewProvider.h +++ b/src/interface/modeler/RenderPreviewProvider.h @@ -1,5 +1,4 @@ -#ifndef RENDERPREVIEWPROVIDER_H -#define RENDERPREVIEWPROVIDER_H +#pragma once #include "modeler_global.h" @@ -52,5 +51,3 @@ class RenderPreviewProvider : public QQuickImageProvider, public CanvasLiveClien }; } } - -#endif // RENDERPREVIEWPROVIDER_H diff --git a/src/interface/modeler/RenderProcess.h b/src/interface/modeler/RenderProcess.h index 7fc62bf..3370145 100644 --- a/src/interface/modeler/RenderProcess.h +++ b/src/interface/modeler/RenderProcess.h @@ -1,5 +1,4 @@ -#ifndef RENDERPROCESS_H -#define RENDERPROCESS_H +#pragma once #include "modeler_global.h" @@ -73,5 +72,3 @@ class RenderProcess : public QObject { }; } } - -#endif // RENDERPROCESS_H diff --git a/src/interface/modeler/WaterModeler.h b/src/interface/modeler/WaterModeler.h index 99bd6b8..ca70514 100644 --- a/src/interface/modeler/WaterModeler.h +++ b/src/interface/modeler/WaterModeler.h @@ -1,5 +1,4 @@ -#ifndef WATERMODELER_H -#define WATERMODELER_H +#pragma once #include "modeler_global.h" @@ -19,5 +18,3 @@ class WaterModeler : public QObject, public BaseModelerTool { }; } } - -#endif // WATERMODELER_H diff --git a/src/interface/modeler/modeler_global.h b/src/interface/modeler/modeler_global.h index 68a170a..0265d85 100644 --- a/src/interface/modeler/modeler_global.h +++ b/src/interface/modeler/modeler_global.h @@ -1,5 +1,4 @@ -#ifndef MODELER_GLOBAL_H -#define MODELER_GLOBAL_H +#pragma once #include "definition_global.h" #include "software_global.h" @@ -26,5 +25,3 @@ class IntPropertyBind; } using namespace paysages::modeler; - -#endif // MODELER_GLOBAL_H diff --git a/src/render/opengl/OpenGLFunctions.h b/src/render/opengl/OpenGLFunctions.h index fba4f67..2e5f87e 100644 --- a/src/render/opengl/OpenGLFunctions.h +++ b/src/render/opengl/OpenGLFunctions.h @@ -1,9 +1,6 @@ -#ifndef OPENGLFUNCTIONS -#define OPENGLFUNCTIONS +#pragma once #include "opengl_global.h" #define _OPENGL_FUNCTIONS_INCLUDE #include _OPENGL_FUNCTIONS_INCLUDE - -#endif // OPENGLFUNCTIONS diff --git a/src/render/opengl/OpenGLPart.h b/src/render/opengl/OpenGLPart.h index ad7faba..e231be6 100644 --- a/src/render/opengl/OpenGLPart.h +++ b/src/render/opengl/OpenGLPart.h @@ -1,5 +1,4 @@ -#ifndef OPENGLPART_H -#define OPENGLPART_H +#pragma once #include "opengl_global.h" @@ -83,5 +82,3 @@ class OPENGLSHARED_EXPORT OpenGLPart : protected DefinitionWatcher { }; } } - -#endif // OPENGLPART_H diff --git a/src/render/opengl/OpenGLRenderer.h b/src/render/opengl/OpenGLRenderer.h index bafbd9e..9da1676 100644 --- a/src/render/opengl/OpenGLRenderer.h +++ b/src/render/opengl/OpenGLRenderer.h @@ -1,5 +1,4 @@ -#ifndef OPENGLRENDERER_H -#define OPENGLRENDERER_H +#pragma once #include "opengl_global.h" @@ -149,5 +148,3 @@ class OPENGLSHARED_EXPORT OpenGLRenderer : public SoftwareRenderer { }; } } - -#endif // OPENGLRENDERER_H diff --git a/src/render/opengl/OpenGLShaderProgram.h b/src/render/opengl/OpenGLShaderProgram.h index 9dbd5b7..afe0627 100644 --- a/src/render/opengl/OpenGLShaderProgram.h +++ b/src/render/opengl/OpenGLShaderProgram.h @@ -1,5 +1,4 @@ -#ifndef OPENGLSHADERPROGRAM_H -#define OPENGLSHADERPROGRAM_H +#pragma once #include "opengl_global.h" @@ -86,5 +85,3 @@ class OPENGLSHARED_EXPORT OpenGLShaderProgram { }; } } - -#endif // OPENGLSHADERPROGRAM_H diff --git a/src/render/opengl/OpenGLSharedState.h b/src/render/opengl/OpenGLSharedState.h index b068be8..65465a9 100644 --- a/src/render/opengl/OpenGLSharedState.h +++ b/src/render/opengl/OpenGLSharedState.h @@ -1,5 +1,4 @@ -#ifndef OPENGLSHAREDSTATE_H -#define OPENGLSHAREDSTATE_H +#pragma once #include "opengl_global.h" @@ -71,5 +70,3 @@ class OPENGLSHARED_EXPORT OpenGLSharedState { }; } } - -#endif // OPENGLSHAREDSTATE_H diff --git a/src/render/opengl/OpenGLSkybox.h b/src/render/opengl/OpenGLSkybox.h index 005ad7e..7973768 100644 --- a/src/render/opengl/OpenGLSkybox.h +++ b/src/render/opengl/OpenGLSkybox.h @@ -1,5 +1,4 @@ -#ifndef OPENGLSKYBOX_H -#define OPENGLSKYBOX_H +#pragma once #include "opengl_global.h" @@ -27,5 +26,3 @@ class OPENGLSHARED_EXPORT OpenGLSkybox : public OpenGLPart { }; } } - -#endif // OPENGLSKYBOX_H diff --git a/src/render/opengl/OpenGLTerrain.h b/src/render/opengl/OpenGLTerrain.h index 48385be..c0753e1 100644 --- a/src/render/opengl/OpenGLTerrain.h +++ b/src/render/opengl/OpenGLTerrain.h @@ -1,5 +1,4 @@ -#ifndef OPENGLTERRAIN_H -#define OPENGLTERRAIN_H +#pragma once #include "opengl_global.h" @@ -46,5 +45,3 @@ class OPENGLSHARED_EXPORT OpenGLTerrain : public OpenGLPart { }; } } - -#endif // OPENGLTERRAIN_H diff --git a/src/render/opengl/OpenGLTerrainChunk.h b/src/render/opengl/OpenGLTerrainChunk.h index 7383d36..e60db70 100644 --- a/src/render/opengl/OpenGLTerrainChunk.h +++ b/src/render/opengl/OpenGLTerrainChunk.h @@ -1,5 +1,4 @@ -#ifndef OPENGLTERRAINCHUNK_H -#define OPENGLTERRAINCHUNK_H +#pragma once #include "opengl_global.h" @@ -93,5 +92,3 @@ class OPENGLSHARED_EXPORT OpenGLTerrainChunk { }; } } - -#endif // OPENGLTERRAINCHUNK_H diff --git a/src/render/opengl/OpenGLVariable.h b/src/render/opengl/OpenGLVariable.h index 76158c6..edc39c6 100644 --- a/src/render/opengl/OpenGLVariable.h +++ b/src/render/opengl/OpenGLVariable.h @@ -1,5 +1,4 @@ -#ifndef OPENGLVARIABLE_H -#define OPENGLVARIABLE_H +#pragma once #include "opengl_global.h" @@ -58,5 +57,3 @@ class OPENGLSHARED_EXPORT OpenGLVariable final { }; } } - -#endif // OPENGLVARIABLE_H diff --git a/src/render/opengl/OpenGLVegetation.h b/src/render/opengl/OpenGLVegetation.h index db76de5..025fb9c 100644 --- a/src/render/opengl/OpenGLVegetation.h +++ b/src/render/opengl/OpenGLVegetation.h @@ -1,5 +1,4 @@ -#ifndef OPENGLVEGETATION_H -#define OPENGLVEGETATION_H +#pragma once #include "opengl_global.h" @@ -85,5 +84,3 @@ class OPENGLSHARED_EXPORT OpenGLVegetation : public OpenGLPart { }; } } - -#endif // OPENGLVEGETATION_H diff --git a/src/render/opengl/OpenGLVegetationImpostor.h b/src/render/opengl/OpenGLVegetationImpostor.h index b8d57fa..1cef1f9 100644 --- a/src/render/opengl/OpenGLVegetationImpostor.h +++ b/src/render/opengl/OpenGLVegetationImpostor.h @@ -1,5 +1,4 @@ -#ifndef OPENGLVEGETATIONIMPOSTOR_H -#define OPENGLVEGETATIONIMPOSTOR_H +#pragma once #include "opengl_global.h" @@ -45,5 +44,3 @@ class OPENGLSHARED_EXPORT OpenGLVegetationImpostor { }; } } - -#endif // OPENGLVEGETATIONIMPOSTOR_H diff --git a/src/render/opengl/OpenGLVegetationInstance.h b/src/render/opengl/OpenGLVegetationInstance.h index 35a265f..de58c68 100644 --- a/src/render/opengl/OpenGLVegetationInstance.h +++ b/src/render/opengl/OpenGLVegetationInstance.h @@ -1,5 +1,4 @@ -#ifndef OPENGLVEGETATIONINSTANCE_H -#define OPENGLVEGETATIONINSTANCE_H +#pragma once #include "opengl_global.h" @@ -39,5 +38,3 @@ class OPENGLSHARED_EXPORT OpenGLVegetationInstance { }; } } - -#endif // OPENGLVEGETATIONINSTANCE_H diff --git a/src/render/opengl/OpenGLVegetationLayer.h b/src/render/opengl/OpenGLVegetationLayer.h index a13cbdc..746e4b5 100644 --- a/src/render/opengl/OpenGLVegetationLayer.h +++ b/src/render/opengl/OpenGLVegetationLayer.h @@ -1,5 +1,4 @@ -#ifndef OPENGLVEGETATIONLAYER_H -#define OPENGLVEGETATIONLAYER_H +#pragma once #include "opengl_global.h" @@ -92,5 +91,3 @@ class OPENGLSHARED_EXPORT OpenGLVegetationLayer { }; } } - -#endif // OPENGLVEGETATIONLAYER_H diff --git a/src/render/opengl/OpenGLVertexArray.h b/src/render/opengl/OpenGLVertexArray.h index bfbaeb4..49c0249 100644 --- a/src/render/opengl/OpenGLVertexArray.h +++ b/src/render/opengl/OpenGLVertexArray.h @@ -1,5 +1,4 @@ -#ifndef OPENGLVERTEXARRAY_H -#define OPENGLVERTEXARRAY_H +#pragma once #include "opengl_global.h" @@ -90,5 +89,3 @@ class OPENGLSHARED_EXPORT OpenGLVertexArray { }; } } - -#endif // OPENGLVERTEXARRAY_H diff --git a/src/render/opengl/OpenGLWater.h b/src/render/opengl/OpenGLWater.h index 26617a4..e3ecb61 100644 --- a/src/render/opengl/OpenGLWater.h +++ b/src/render/opengl/OpenGLWater.h @@ -1,5 +1,4 @@ -#ifndef OPENGLWATER_H -#define OPENGLWATER_H +#pragma once #include "opengl_global.h" @@ -32,5 +31,3 @@ class OPENGLSHARED_EXPORT OpenGLWater : public OpenGLPart { }; } } - -#endif // OPENGLWATER_H diff --git a/src/render/opengl/opengl_global.h b/src/render/opengl/opengl_global.h index f136d83..12886d9 100644 --- a/src/render/opengl/opengl_global.h +++ b/src/render/opengl/opengl_global.h @@ -1,5 +1,4 @@ -#ifndef OPENGL_GLOBAL_H -#define OPENGL_GLOBAL_H +#pragma once #include "software_global.h" @@ -34,5 +33,3 @@ using namespace paysages::opengl; #define OPENGL_MAJOR_VERSION 3 #define OPENGL_MINOR_VERSION 3 class OpenGLFunctions; - -#endif // OPENGL_GLOBAL_H diff --git a/src/render/software/AtmosphereModelBruneton.h b/src/render/software/AtmosphereModelBruneton.h index f17b635..bd41af7 100644 --- a/src/render/software/AtmosphereModelBruneton.h +++ b/src/render/software/AtmosphereModelBruneton.h @@ -1,5 +1,4 @@ -#ifndef ATMOSPHEREMODELBRUNETON_H -#define ATMOSPHEREMODELBRUNETON_H +#pragma once #include "software_global.h" @@ -28,5 +27,3 @@ class SOFTWARESHARED_EXPORT AtmosphereModelBruneton : public LightSource { }; } } - -#endif // ATMOSPHEREMODELBRUNETON_H diff --git a/src/render/software/AtmosphereRenderer.h b/src/render/software/AtmosphereRenderer.h index b9920e0..901c4ba 100644 --- a/src/render/software/AtmosphereRenderer.h +++ b/src/render/software/AtmosphereRenderer.h @@ -1,5 +1,4 @@ -#ifndef ATMOSPHERERENDERER_H -#define ATMOSPHERERENDERER_H +#pragma once #include "software_global.h" @@ -45,5 +44,3 @@ class SoftwareBrunetonAtmosphereRenderer : public BaseAtmosphereRenderer { }; } } - -#endif // ATMOSPHERERENDERER_H diff --git a/src/render/software/AtmosphereResult.h b/src/render/software/AtmosphereResult.h index 03dac00..0736d5e 100644 --- a/src/render/software/AtmosphereResult.h +++ b/src/render/software/AtmosphereResult.h @@ -1,5 +1,4 @@ -#ifndef ATMOSPHERERESULT_H -#define ATMOSPHERERESULT_H +#pragma once #include "software_global.h" @@ -22,5 +21,3 @@ class SOFTWARESHARED_EXPORT AtmosphereResult { }; } } - -#endif // ATMOSPHERERESULT_H diff --git a/src/render/software/BaseCloudLayerRenderer.h b/src/render/software/BaseCloudLayerRenderer.h index 227c535..15bf747 100644 --- a/src/render/software/BaseCloudLayerRenderer.h +++ b/src/render/software/BaseCloudLayerRenderer.h @@ -1,5 +1,4 @@ -#ifndef BASECLOUDLAYERRENDERER_H -#define BASECLOUDLAYERRENDERER_H +#pragma once #include "software_global.h" @@ -24,5 +23,3 @@ class BaseCloudLayerRenderer { }; } } - -#endif // BASECLOUDLAYERRENDERER_H diff --git a/src/render/software/Canvas.h b/src/render/software/Canvas.h index 63dd41d..a007723 100644 --- a/src/render/software/Canvas.h +++ b/src/render/software/Canvas.h @@ -1,5 +1,4 @@ -#ifndef CANVAS_H -#define CANVAS_H +#pragma once #include "software_global.h" @@ -60,5 +59,3 @@ class SOFTWARESHARED_EXPORT Canvas { }; } } - -#endif // CANVAS_H diff --git a/src/render/software/CanvasFragment.h b/src/render/software/CanvasFragment.h index 88f5f53..2925aad 100644 --- a/src/render/software/CanvasFragment.h +++ b/src/render/software/CanvasFragment.h @@ -1,5 +1,4 @@ -#ifndef CANVASFRAGMENT_H -#define CANVASFRAGMENT_H +#pragma once #include "software_global.h" @@ -52,5 +51,3 @@ class SOFTWARESHARED_EXPORT CanvasFragment { }; } } - -#endif // CANVASFRAGMENT_H diff --git a/src/render/software/CanvasLiveClient.h b/src/render/software/CanvasLiveClient.h index 20c0460..8b55e7e 100644 --- a/src/render/software/CanvasLiveClient.h +++ b/src/render/software/CanvasLiveClient.h @@ -1,5 +1,4 @@ -#ifndef CANVASLIVECLIENT_H -#define CANVASLIVECLIENT_H +#pragma once #include "software_global.h" @@ -19,5 +18,3 @@ class SOFTWARESHARED_EXPORT CanvasLiveClient { }; } } - -#endif // CANVASLIVECLIENT_H diff --git a/src/render/software/CanvasPictureWriter.h b/src/render/software/CanvasPictureWriter.h index 40e65c7..e1cedd0 100644 --- a/src/render/software/CanvasPictureWriter.h +++ b/src/render/software/CanvasPictureWriter.h @@ -1,5 +1,4 @@ -#ifndef CANVASPICTUREWRITER_H -#define CANVASPICTUREWRITER_H +#pragma once #include "software_global.h" @@ -52,5 +51,3 @@ class SOFTWARESHARED_EXPORT CanvasPictureWriter : public PictureWriter { }; } } - -#endif // CANVASPICTUREWRITER_H diff --git a/src/render/software/CanvasPixel.h b/src/render/software/CanvasPixel.h index c61cd6b..34334e8 100644 --- a/src/render/software/CanvasPixel.h +++ b/src/render/software/CanvasPixel.h @@ -1,5 +1,4 @@ -#ifndef CANVASPIXEL_H -#define CANVASPIXEL_H +#pragma once #include "software_global.h" @@ -42,5 +41,3 @@ class SOFTWARESHARED_EXPORT CanvasPixel { }; } } - -#endif // CANVASPIXEL_H diff --git a/src/render/software/CanvasPixelShader.h b/src/render/software/CanvasPixelShader.h index 57a9a0f..d7219be 100644 --- a/src/render/software/CanvasPixelShader.h +++ b/src/render/software/CanvasPixelShader.h @@ -1,5 +1,4 @@ -#ifndef CANVASPIXELSHADER_H -#define CANVASPIXELSHADER_H +#pragma once #include "software_global.h" @@ -33,5 +32,3 @@ class CanvasPixelShader : public ParallelWorker { }; } } - -#endif // CANVASPIXELSHADER_H diff --git a/src/render/software/CanvasPortion.h b/src/render/software/CanvasPortion.h index b1b6323..396d99d 100644 --- a/src/render/software/CanvasPortion.h +++ b/src/render/software/CanvasPortion.h @@ -1,5 +1,4 @@ -#ifndef CANVASPORTION_H -#define CANVASPORTION_H +#pragma once #include "software_global.h" @@ -95,5 +94,3 @@ class SOFTWARESHARED_EXPORT CanvasPortion { }; } } - -#endif // CANVASPORTION_H diff --git a/src/render/software/CanvasPreview.h b/src/render/software/CanvasPreview.h index f59f104..ea0deb0 100644 --- a/src/render/software/CanvasPreview.h +++ b/src/render/software/CanvasPreview.h @@ -1,5 +1,4 @@ -#ifndef CANVASPREVIEW_H -#define CANVASPREVIEW_H +#pragma once #include "software_global.h" @@ -59,5 +58,3 @@ class SOFTWARESHARED_EXPORT CanvasPreview { }; } } - -#endif // CANVASPREVIEW_H diff --git a/src/render/software/CloudBasicLayerRenderer.h b/src/render/software/CloudBasicLayerRenderer.h index 6d3cc78..e9c74dc 100644 --- a/src/render/software/CloudBasicLayerRenderer.h +++ b/src/render/software/CloudBasicLayerRenderer.h @@ -1,5 +1,4 @@ -#ifndef CLOUDBASICLAYERRENDERER_H -#define CLOUDBASICLAYERRENDERER_H +#pragma once #include "software_global.h" @@ -31,5 +30,3 @@ class SOFTWARESHARED_EXPORT CloudBasicLayerRenderer : public BaseCloudLayerRende }; } } - -#endif // CLOUDBASICLAYERRENDERER_H diff --git a/src/render/software/CloudsRenderer.h b/src/render/software/CloudsRenderer.h index 47e2677..3fcf634 100644 --- a/src/render/software/CloudsRenderer.h +++ b/src/render/software/CloudsRenderer.h @@ -1,5 +1,4 @@ -#ifndef CLOUDSRENDERER_H -#define CLOUDSRENDERER_H +#pragma once #include "software_global.h" @@ -88,5 +87,3 @@ class SOFTWARESHARED_EXPORT CloudsRenderer : public LightFilter { }; } } - -#endif // CLOUDSRENDERER_H diff --git a/src/render/software/FluidMediumInterface.h b/src/render/software/FluidMediumInterface.h index 6e6ec0e..e4e328e 100644 --- a/src/render/software/FluidMediumInterface.h +++ b/src/render/software/FluidMediumInterface.h @@ -1,5 +1,4 @@ -#ifndef FLUIDMEDIUMINTERFACE_H -#define FLUIDMEDIUMINTERFACE_H +#pragma once #include "software_global.h" @@ -19,5 +18,3 @@ class SOFTWARESHARED_EXPORT FluidMediumInterface { }; } } - -#endif // FLUIDMEDIUMINTERFACE_H diff --git a/src/render/software/FluidMediumManager.h b/src/render/software/FluidMediumManager.h index d8724b4..b576b8c 100644 --- a/src/render/software/FluidMediumManager.h +++ b/src/render/software/FluidMediumManager.h @@ -1,5 +1,4 @@ -#ifndef FLUIDMEDIUMMANAGER_H -#define FLUIDMEDIUMMANAGER_H +#pragma once #include "software_global.h" @@ -55,5 +54,3 @@ class SOFTWARESHARED_EXPORT FluidMediumManager { }; } } - -#endif // FLUIDMEDIUMTRAVERSAL_H diff --git a/src/render/software/GodRaysResult.h b/src/render/software/GodRaysResult.h index dec3950..1ab78a4 100644 --- a/src/render/software/GodRaysResult.h +++ b/src/render/software/GodRaysResult.h @@ -1,5 +1,4 @@ -#ifndef GODRAYSRESULT_H -#define GODRAYSRESULT_H +#pragma once #include "software_global.h" @@ -34,5 +33,3 @@ class SOFTWARESHARED_EXPORT GodRaysResult { }; } } - -#endif // GODRAYSRESULT_H diff --git a/src/render/software/GodRaysSampler.h b/src/render/software/GodRaysSampler.h index 7fb16f7..b8cae1f 100644 --- a/src/render/software/GodRaysSampler.h +++ b/src/render/software/GodRaysSampler.h @@ -1,5 +1,4 @@ -#ifndef GODRAYSSAMPLER_H -#define GODRAYSSAMPLER_H +#pragma once #include "software_global.h" @@ -126,5 +125,3 @@ class SOFTWARESHARED_EXPORT GodRaysSampler { }; } } - -#endif // GODRAYSSAMPLER_H diff --git a/src/render/software/LightComponent.h b/src/render/software/LightComponent.h index 572c209..03dee40 100644 --- a/src/render/software/LightComponent.h +++ b/src/render/software/LightComponent.h @@ -1,5 +1,4 @@ -#ifndef LIGHTCOMPONENT_H -#define LIGHTCOMPONENT_H +#pragma once #include "software_global.h" @@ -26,5 +25,3 @@ class SOFTWARESHARED_EXPORT LightComponent { }; } } - -#endif // LIGHTCOMPONENT_H diff --git a/src/render/software/LightFilter.h b/src/render/software/LightFilter.h index e8b3943..630863d 100644 --- a/src/render/software/LightFilter.h +++ b/src/render/software/LightFilter.h @@ -1,5 +1,4 @@ -#ifndef LIGHTFILTER_H -#define LIGHTFILTER_H +#pragma once #include "software_global.h" @@ -21,5 +20,3 @@ class SOFTWARESHARED_EXPORT LightFilter { }; } } - -#endif // LIGHTFILTER_H diff --git a/src/render/software/LightSource.h b/src/render/software/LightSource.h index 60b2a2b..2c6a892 100644 --- a/src/render/software/LightSource.h +++ b/src/render/software/LightSource.h @@ -1,5 +1,4 @@ -#ifndef LIGHTSOURCE_H -#define LIGHTSOURCE_H +#pragma once #include "software_global.h" @@ -24,5 +23,3 @@ class SOFTWARESHARED_EXPORT LightSource { }; } } - -#endif // LIGHTSOURCE_H diff --git a/src/render/software/LightStatus.h b/src/render/software/LightStatus.h index acc05d7..f2e9c62 100644 --- a/src/render/software/LightStatus.h +++ b/src/render/software/LightStatus.h @@ -1,5 +1,4 @@ -#ifndef LIGHTSTATUS_H -#define LIGHTSTATUS_H +#pragma once #include "software_global.h" @@ -52,5 +51,3 @@ class SOFTWARESHARED_EXPORT LightStatus { }; } } - -#endif // LIGHTSTATUS_H diff --git a/src/render/software/LightingManager.h b/src/render/software/LightingManager.h index f8772d5..0196916 100644 --- a/src/render/software/LightingManager.h +++ b/src/render/software/LightingManager.h @@ -1,5 +1,4 @@ -#ifndef LIGHTINGMANAGER_H -#define LIGHTINGMANAGER_H +#pragma once #include "software_global.h" @@ -108,5 +107,3 @@ class SOFTWARESHARED_EXPORT LightingManager { }; } } - -#endif // LIGHTINGMANAGER_H diff --git a/src/render/software/MoonRenderer.h b/src/render/software/MoonRenderer.h index 5a79c9b..73e5e30 100644 --- a/src/render/software/MoonRenderer.h +++ b/src/render/software/MoonRenderer.h @@ -1,5 +1,4 @@ -#ifndef MOONRENDERER_H -#define MOONRENDERER_H +#pragma once #include "software_global.h" @@ -36,5 +35,3 @@ class SOFTWARESHARED_EXPORT MoonRenderer : public DefinitionWatcher, public Ligh }; } } - -#endif // MOONRENDERER_H diff --git a/src/render/software/NightSky.h b/src/render/software/NightSky.h index 09cc9b2..e5542da 100644 --- a/src/render/software/NightSky.h +++ b/src/render/software/NightSky.h @@ -1,5 +1,4 @@ -#ifndef NIGHTSKY_H -#define NIGHTSKY_H +#pragma once #include "software_global.h" @@ -35,5 +34,3 @@ class SOFTWARESHARED_EXPORT NightSky : public LightSource { }; } } - -#endif // NIGHTSKY_H diff --git a/src/render/software/OverlayRasterizer.h b/src/render/software/OverlayRasterizer.h index d3ca84a..4b6e1fb 100644 --- a/src/render/software/OverlayRasterizer.h +++ b/src/render/software/OverlayRasterizer.h @@ -1,5 +1,4 @@ -#ifndef OVERLAYRASTERIZER_H -#define OVERLAYRASTERIZER_H +#pragma once #include "software_global.h" @@ -31,5 +30,3 @@ class SOFTWARESHARED_EXPORT OverlayRasterizer : public Rasterizer { }; } } - -#endif // OVERLAYRASTERIZER_H diff --git a/src/render/software/Rasterizer.h b/src/render/software/Rasterizer.h index 8c41163..cb66ba0 100644 --- a/src/render/software/Rasterizer.h +++ b/src/render/software/Rasterizer.h @@ -1,5 +1,4 @@ -#ifndef RASTERIZER_H -#define RASTERIZER_H +#pragma once #include "software_global.h" @@ -102,5 +101,3 @@ class SOFTWARESHARED_EXPORT Rasterizer { }; } } - -#endif // RASTERIZER_H diff --git a/src/render/software/RayCastingManager.h b/src/render/software/RayCastingManager.h index ae9afa6..b8f10a3 100644 --- a/src/render/software/RayCastingManager.h +++ b/src/render/software/RayCastingManager.h @@ -1,5 +1,4 @@ -#ifndef RAYCASTINGMANAGER_H -#define RAYCASTINGMANAGER_H +#pragma once #include "software_global.h" @@ -15,5 +14,3 @@ class SOFTWARESHARED_EXPORT RayCastingManager { }; } } - -#endif // RAYCASTINGMANAGER_H diff --git a/src/render/software/RayCastingResult.h b/src/render/software/RayCastingResult.h index 9008c05..5c99df2 100644 --- a/src/render/software/RayCastingResult.h +++ b/src/render/software/RayCastingResult.h @@ -1,5 +1,4 @@ -#ifndef RAYCASTINGRESULT_H -#define RAYCASTINGRESULT_H +#pragma once #include "software_global.h" @@ -19,5 +18,3 @@ class SOFTWARESHARED_EXPORT RayCastingResult { }; } } - -#endif // RAYCASTINGRESULT_H diff --git a/src/render/software/RenderConfig.h b/src/render/software/RenderConfig.h index 6dbe5a1..dc899df 100644 --- a/src/render/software/RenderConfig.h +++ b/src/render/software/RenderConfig.h @@ -1,5 +1,4 @@ -#ifndef RENDERCONFIG_H -#define RENDERCONFIG_H +#pragma once #include "software_global.h" @@ -17,5 +16,3 @@ class SOFTWARESHARED_EXPORT RenderConfig { }; } } - -#endif // RENDERCONFIG_H diff --git a/src/render/software/RenderProgress.h b/src/render/software/RenderProgress.h index 2602e22..e443e41 100644 --- a/src/render/software/RenderProgress.h +++ b/src/render/software/RenderProgress.h @@ -1,5 +1,4 @@ -#ifndef RENDERPROGRESS_H -#define RENDERPROGRESS_H +#pragma once #include "software_global.h" @@ -62,5 +61,3 @@ class SOFTWARESHARED_EXPORT RenderProgress { }; } } - -#endif // RENDERPROGRESS_H diff --git a/src/render/software/SkyRasterizer.h b/src/render/software/SkyRasterizer.h index 4c31298..d18f423 100644 --- a/src/render/software/SkyRasterizer.h +++ b/src/render/software/SkyRasterizer.h @@ -1,5 +1,4 @@ -#ifndef SKYRASTERIZER_H -#define SKYRASTERIZER_H +#pragma once #include "software_global.h" @@ -25,5 +24,3 @@ class SOFTWARESHARED_EXPORT SkyRasterizer : public Rasterizer { }; } } - -#endif // SKYRASTERIZER_H diff --git a/src/render/software/SoftwareCanvasRenderer.h b/src/render/software/SoftwareCanvasRenderer.h index 397cec9..a3bdf57 100644 --- a/src/render/software/SoftwareCanvasRenderer.h +++ b/src/render/software/SoftwareCanvasRenderer.h @@ -1,5 +1,4 @@ -#ifndef SOFTWARECANVASRENDERER_H -#define SOFTWARECANVASRENDERER_H +#pragma once #include "software_global.h" @@ -131,5 +130,3 @@ class SOFTWARESHARED_EXPORT SoftwareCanvasRenderer : public SoftwareRenderer { }; } } - -#endif // SOFTWARECANVASRENDERER_H diff --git a/src/render/software/SoftwareRenderer.h b/src/render/software/SoftwareRenderer.h index 30a314c..15062ec 100644 --- a/src/render/software/SoftwareRenderer.h +++ b/src/render/software/SoftwareRenderer.h @@ -1,5 +1,4 @@ -#ifndef SOFTWARERENDERER_H -#define SOFTWARERENDERER_H +#pragma once #include "software_global.h" @@ -110,5 +109,3 @@ class SOFTWARESHARED_EXPORT SoftwareRenderer { }; } } - -#endif // SOFTWARERENDERER_H diff --git a/src/render/software/TerrainRasterizer.h b/src/render/software/TerrainRasterizer.h index cd40edd..f3fab3f 100644 --- a/src/render/software/TerrainRasterizer.h +++ b/src/render/software/TerrainRasterizer.h @@ -1,5 +1,4 @@ -#ifndef TERRAINRASTERIZER_H -#define TERRAINRASTERIZER_H +#pragma once #include "software_global.h" @@ -81,5 +80,3 @@ class SOFTWARESHARED_EXPORT TerrainRasterizer : public Rasterizer { }; } } - -#endif // TERRAINRASTERIZER_H diff --git a/src/render/software/TerrainRayWalker.h b/src/render/software/TerrainRayWalker.h index 83598b5..608ce25 100644 --- a/src/render/software/TerrainRayWalker.h +++ b/src/render/software/TerrainRayWalker.h @@ -1,5 +1,4 @@ -#ifndef TERRAINRAYWALKER_H -#define TERRAINRAYWALKER_H +#pragma once #include "software_global.h" @@ -72,5 +71,3 @@ class SOFTWARESHARED_EXPORT TerrainRayWalker { }; } } - -#endif // TERRAINRAYWALKER_H diff --git a/src/render/software/TerrainRenderer.h b/src/render/software/TerrainRenderer.h index a9d1f53..d7e5586 100644 --- a/src/render/software/TerrainRenderer.h +++ b/src/render/software/TerrainRenderer.h @@ -1,5 +1,4 @@ -#ifndef TERRAINRENDERER_H -#define TERRAINRENDERER_H +#pragma once #include "software_global.h" @@ -53,5 +52,3 @@ class SOFTWARESHARED_EXPORT TerrainRenderer : public LightFilter { }; } } - -#endif // TERRAINRENDERER_H diff --git a/src/render/software/TexturesRenderer.h b/src/render/software/TexturesRenderer.h index 80d2532..953ccb5 100644 --- a/src/render/software/TexturesRenderer.h +++ b/src/render/software/TexturesRenderer.h @@ -1,5 +1,4 @@ -#ifndef TEXTURESRENDERER_H -#define TEXTURESRENDERER_H +#pragma once #include "software_global.h" @@ -66,5 +65,3 @@ class SOFTWARESHARED_EXPORT TexturesRenderer { }; } } - -#endif // TEXTURESRENDERER_H diff --git a/src/render/software/VegetationModelRenderer.h b/src/render/software/VegetationModelRenderer.h index 23cdae4..91da23f 100644 --- a/src/render/software/VegetationModelRenderer.h +++ b/src/render/software/VegetationModelRenderer.h @@ -1,5 +1,4 @@ -#ifndef VEGETATIONMODELRENDERER_H -#define VEGETATIONMODELRENDERER_H +#pragma once #include "software_global.h" @@ -38,5 +37,3 @@ class SOFTWARESHARED_EXPORT VegetationModelRenderer : public LightFilter { }; } } - -#endif // VEGETATIONMODELRENDERER_H diff --git a/src/render/software/VegetationRasterizer.h b/src/render/software/VegetationRasterizer.h index 8912d41..f0fde77 100644 --- a/src/render/software/VegetationRasterizer.h +++ b/src/render/software/VegetationRasterizer.h @@ -1,5 +1,4 @@ -#ifndef VEGETATIONRASTERIZER_H -#define VEGETATIONRASTERIZER_H +#pragma once #include "software_global.h" @@ -23,5 +22,3 @@ class SOFTWARESHARED_EXPORT VegetationRasterizer : public TerrainRasterizer { }; } } - -#endif // VEGETATIONRASTERIZER_H diff --git a/src/render/software/VegetationRenderer.h b/src/render/software/VegetationRenderer.h index 8972e4a..18e71bb 100644 --- a/src/render/software/VegetationRenderer.h +++ b/src/render/software/VegetationRenderer.h @@ -1,5 +1,4 @@ -#ifndef VEGETATIONRENDERER_H -#define VEGETATIONRENDERER_H +#pragma once #include "software_global.h" @@ -52,5 +51,3 @@ class SOFTWARESHARED_EXPORT VegetationRenderer : public LightFilter { }; } } - -#endif // VEGETATIONRENDERER_H diff --git a/src/render/software/VegetationResult.h b/src/render/software/VegetationResult.h index 57b2445..b078362 100644 --- a/src/render/software/VegetationResult.h +++ b/src/render/software/VegetationResult.h @@ -1,5 +1,4 @@ -#ifndef VEGETATIONRESULT_H -#define VEGETATIONRESULT_H +#pragma once #include "software_global.h" @@ -38,5 +37,3 @@ class SOFTWARESHARED_EXPORT VegetationResult { }; } } - -#endif // VEGETATIONRESULT_H diff --git a/src/render/software/WaterRasterizer.h b/src/render/software/WaterRasterizer.h index 2b2ff4c..55c17d5 100644 --- a/src/render/software/WaterRasterizer.h +++ b/src/render/software/WaterRasterizer.h @@ -1,5 +1,4 @@ -#ifndef WATERRASTERIZER_H -#define WATERRASTERIZER_H +#pragma once #include "software_global.h" @@ -29,5 +28,3 @@ class WaterRasterizer : public Rasterizer { }; } } - -#endif // WATERRASTERIZER_H diff --git a/src/render/software/WaterRenderer.h b/src/render/software/WaterRenderer.h index 0ce3313..dbb385d 100644 --- a/src/render/software/WaterRenderer.h +++ b/src/render/software/WaterRenderer.h @@ -1,5 +1,4 @@ -#ifndef WATERRENDERER_H -#define WATERRENDERER_H +#pragma once #include "software_global.h" @@ -44,5 +43,3 @@ class SOFTWARESHARED_EXPORT WaterRenderer : public LightFilter { }; } } - -#endif // WATERRENDERER_H diff --git a/src/render/software/clouds/BaseCloudsModel.h b/src/render/software/clouds/BaseCloudsModel.h index efa36ab..a10d4f6 100644 --- a/src/render/software/clouds/BaseCloudsModel.h +++ b/src/render/software/clouds/BaseCloudsModel.h @@ -1,5 +1,4 @@ -#ifndef BASECLOUDSMODEL_H -#define BASECLOUDSMODEL_H +#pragma once #include "../software_global.h" @@ -35,5 +34,3 @@ class SOFTWARESHARED_EXPORT BaseCloudsModel { }; } } - -#endif // BASECLOUDSMODEL_H diff --git a/src/render/software/clouds/CloudModelAltoCumulus.h b/src/render/software/clouds/CloudModelAltoCumulus.h index 306c8cb..f8aa7e8 100644 --- a/src/render/software/clouds/CloudModelAltoCumulus.h +++ b/src/render/software/clouds/CloudModelAltoCumulus.h @@ -1,5 +1,4 @@ -#ifndef CLOUDMODELALTOCUMULUS_H -#define CLOUDMODELALTOCUMULUS_H +#pragma once #include "../software_global.h" @@ -23,5 +22,3 @@ class CloudModelAltoCumulus : public BaseCloudsModel { }; } } - -#endif // CLOUDMODELALTOCUMULUS_H diff --git a/src/render/software/clouds/CloudModelCirrus.h b/src/render/software/clouds/CloudModelCirrus.h index 7b2b56b..e2338e5 100644 --- a/src/render/software/clouds/CloudModelCirrus.h +++ b/src/render/software/clouds/CloudModelCirrus.h @@ -1,5 +1,4 @@ -#ifndef CLOUDMODELCIRRUS_H -#define CLOUDMODELCIRRUS_H +#pragma once #include "../software_global.h" @@ -23,5 +22,3 @@ class CloudModelCirrus : public BaseCloudsModel { }; } } - -#endif // CLOUDMODELCIRRUS_H diff --git a/src/render/software/clouds/CloudModelCumuloNimbus.h b/src/render/software/clouds/CloudModelCumuloNimbus.h index 6d329bc..5db1cb6 100644 --- a/src/render/software/clouds/CloudModelCumuloNimbus.h +++ b/src/render/software/clouds/CloudModelCumuloNimbus.h @@ -1,5 +1,4 @@ -#ifndef CLOUDMODELCUMULONIMBUS_H -#define CLOUDMODELCUMULONIMBUS_H +#pragma once #include "../software_global.h" @@ -23,5 +22,3 @@ class CloudModelCumuloNimbus : public BaseCloudsModel { }; } } - -#endif // CLOUDMODELCUMULONIMBUS_H diff --git a/src/render/software/clouds/CloudModelStratoCumulus.h b/src/render/software/clouds/CloudModelStratoCumulus.h index 027535f..77269b9 100644 --- a/src/render/software/clouds/CloudModelStratoCumulus.h +++ b/src/render/software/clouds/CloudModelStratoCumulus.h @@ -1,5 +1,4 @@ -#ifndef CLOUDMODELSTRATOCUMULUS_H -#define CLOUDMODELSTRATOCUMULUS_H +#pragma once #include "../software_global.h" @@ -23,5 +22,3 @@ class CloudModelStratoCumulus : public BaseCloudsModel { }; } } - -#endif // CLOUDMODELSTRATOCUMULUS_H diff --git a/src/render/software/software_global.h b/src/render/software/software_global.h index e5a3f72..fee1f8a 100644 --- a/src/render/software/software_global.h +++ b/src/render/software/software_global.h @@ -1,5 +1,4 @@ -#ifndef SOFTWARE_GLOBAL_H -#define SOFTWARE_GLOBAL_H +#pragma once #include "definition_global.h" @@ -71,5 +70,3 @@ class CanvasPictureWriter; } using namespace paysages::software; - -#endif // SOFTWARE_GLOBAL_H diff --git a/src/system/CacheFile.h b/src/system/CacheFile.h index b4610d2..01b591b 100644 --- a/src/system/CacheFile.h +++ b/src/system/CacheFile.h @@ -1,5 +1,4 @@ -#ifndef CACHEFILE_H -#define CACHEFILE_H +#pragma once #include "system_global.h" @@ -22,5 +21,3 @@ class SYSTEMSHARED_EXPORT CacheFile { }; } } - -#endif // CACHEFILE_H diff --git a/src/system/DataFile.h b/src/system/DataFile.h index a0ccb7b..9e8dadd 100644 --- a/src/system/DataFile.h +++ b/src/system/DataFile.h @@ -1,5 +1,4 @@ -#ifndef DATAFILE_H -#define DATAFILE_H +#pragma once #include "system_global.h" @@ -37,5 +36,3 @@ class SYSTEMSHARED_EXPORT DataFile { }; } } - -#endif // DATAFILE_H diff --git a/src/system/FileSystem.h b/src/system/FileSystem.h index 5078471..09ac30b 100644 --- a/src/system/FileSystem.h +++ b/src/system/FileSystem.h @@ -1,5 +1,4 @@ -#ifndef FILESYSTEM_H -#define FILESYSTEM_H +#pragma once #include "system_global.h" @@ -29,5 +28,3 @@ class SYSTEMSHARED_EXPORT FileSystem { }; } } - -#endif // FILESYSTEM_H diff --git a/src/system/Logs.h b/src/system/Logs.h index 3a7ba78..1cc5e5b 100644 --- a/src/system/Logs.h +++ b/src/system/Logs.h @@ -1,5 +1,4 @@ -#ifndef LOGS_H -#define LOGS_H +#pragma once #include "system_global.h" @@ -25,5 +24,3 @@ class SYSTEMSHARED_EXPORT Logs { }; } } - -#endif // LOGS_H diff --git a/src/system/Memory.h b/src/system/Memory.h index 904bfcb..efffc0c 100644 --- a/src/system/Memory.h +++ b/src/system/Memory.h @@ -1,5 +1,4 @@ -#ifndef MEMORY_H -#define MEMORY_H +#pragma once #include "system_global.h" @@ -12,5 +11,3 @@ class SYSTEMSHARED_EXPORT Memory { }; } } - -#endif // MEMORY_H diff --git a/src/system/Mutex.h b/src/system/Mutex.h index f004969..7afd576 100644 --- a/src/system/Mutex.h +++ b/src/system/Mutex.h @@ -1,5 +1,4 @@ -#ifndef MUTEX_H -#define MUTEX_H +#pragma once #include "system_global.h" @@ -27,5 +26,3 @@ class SYSTEMSHARED_EXPORT Mutex : private mutex { }; } } - -#endif // MUTEX_H diff --git a/src/system/PackStream.h b/src/system/PackStream.h index 6258996..2b1fa1d 100644 --- a/src/system/PackStream.h +++ b/src/system/PackStream.h @@ -1,5 +1,4 @@ -#ifndef PACKSTREAM_H -#define PACKSTREAM_H +#pragma once #include "system_global.h" @@ -63,5 +62,3 @@ class SYSTEMSHARED_EXPORT PackStream { }; } } - -#endif // PACKSTREAM_H diff --git a/src/system/ParallelPool.h b/src/system/ParallelPool.h index bf5307a..dc0fac7 100644 --- a/src/system/ParallelPool.h +++ b/src/system/ParallelPool.h @@ -1,5 +1,4 @@ -#ifndef PARALLELPOOL_H -#define PARALLELPOOL_H +#pragma once #include "system_global.h" @@ -39,5 +38,3 @@ class SYSTEMSHARED_EXPORT ParallelPool { }; } } - -#endif // PARALLELPOOL_H diff --git a/src/system/ParallelWork.h b/src/system/ParallelWork.h index 85bb51b..65e7de9 100644 --- a/src/system/ParallelWork.h +++ b/src/system/ParallelWork.h @@ -1,5 +1,4 @@ -#ifndef PARALLELWORK_H -#define PARALLELWORK_H +#pragma once #include "system_global.h" @@ -73,5 +72,3 @@ class SYSTEMSHARED_EXPORT ParallelWork { }; } } - -#endif // PARALLELWORK_H diff --git a/src/system/ParallelWorker.h b/src/system/ParallelWorker.h index cb546ff..151d886 100644 --- a/src/system/ParallelWorker.h +++ b/src/system/ParallelWorker.h @@ -1,5 +1,4 @@ -#ifndef PARALLELWORKER_H -#define PARALLELWORKER_H +#pragma once #include "system_global.h" @@ -31,5 +30,3 @@ class SYSTEMSHARED_EXPORT ParallelWorker { }; } } - -#endif // PARALLELWORKER_H diff --git a/src/system/PictureWriter.h b/src/system/PictureWriter.h index 4a9781b..e2e98c8 100644 --- a/src/system/PictureWriter.h +++ b/src/system/PictureWriter.h @@ -1,5 +1,4 @@ -#ifndef PICTUREWRITER_H -#define PICTUREWRITER_H +#pragma once #include "system_global.h" @@ -26,5 +25,3 @@ class SYSTEMSHARED_EXPORT PictureWriter { }; } } - -#endif // PICTUREWRITER_H diff --git a/src/system/RandomGenerator.h b/src/system/RandomGenerator.h index b871a61..a9d0144 100644 --- a/src/system/RandomGenerator.h +++ b/src/system/RandomGenerator.h @@ -1,5 +1,4 @@ -#ifndef RANDOMGENERATOR_H -#define RANDOMGENERATOR_H +#pragma once #include "system_global.h" @@ -30,5 +29,3 @@ class SYSTEMSHARED_EXPORT RandomGenerator { }; } } - -#endif // RANDOMGENERATOR_H diff --git a/src/system/Semaphore.h b/src/system/Semaphore.h index 41771b2..f1a91b4 100644 --- a/src/system/Semaphore.h +++ b/src/system/Semaphore.h @@ -1,5 +1,4 @@ -#ifndef SEMAPHORE_H -#define SEMAPHORE_H +#pragma once #include "system_global.h" @@ -21,5 +20,3 @@ class Semaphore : private QSemaphore { }; } } - -#endif // SEMAPHORE_H diff --git a/src/system/System.h b/src/system/System.h index a23b31d..e4a84fb 100644 --- a/src/system/System.h +++ b/src/system/System.h @@ -1,5 +1,4 @@ -#ifndef SYSTEM_H -#define SYSTEM_H +#pragma once #include "system_global.h" @@ -29,5 +28,3 @@ class SYSTEMSHARED_EXPORT System { #else #define TMP_DIRECTORY "/tmp/" #endif - -#endif // SYSTEM_H diff --git a/src/system/Thread.h b/src/system/Thread.h index d7d4231..b832c3c 100644 --- a/src/system/Thread.h +++ b/src/system/Thread.h @@ -1,5 +1,4 @@ -#ifndef THREAD_H -#define THREAD_H +#pragma once #include "system_global.h" #include @@ -63,5 +62,3 @@ class SYSTEMSHARED_EXPORT Thread : private QThread { }; } } - -#endif // THREAD_H diff --git a/src/system/Timing.h b/src/system/Timing.h index ac44e0e..9fb67f2 100644 --- a/src/system/Timing.h +++ b/src/system/Timing.h @@ -1,5 +1,4 @@ -#ifndef TIMING_H -#define TIMING_H +#pragma once #include "system_global.h" @@ -18,5 +17,3 @@ class SYSTEMSHARED_EXPORT Timing { }; } } - -#endif // TIME_H diff --git a/src/system/system_global.h b/src/system/system_global.h index b8eb375..926adaa 100644 --- a/src/system/system_global.h +++ b/src/system/system_global.h @@ -1,5 +1,4 @@ -#ifndef SYSTEM_GLOBAL_H -#define SYSTEM_GLOBAL_H +#pragma once #if defined(__MINGW32__) || defined(_WIN32) #define DECL_EXPORT __declspec(dllexport) @@ -46,5 +45,3 @@ using namespace std; #define floor_to_int(_x_) (static_cast(floor(_x_))) #define ceil_to_int(_x_) (static_cast(ceil(_x_))) #define to_size(_x_) (static_cast(_x_)) - -#endif // SYSTEM_GLOBAL_H diff --git a/src/tests/BaseTestCase.h b/src/tests/BaseTestCase.h index c58ed66..28bf6f3 100644 --- a/src/tests/BaseTestCase.h +++ b/src/tests/BaseTestCase.h @@ -1,5 +1,4 @@ -#ifndef BASETESTCASE_H -#define BASETESTCASE_H +#pragma once #include "gtest/gtest.h" @@ -41,5 +40,3 @@ ASSERT_NEAR(_expected_, (_state_)->get(_name_)->getFloatValue(), 0.000001) class BaseTestCase : public ::testing::Test {}; - -#endif // BASETESTCASE_H