From ac3fe7cdf52978cece193ec64ec2b814bed52d3b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Sat, 24 Aug 2013 22:14:47 +0200 Subject: [PATCH] Removed Doxygen workarounds for forward declarations. --- src/DebugTools/DebugTools.h | 3 --- src/DebugTools/ShapeRenderer.h | 3 --- src/Magnum.h | 9 +++------ src/Math/Math.h | 3 --- src/SceneGraph/SceneGraph.h | 3 --- src/Shaders/Shaders.h | 4 ---- src/Shapes/Shapes.h | 3 --- src/Trade/Trade.h | 3 --- 8 files changed, 3 insertions(+), 28 deletions(-) diff --git a/src/DebugTools/DebugTools.h b/src/DebugTools/DebugTools.h index 64f42a4e1..3fee8ab9a 100644 --- a/src/DebugTools/DebugTools.h +++ b/src/DebugTools/DebugTools.h @@ -32,8 +32,6 @@ namespace Magnum { namespace DebugTools { -/** @todoc Remove `ifndef` when Doxygen is sane again */ -#ifndef DOXYGEN_GENERATING_OUTPUT template class ForceRenderer; typedef ForceRenderer<2> ForceRenderer2D; typedef ForceRenderer<3> ForceRenderer3D; @@ -51,7 +49,6 @@ template class ShapeRenderer; typedef ShapeRenderer<2> ShapeRenderer2D; typedef ShapeRenderer<3> ShapeRenderer3D; class ShapeRendererOptions; -#endif }} diff --git a/src/DebugTools/ShapeRenderer.h b/src/DebugTools/ShapeRenderer.h index dc94c8298..272b9d0ff 100644 --- a/src/DebugTools/ShapeRenderer.h +++ b/src/DebugTools/ShapeRenderer.h @@ -38,10 +38,7 @@ namespace Magnum { namespace DebugTools { -/** @todoc Remove `ifndef` when Doxygen is sane again */ -#ifndef DOXYGEN_GENERATING_OUTPUT template class ShapeRenderer; -#endif namespace Implementation { template class AbstractShapeRenderer; diff --git a/src/Magnum.h b/src/Magnum.h index 231a93807..815753ee7 100644 --- a/src/Magnum.h +++ b/src/Magnum.h @@ -40,11 +40,11 @@ typedef unsigned int GLenum; /* Needed for *Format and *Type enums */ namespace Magnum { -/** @todoc Remove `ifndef` when Doxygen is sane again */ -#ifndef DOXYGEN_GENERATING_OUTPUT namespace Math { template struct Constants; + /** @todoc Remove `ifndef` when Doxygen is able to handle operator"" */ + #ifndef DOXYGEN_GENERATING_OUTPUT #ifndef CORRADE_GCC46_COMPATIBILITY #ifndef MAGNUM_TARGET_GLES constexpr Rad operator "" _rad(long double); @@ -53,6 +53,7 @@ namespace Math { constexpr Rad operator "" _radf(long double); constexpr Deg operator "" _degf(long double); #endif + #endif } /* Bring whole Corrade namespace */ @@ -62,7 +63,6 @@ using namespace Corrade; using Corrade::Utility::Debug; using Corrade::Utility::Warning; using Corrade::Utility::Error; -#endif #ifdef DOXYGEN_GENERATING_OUTPUT @@ -321,8 +321,6 @@ using Math::operator "" _degf; using Math::operator "" _radf; #endif -/** @todoc Remove `ifndef` when Doxygen is sane again */ -#ifndef DOXYGEN_GENERATING_OUTPUT /* Forward declarations for all types in root namespace */ /* FramebufferClear[Mask], FramebufferBlit[Mask], FramebufferBlitFilter, @@ -416,7 +414,6 @@ typedef Texture<3> Texture3D; enum class TextureFormat: GLenum; class Timeline; -#endif } diff --git a/src/Math/Math.h b/src/Math/Math.h index 0e11a8b5e..77b237b9a 100644 --- a/src/Math/Math.h +++ b/src/Math/Math.h @@ -34,8 +34,6 @@ namespace Magnum { namespace Math { /** @todo Denormals to zero */ -/** @todoc Remove `ifndef` when Doxygen is sane again */ -#ifndef DOXYGEN_GENERATING_OUTPUT /* Class Constants used only statically */ template class Complex; @@ -63,7 +61,6 @@ template class Vector4; namespace Geometry { template class Rectangle; } -#endif }} diff --git a/src/SceneGraph/SceneGraph.h b/src/SceneGraph/SceneGraph.h index fa5ec383b..c824a4023 100644 --- a/src/SceneGraph/SceneGraph.h +++ b/src/SceneGraph/SceneGraph.h @@ -34,8 +34,6 @@ namespace Magnum { namespace SceneGraph { -/** @todoc remove when doxygen is sane again */ -#ifndef DOXYGEN_GENERATING_OUTPUT enum class AspectRatioPolicy: UnsignedByte; template class AbstractCamera; @@ -181,7 +179,6 @@ typedef BasicRigidMatrixTransformation2D RigidMatrixTransformation2D; typedef BasicRigidMatrixTransformation3D RigidMatrixTransformation3D; template class Scene; -#endif }} diff --git a/src/Shaders/Shaders.h b/src/Shaders/Shaders.h index 0a6591e91..96ee60972 100644 --- a/src/Shaders/Shaders.h +++ b/src/Shaders/Shaders.h @@ -32,9 +32,6 @@ namespace Magnum { namespace Shaders { -/** @todoc remove when doxygen is sane again */ -#ifndef DOXYGEN_GENERATING_OUTPUT - template class DistanceFieldVector; typedef DistanceFieldVector<2> DistanceFieldVector2D; typedef DistanceFieldVector<3> DistanceFieldVector3D; @@ -57,7 +54,6 @@ typedef Vector<3> Vector3D; template class VertexColor; typedef VertexColor<2> VertexColor2D; typedef VertexColor<3> VertexColor3D; -#endif }} diff --git a/src/Shapes/Shapes.h b/src/Shapes/Shapes.h index 057cb7e90..dc292db2e 100644 --- a/src/Shapes/Shapes.h +++ b/src/Shapes/Shapes.h @@ -32,8 +32,6 @@ namespace Magnum { namespace Shapes { -/** @todoc remove when doxygen is sane again */ -#ifndef DOXYGEN_GENERATING_OUTPUT template class AbstractShape; typedef AbstractShape<2> AbstractShape2D; typedef AbstractShape<3> AbstractShape3D; @@ -75,7 +73,6 @@ typedef ShapeGroup<3> ShapeGroup3D; template class Sphere; typedef Sphere<2> Sphere2D; typedef Sphere<3> Sphere3D; -#endif class Plane; diff --git a/src/Trade/Trade.h b/src/Trade/Trade.h index ba82c7a97..33ad440a1 100644 --- a/src/Trade/Trade.h +++ b/src/Trade/Trade.h @@ -32,8 +32,6 @@ namespace Magnum { namespace Trade { -/** @todoc Remove `ifndef` when Doxygen is sane again */ -#ifndef DOXYGEN_GENERATING_OUTPUT class AbstractImageConverter; class AbstractImporter; class AbstractMaterialData; @@ -54,7 +52,6 @@ class ObjectData3D; class PhongMaterialData; class TextureData; class SceneData; -#endif }}