ic
/
magnum
mirror of https://github.com/mosra/magnum.git
6
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Removed Doxygen workarounds for forward declarations.

pull/23/head
Vladimír Vondruš 13 years ago
parent
13d5e2a50f
commit
ac3fe7cdf5
8 changed files with 3 additions and 28 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 3
      src/DebugTools/DebugTools.h
  2. 3
      src/DebugTools/ShapeRenderer.h
  3. 9
      src/Magnum.h
  4. 3
      src/Math/Math.h
  5. 3
      src/SceneGraph/SceneGraph.h
  6. 4
      src/Shaders/Shaders.h
  7. 3
      src/Shapes/Shapes.h
  8. 3
      src/Trade/Trade.h

3
src/DebugTools/DebugTools.h
Unescape View File

@ -32,8 +32,6 @@
namespace Magnum { namespace DebugTools { namespace Magnum { namespace DebugTools {
/** @todoc Remove `ifndef` when Doxygen is sane again */
#ifndef DOXYGEN_GENERATING_OUTPUT
template<UnsignedInt> class ForceRenderer; template<UnsignedInt> class ForceRenderer;
typedef ForceRenderer<2> ForceRenderer2D; typedef ForceRenderer<2> ForceRenderer2D;
typedef ForceRenderer<3> ForceRenderer3D; typedef ForceRenderer<3> ForceRenderer3D;
@ -51,7 +49,6 @@ template<UnsignedInt> class ShapeRenderer;
typedef ShapeRenderer<2> ShapeRenderer2D; typedef ShapeRenderer<2> ShapeRenderer2D;
typedef ShapeRenderer<3> ShapeRenderer3D; typedef ShapeRenderer<3> ShapeRenderer3D;
class ShapeRendererOptions; class ShapeRendererOptions;
#endif
}} }}

3
src/DebugTools/ShapeRenderer.h
Unescape View File

