Browse Source

Primitives: exclude trivial deprecated APIs from code coverage.

Back at 100% coverage.
pull/233/head
Vladimír Vondruš 8 years ago
parent
commit
7cd44c1437
  1. 2
      src/Magnum/Primitives/Capsule.cpp
  2. 2
      src/Magnum/Primitives/Circle.cpp
  3. 2
      src/Magnum/Primitives/Crosshair.cpp
  4. 2
      src/Magnum/Primitives/Cube.cpp
  5. 2
      src/Magnum/Primitives/Cylinder.cpp
  6. 2
      src/Magnum/Primitives/Icosphere.cpp
  7. 2
      src/Magnum/Primitives/Line.cpp
  8. 2
      src/Magnum/Primitives/Plane.cpp
  9. 2
      src/Magnum/Primitives/Square.cpp
  10. 2
      src/Magnum/Primitives/UVSphere.cpp

2
src/Magnum/Primitives/Capsule.cpp

@ -152,6 +152,7 @@ Trade::MeshData3D capsule3DWireframe(const UnsignedInt hemisphereRings, const Un
}
#ifdef MAGNUM_BUILD_DEPRECATED
/* LCOV_EXCL_START */
Trade::MeshData2D Capsule2D::wireframe(const UnsignedInt hemisphereRings, const UnsignedInt cylinderRings, const Float halfLength) {
return capsule2DWireframe(hemisphereRings, cylinderRings, halfLength);
}
@ -163,6 +164,7 @@ Trade::MeshData3D Capsule3D::solid(const UnsignedInt hemisphereRings, const Unsi
Trade::MeshData3D Capsule3D::wireframe(const UnsignedInt hemisphereRings, const UnsignedInt cylinderRings, const UnsignedInt segments, const Float halfLength) {
return capsule3DWireframe(hemisphereRings, cylinderRings, segments, halfLength);
}
/* LCOV_EXCL_STOP */
#endif
}}

2
src/Magnum/Primitives/Circle.cpp

@ -113,6 +113,7 @@ Trade::MeshData3D circle3DWireframe(const UnsignedInt segments) {
}
#ifdef MAGNUM_BUILD_DEPRECATED
/* LCOV_EXCL_START */
Trade::MeshData2D Circle::solid(const UnsignedInt segments) {
return circle2DSolid(segments);
}
@ -120,6 +121,7 @@ Trade::MeshData2D Circle::solid(const UnsignedInt segments) {
Trade::MeshData2D Circle::wireframe(const UnsignedInt segments) {
return circle2DWireframe(segments);
}
/* LCOV_EXCL_STOP */
#endif
}}

2
src/Magnum/Primitives/Crosshair.cpp

@ -48,6 +48,7 @@ Trade::MeshData3D crosshair3D() {
}
#ifdef MAGNUM_BUILD_DEPRECATED
/* LCOV_EXCL_START */
Trade::MeshData2D Crosshair2D::wireframe() {
return crosshair2D();
}
@ -55,6 +56,7 @@ Trade::MeshData2D Crosshair2D::wireframe() {
Trade::MeshData3D Crosshair3D::wireframe() {
return crosshair3D();
}
/* LCOV_EXCL_STOP */
#endif
}}

2
src/Magnum/Primitives/Cube.cpp

@ -164,6 +164,7 @@ Trade::MeshData3D cubeWireframe() {
}
#ifdef MAGNUM_BUILD_DEPRECATED
/* LCOV_EXCL_START */
Trade::MeshData3D Cube::solid() {
return cubeSolid();
}
@ -175,6 +176,7 @@ Trade::MeshData3D Cube::solidStrip() {
Trade::MeshData3D Cube::wireframe() {
return cubeWireframe();
}
/* LCOV_EXCL_STOP */
#endif
}}

2
src/Magnum/Primitives/Cylinder.cpp