@ -38,10 +38,7 @@
namespace Magnum { namespace DebugTools { namespace Magnum { namespace DebugTools {
/** @todoc Remove `ifndef` when Doxygen is sane again */
#ifndef DOXYGEN_GENERATING_OUTPUT
template<UnsignedInt> class ShapeRenderer; template<UnsignedInt> class ShapeRenderer;
#endif
namespace Implementation { namespace Implementation {
template<UnsignedInt> class AbstractShapeRenderer; template<UnsignedInt> class AbstractShapeRenderer;

9
src/Magnum.h
Unescape View File

@ -40,11 +40,11 @@ typedef unsigned int GLenum; /* Needed for *Format and *Type enums */
namespace Magnum { namespace Magnum {
/** @todoc Remove `ifndef` when Doxygen is sane again */
#ifndef DOXYGEN_GENERATING_OUTPUT
namespace Math { namespace Math {
template<class T> struct Constants; template<class T> struct Constants;
/** @todoc Remove `ifndef` when Doxygen is able to handle operator"" */
#ifndef DOXYGEN_GENERATING_OUTPUT
#ifndef CORRADE_GCC46_COMPATIBILITY #ifndef CORRADE_GCC46_COMPATIBILITY
#ifndef MAGNUM_TARGET_GLES #ifndef MAGNUM_TARGET_GLES
constexpr Rad<Double> operator "" _rad(long double); constexpr Rad<Double> operator "" _rad(long double);
@ -53,6 +53,7 @@ namespace Math {
constexpr Rad<Float> operator "" _radf(long double); constexpr Rad<Float> operator "" _radf(long double);
constexpr Deg<Float> operator "" _degf(long double); constexpr Deg<Float> operator "" _degf(long double);
#endif #endif
#endif
} }
/* Bring whole Corrade namespace */ /* Bring whole Corrade namespace */
@ -62,7 +63,6 @@ using namespace Corrade;
using Corrade::Utility::Debug; using Corrade::Utility::Debug;
using Corrade::Utility::Warning; using Corrade::Utility::Warning;
using Corrade::Utility::Error; using Corrade::Utility::Error;
#endif
#ifdef DOXYGEN_GENERATING_OUTPUT #ifdef DOXYGEN_GENERATING_OUTPUT
@ -321,8 +321,6 @@ using Math::operator "" _degf;
using Math::operator "" _radf; using Math::operator "" _radf;
#endif #endif
/** @todoc Remove `ifndef` when Doxygen is sane again */
#ifndef DOXYGEN_GENERATING_OUTPUT
/* Forward declarations for all types in root namespace */ /* Forward declarations for all types in root namespace */
/* FramebufferClear[Mask], FramebufferBlit[Mask], FramebufferBlitFilter, /* FramebufferClear[Mask], FramebufferBlit[Mask], FramebufferBlitFilter,
@ -416,7 +414,6 @@ typedef Texture<3> Texture3D;
enum class TextureFormat: GLenum; enum class TextureFormat: GLenum;
class Timeline; class Timeline;
#endif
} }

3
src/Math/Math.h
Unescape View File

@ -34,8 +34,6 @@ namespace Magnum { namespace Math {
/** @todo Denormals to zero */ /** @todo Denormals to zero */
/** @todoc Remove `ifndef` when Doxygen is sane again */
#ifndef DOXYGEN_GENERATING_OUTPUT
/* Class Constants used only statically */ /* Class Constants used only statically */
template<class> class Complex; template<class> class Complex;
@ -63,7 +61,6 @@ template<class> class Vector4;
namespace Geometry { namespace Geometry {
template<class> class Rectangle; template<class> class Rectangle;
} }
#endif
}} }}

3
src/SceneGraph/SceneGraph.h
Unescape View File

@ -34,8 +34,6 @@
namespace Magnum { namespace SceneGraph { namespace Magnum { namespace SceneGraph {
/** @todoc remove when doxygen is sane again */
#ifndef DOXYGEN_GENERATING_OUTPUT
enum class AspectRatioPolicy: UnsignedByte; enum class AspectRatioPolicy: UnsignedByte;
template<UnsignedInt, class> class AbstractCamera; template<UnsignedInt, class> class AbstractCamera;
@ -181,7 +179,6 @@ typedef BasicRigidMatrixTransformation2D<Float> RigidMatrixTransformation2D;
typedef BasicRigidMatrixTransformation3D<Float> RigidMatrixTransformation3D; typedef BasicRigidMatrixTransformation3D<Float> RigidMatrixTransformation3D;
template<class Transformation> class Scene; template<class Transformation> class Scene;
#endif
}} }}

4
src/Shaders/Shaders.h
Unescape View File

@ -32,9 +32,6 @@
namespace Magnum { namespace Shaders { namespace Magnum { namespace Shaders {
/** @todoc remove when doxygen is sane again */
#ifndef DOXYGEN_GENERATING_OUTPUT
template<UnsignedInt> class DistanceFieldVector; template<UnsignedInt> class DistanceFieldVector;
typedef DistanceFieldVector<2> DistanceFieldVector2D; typedef DistanceFieldVector<2> DistanceFieldVector2D;
typedef DistanceFieldVector<3> DistanceFieldVector3D; typedef DistanceFieldVector<3> DistanceFieldVector3D;
@ -57,7 +54,6 @@ typedef Vector<3> Vector3D;
template<UnsignedInt> class VertexColor; template<UnsignedInt> class VertexColor;
typedef VertexColor<2> VertexColor2D; typedef VertexColor<2> VertexColor2D;
typedef VertexColor<3> VertexColor3D; typedef VertexColor<3> VertexColor3D;
#endif
}} }}

3
src/Shapes/Shapes.h
Unescape View File

@ -32,8 +32,6 @@
namespace Magnum { namespace Shapes { namespace Magnum { namespace Shapes {
/** @todoc remove when doxygen is sane again */
#ifndef DOXYGEN_GENERATING_OUTPUT
template<UnsignedInt> class AbstractShape; template<UnsignedInt> class AbstractShape;
typedef AbstractShape<2> AbstractShape2D; typedef AbstractShape<2> AbstractShape2D;
typedef AbstractShape<3> AbstractShape3D; typedef AbstractShape<3> AbstractShape3D;
@ -75,7 +73,6 @@ typedef ShapeGroup<3> ShapeGroup3D;
template<UnsignedInt> class Sphere; template<UnsignedInt> class Sphere;
typedef Sphere<2> Sphere2D; typedef Sphere<2> Sphere2D;
typedef Sphere<3> Sphere3D; typedef Sphere<3> Sphere3D;
#endif
class Plane; class Plane;

3
src/Trade/Trade.h
Unescape View File

@ -32,8 +32,6 @@
namespace Magnum { namespace Trade { namespace Magnum { namespace Trade {
/** @todoc Remove `ifndef` when Doxygen is sane again */
#ifndef DOXYGEN_GENERATING_OUTPUT
class AbstractImageConverter; class AbstractImageConverter;
class AbstractImporter; class AbstractImporter;
class AbstractMaterialData; class AbstractMaterialData;
@ -54,7 +52,6 @@ class ObjectData3D;
class PhongMaterialData; class PhongMaterialData;
class TextureData; class TextureData;
class SceneData; class SceneData;
#endif
}} }}

Write Preview
Loading…
Cancel
Save