@ -86,6 +86,7 @@ Trade::MeshData3D cylinderWireframe(const UnsignedInt rings, const UnsignedInt s
}
#ifdef MAGNUM_BUILD_DEPRECATED
/* LCOV_EXCL_START */
Trade::MeshData3D Cylinder::solid(const UnsignedInt rings, const UnsignedInt segments, const Float halfLength, const CylinderFlags flags) {
return cylinderSolid(rings, segments, halfLength, flags);
}
@ -93,6 +94,7 @@ Trade::MeshData3D Cylinder::solid(const UnsignedInt rings, const UnsignedInt seg
Trade::MeshData3D Cylinder::wireframe(const UnsignedInt rings, const UnsignedInt segments, const Float halfLength) {
return cylinderWireframe(rings, segments, halfLength);
}
/* LCOV_EXCL_STOP */
#endif
}}

2
src/Magnum/Primitives/Icosphere.cpp

@ -85,9 +85,11 @@ Trade::MeshData3D icosphereSolid(const UnsignedInt subdivisions) {
}
#ifdef MAGNUM_BUILD_DEPRECATED
/* LCOV_EXCL_START */
Trade::MeshData3D Icosphere::solid(const UnsignedInt subdivisions) {
return icosphereSolid(subdivisions);
}
/* LCOV_EXCL_STOP */
#endif
}}

2
src/Magnum/Primitives/Line.cpp

@ -45,6 +45,7 @@ Trade::MeshData3D line3D() {
}
#ifdef MAGNUM_BUILD_DEPRECATED
/* LCOV_EXCL_START */
Trade::MeshData2D Line2D::wireframe() {
return line2D();
}
@ -52,6 +53,7 @@ Trade::MeshData2D Line2D::wireframe() {
Trade::MeshData3D Line3D::wireframe() {
return line3D();
}
/* LCOV_EXCL_STOP */
#endif
}}

2
src/Magnum/Primitives/Plane.cpp

@ -63,6 +63,7 @@ Trade::MeshData3D planeWireframe() {
}
#ifdef MAGNUM_BUILD_DEPRECATED
/* LCOV_EXCL_START */
Trade::MeshData3D Plane::solid(const PlaneTextureCoords textureCoords) {
return planeSolid(textureCoords);
}
@ -70,6 +71,7 @@ Trade::MeshData3D Plane::solid(const PlaneTextureCoords textureCoords) {
Trade::MeshData3D Plane::wireframe() {
return planeWireframe();
}
/* LCOV_EXCL_STOP */
#endif
}}

2
src/Magnum/Primitives/Square.cpp

@ -58,6 +58,7 @@ Trade::MeshData2D squareWireframe() {
}
#ifdef MAGNUM_BUILD_DEPRECATED
/* LCOV_EXCL_START */
Trade::MeshData2D Square::solid(const SquareTextureCoords textureCoords) {
return squareSolid(textureCoords);
}
@ -65,6 +66,7 @@ Trade::MeshData2D Square::solid(const SquareTextureCoords textureCoords) {
Trade::MeshData2D Square::wireframe() {
return squareWireframe();
}
/* LCOV_EXCL_STOP */
#endif
}}

2
src/Magnum/Primitives/UVSphere.cpp

@ -78,6 +78,7 @@ Trade::MeshData3D uvSphereWireframe(const UnsignedInt rings, const UnsignedInt s
}
#ifdef MAGNUM_BUILD_DEPRECATED
/* LCOV_EXCL_START */
Trade::MeshData3D UVSphere::solid(const UnsignedInt rings, const UnsignedInt segments, const UVSphereTextureCoords textureCoords) {
return uvSphereSolid(rings, segments, textureCoords);
}
@ -85,6 +86,7 @@ Trade::MeshData3D UVSphere::solid(const UnsignedInt rings, const UnsignedInt seg
Trade::MeshData3D UVSphere::wireframe(const UnsignedInt rings, const UnsignedInt segments) {
return uvSphereWireframe(rings, segments);
}
/* LCOV_EXCL_STOP */
#endif
}}

Loading…
Cancel
Save