From 231f3277ab9ca1d6852f44336dde6dc43bc0c954 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Fri, 8 Mar 2013 23:16:01 +0100 Subject: [PATCH] Adapted to Corrade changes. Allowing to instantiate Trade::AbstractImporter subclasses directly without plugin manager. --- src/Math/Algorithms/Test/GaussJordanTest.cpp | 4 +- src/Math/Algorithms/Test/GramSchmidtTest.cpp | 4 +- src/Math/Algorithms/Test/SvdTest.cpp | 4 +- src/Math/Geometry/Test/DistanceTest.cpp | 8 +-- src/Math/Geometry/Test/IntersectionTest.cpp | 2 +- src/Math/Geometry/Test/RectangleTest.cpp | 11 +-- src/Math/Test/AngleTest.cpp | 10 +-- src/Math/Test/BoolVectorTest.cpp | 26 +++---- src/Math/Test/ComplexTest.cpp | 42 +++++------ src/Math/Test/ConstantsTest.cpp | 2 +- src/Math/Test/DualComplexTest.cpp | 38 +++++----- src/Math/Test/DualQuaternionTest.cpp | 48 ++++++------- src/Math/Test/DualTest.cpp | 20 +++--- src/Math/Test/FunctionsTest.cpp | 38 +++++----- src/Math/Test/MathTypeTraitsTest.cpp | 4 +- src/Math/Test/Matrix3Test.cpp | 40 +++++------ src/Math/Test/Matrix4Test.cpp | 50 ++++++------- src/Math/Test/MatrixTest.cpp | 24 +++---- src/Math/Test/QuaternionTest.cpp | 60 ++++++++-------- src/Math/Test/RectangularMatrixTest.cpp | 54 +++++++------- src/Math/Test/SwizzleTest.cpp | 8 +-- src/Math/Test/UnitTest.cpp | 16 ++--- src/Math/Test/Vector2Test.cpp | 23 +++--- src/Math/Test/Vector3Test.cpp | 30 ++++---- src/Math/Test/Vector4Test.cpp | 26 +++---- src/Math/Test/VectorTest.cpp | 70 +++++++++---------- src/MeshTools/Test/CleanTest.cpp | 31 ++++---- .../Test/CombineIndexedArraysTest.cpp | 4 +- src/MeshTools/Test/CompressIndicesTest.cpp | 6 +- src/MeshTools/Test/FlipNormalsTest.cpp | 6 +- .../Test/GenerateFlatNormalsTest.cpp | 4 +- src/MeshTools/Test/InterleaveTest.cpp | 12 ++-- src/MeshTools/Test/SubdivideTest.cpp | 4 +- src/MeshTools/Test/TipsifyTest.cpp | 4 +- src/MeshTools/Test/TransformTest.cpp | 8 +-- src/Physics/Test/AbstractShapeTest.cpp | 2 +- src/Physics/Test/AxisAlignedBoxTest.cpp | 4 +- src/Physics/Test/BoxTest.cpp | 2 +- src/Physics/Test/CapsuleTest.cpp | 4 +- src/Physics/Test/LineTest.cpp | 2 +- src/Physics/Test/ObjectShapeTest.cpp | 4 +- src/Physics/Test/PlaneTest.cpp | 6 +- src/Physics/Test/PointTest.cpp | 2 +- src/Physics/Test/ShapeGroupTest.cpp | 4 +- src/Physics/Test/SphereTest.cpp | 10 +-- src/Primitives/Test/CapsuleTest.cpp | 4 +- src/Primitives/Test/CylinderTest.cpp | 4 +- src/Primitives/Test/UVSphereTest.cpp | 4 +- src/SceneGraph/Test/AnimableTest.cpp | 15 ++-- src/SceneGraph/Test/CameraTest.cpp | 16 ++--- .../EuclideanMatrixTransformation2DTest.cpp | 20 +++--- .../EuclideanMatrixTransformation3DTest.cpp | 20 +++--- .../Test/MatrixTransformation2DTest.cpp | 22 +++--- .../Test/MatrixTransformation3DTest.cpp | 22 +++--- src/SceneGraph/Test/ObjectTest.cpp | 18 ++--- src/SceneGraph/Test/SceneTest.cpp | 4 +- src/Test/AbstractImageTest.cpp | 4 +- src/Test/AbstractShaderProgramTest.cpp | 28 ++++---- src/Test/ArrayTest.cpp | 8 +-- src/Test/ColorTest.cpp | 24 +++---- src/Test/MeshTest.cpp | 8 +-- src/Test/ResourceManagerTest.cpp | 16 ++--- src/Test/SwizzleTest.cpp | 6 +- src/TextureTools/Test/AtlasTest.cpp | 8 +-- src/Trade/AbstractImporter.h | 12 ++-- src/Trade/Test/ObjectData2DTest.cpp | 2 +- src/Trade/Test/ObjectData3DTest.cpp | 2 +- 67 files changed, 526 insertions(+), 522 deletions(-) diff --git a/src/Math/Algorithms/Test/GaussJordanTest.cpp b/src/Math/Algorithms/Test/GaussJordanTest.cpp index c2ef7c925..2f1383197 100644 --- a/src/Math/Algorithms/Test/GaussJordanTest.cpp +++ b/src/Math/Algorithms/Test/GaussJordanTest.cpp @@ -31,8 +31,8 @@ typedef RectangularMatrix<4, 4, Float> Matrix4; typedef Vector<4, Float> Vector4; GaussJordanTest::GaussJordanTest() { - addTests(&GaussJordanTest::singular, - &GaussJordanTest::invert); + addTests({&GaussJordanTest::singular, + &GaussJordanTest::invert}); } void GaussJordanTest::singular() { diff --git a/src/Math/Algorithms/Test/GramSchmidtTest.cpp b/src/Math/Algorithms/Test/GramSchmidtTest.cpp index 6af54d4e6..80ad62ab2 100644 --- a/src/Math/Algorithms/Test/GramSchmidtTest.cpp +++ b/src/Math/Algorithms/Test/GramSchmidtTest.cpp @@ -31,8 +31,8 @@ typedef RectangularMatrix<3, 3, Float> Matrix3; typedef Vector<3, Float> Vector3; GramSchmidtTest::GramSchmidtTest() { - addTests(&GramSchmidtTest::orthogonalize, - &GramSchmidtTest::orthonormalize); + addTests({&GramSchmidtTest::orthogonalize, + &GramSchmidtTest::orthonormalize}); } void GramSchmidtTest::orthogonalize() { diff --git a/src/Math/Algorithms/Test/SvdTest.cpp b/src/Math/Algorithms/Test/SvdTest.cpp index b0ccade4d..aebea8cfb 100644 --- a/src/Math/Algorithms/Test/SvdTest.cpp +++ b/src/Math/Algorithms/Test/SvdTest.cpp @@ -50,8 +50,8 @@ constexpr static Matrix5x8d a( static const Vector5d expected(std::sqrt(1248.0), 0.0, 20.0, std::sqrt(384.0), 0.0); SvdTest::SvdTest() { - addTests(&SvdTest::testDouble, - &SvdTest::testFloat); + addTests({&SvdTest::testDouble, + &SvdTest::testFloat}); } void SvdTest::testDouble() { diff --git a/src/Math/Geometry/Test/DistanceTest.cpp b/src/Math/Geometry/Test/DistanceTest.cpp index 2ddf630d2..01053098d 100644 --- a/src/Math/Geometry/Test/DistanceTest.cpp +++ b/src/Math/Geometry/Test/DistanceTest.cpp @@ -36,10 +36,10 @@ typedef Math::Vector3 Vector3; typedef Math::Constants Constants; DistanceTest::DistanceTest() { - addTests(&DistanceTest::linePoint2D, - &DistanceTest::linePoint3D, - &DistanceTest::lineSegmentPoint2D, - &DistanceTest::lineSegmentPoint3D); + addTests({&DistanceTest::linePoint2D, + &DistanceTest::linePoint3D, + &DistanceTest::lineSegmentPoint2D, + &DistanceTest::lineSegmentPoint3D}); } void DistanceTest::linePoint2D() { diff --git a/src/Math/Geometry/Test/IntersectionTest.cpp b/src/Math/Geometry/Test/IntersectionTest.cpp index c9cb17fdb..4004dacf6 100644 --- a/src/Math/Geometry/Test/IntersectionTest.cpp +++ b/src/Math/Geometry/Test/IntersectionTest.cpp @@ -30,7 +30,7 @@ class IntersectionTest: public Corrade::TestSuite::Tester { typedef Math::Vector3 Vector3; IntersectionTest::IntersectionTest() { - addTests(&IntersectionTest::planeLine); + addTests({&IntersectionTest::planeLine}); } void IntersectionTest::planeLine() { diff --git a/src/Math/Geometry/Test/RectangleTest.cpp b/src/Math/Geometry/Test/RectangleTest.cpp index 99eb5e309..1ef1de127 100644 --- a/src/Math/Geometry/Test/RectangleTest.cpp +++ b/src/Math/Geometry/Test/RectangleTest.cpp @@ -37,11 +37,12 @@ typedef Geometry::Rectangle Rectanglei; typedef Vector2 Vector2i; RectangleTest::RectangleTest() { - addTests(&RectangleTest::access, - &RectangleTest::compare, - &RectangleTest::construct, - &RectangleTest::size, - &RectangleTest::debug); + addTests({&RectangleTest::access, + &RectangleTest::compare, + &RectangleTest::construct, + &RectangleTest::size, + + &RectangleTest::debug}); } void RectangleTest::access() { diff --git a/src/Math/Test/AngleTest.cpp b/src/Math/Test/AngleTest.cpp index 5a2817893..9cc2ca081 100644 --- a/src/Math/Test/AngleTest.cpp +++ b/src/Math/Test/AngleTest.cpp @@ -38,12 +38,12 @@ typedef Math::Deg Degd; typedef Math::Rad Radd; AngleTest::AngleTest() { - addTests(&AngleTest::construct, - &AngleTest::literals, - &AngleTest::conversion, + addTests({&AngleTest::construct, + &AngleTest::literals, + &AngleTest::conversion, - &AngleTest::debugDeg, - &AngleTest::debugRad); + &AngleTest::debugDeg, + &AngleTest::debugRad}); } void AngleTest::construct() { diff --git a/src/Math/Test/BoolVectorTest.cpp b/src/Math/Test/BoolVectorTest.cpp index e4440965f..312be39b3 100644 --- a/src/Math/Test/BoolVectorTest.cpp +++ b/src/Math/Test/BoolVectorTest.cpp @@ -50,23 +50,23 @@ static_assert(BoolVector<17>::DataSize == 3, "Improper DataSize"); typedef Math::BoolVector<19> BoolVector19; BoolVectorTest::BoolVectorTest() { - addTests(&BoolVectorTest::constructDefault, - &BoolVectorTest::constructOneValue, - &BoolVectorTest::constructOneElement, - &BoolVectorTest::data, + addTests({&BoolVectorTest::constructDefault, + &BoolVectorTest::constructOneValue, + &BoolVectorTest::constructOneElement, + &BoolVectorTest::data, - &BoolVectorTest::constExpressions, + &BoolVectorTest::constExpressions, - &BoolVectorTest::compare, - &BoolVectorTest::compareUndefined, - &BoolVectorTest::all, - &BoolVectorTest::none, - &BoolVectorTest::any, + &BoolVectorTest::compare, + &BoolVectorTest::compareUndefined, + &BoolVectorTest::all, + &BoolVectorTest::none, + &BoolVectorTest::any, - &BoolVectorTest::bitInverse, - &BoolVectorTest::bitAndOrXor, + &BoolVectorTest::bitInverse, + &BoolVectorTest::bitAndOrXor, - &BoolVectorTest::debug); + &BoolVectorTest::debug}); } void BoolVectorTest::constructDefault() { diff --git a/src/Math/Test/ComplexTest.cpp b/src/Math/Test/ComplexTest.cpp index ec407d53b..7f7bd484a 100644 --- a/src/Math/Test/ComplexTest.cpp +++ b/src/Math/Test/ComplexTest.cpp @@ -55,33 +55,33 @@ class ComplexTest: public Corrade::TestSuite::Tester { }; ComplexTest::ComplexTest() { - addTests(&ComplexTest::construct, - &ComplexTest::constructDefault, - &ComplexTest::constructFromVector, - &ComplexTest::compare, + addTests({&ComplexTest::construct, + &ComplexTest::constructDefault, + &ComplexTest::constructFromVector, + &ComplexTest::compare, - &ComplexTest::constExpressions, + &ComplexTest::constExpressions, - &ComplexTest::addSubtract, - &ComplexTest::negated, - &ComplexTest::multiplyDivideScalar, - &ComplexTest::multiply, + &ComplexTest::addSubtract, + &ComplexTest::negated, + &ComplexTest::multiplyDivideScalar, + &ComplexTest::multiply, - &ComplexTest::dot, - &ComplexTest::dotSelf, - &ComplexTest::length, - &ComplexTest::normalized, + &ComplexTest::dot, + &ComplexTest::dotSelf, + &ComplexTest::length, + &ComplexTest::normalized, - &ComplexTest::conjugated, - &ComplexTest::inverted, - &ComplexTest::invertedNormalized, + &ComplexTest::conjugated, + &ComplexTest::inverted, + &ComplexTest::invertedNormalized, - &ComplexTest::angle, - &ComplexTest::rotation, - &ComplexTest::matrix, - &ComplexTest::transformVector, + &ComplexTest::angle, + &ComplexTest::rotation, + &ComplexTest::matrix, + &ComplexTest::transformVector, - &ComplexTest::debug); + &ComplexTest::debug}); } typedef Math::Deg Deg; diff --git a/src/Math/Test/ConstantsTest.cpp b/src/Math/Test/ConstantsTest.cpp index 7192b2db7..a6e244b89 100644 --- a/src/Math/Test/ConstantsTest.cpp +++ b/src/Math/Test/ConstantsTest.cpp @@ -28,7 +28,7 @@ class ConstantsTest: public Corrade::TestSuite::Tester { }; ConstantsTest::ConstantsTest() { - addTests(&ConstantsTest::constants); + addTests({&ConstantsTest::constants}); } void ConstantsTest::constants() { diff --git a/src/Math/Test/DualComplexTest.cpp b/src/Math/Test/DualComplexTest.cpp index ee292a6ba..025c3d72b 100644 --- a/src/Math/Test/DualComplexTest.cpp +++ b/src/Math/Test/DualComplexTest.cpp @@ -61,31 +61,31 @@ typedef Math::Matrix3 Matrix3; typedef Math::Vector2 Vector2; DualComplexTest::DualComplexTest() { - addTests(&DualComplexTest::construct, - &DualComplexTest::constructDefault, - &DualComplexTest::constructFromVector, + addTests({&DualComplexTest::construct, + &DualComplexTest::constructDefault, + &DualComplexTest::constructFromVector, - &DualComplexTest::constExpressions, + &DualComplexTest::constExpressions, - &DualComplexTest::multiply, + &DualComplexTest::multiply, - &DualComplexTest::lengthSquared, - &DualComplexTest::length, - &DualComplexTest::normalized, + &DualComplexTest::lengthSquared, + &DualComplexTest::length, + &DualComplexTest::normalized, - &DualComplexTest::complexConjugated, - &DualComplexTest::dualConjugated, - &DualComplexTest::conjugated, - &DualComplexTest::inverted, - &DualComplexTest::invertedNormalized, + &DualComplexTest::complexConjugated, + &DualComplexTest::dualConjugated, + &DualComplexTest::conjugated, + &DualComplexTest::inverted, + &DualComplexTest::invertedNormalized, - &DualComplexTest::rotation, - &DualComplexTest::translation, - &DualComplexTest::combinedTransformParts, - &DualComplexTest::matrix, - &DualComplexTest::transformPoint, + &DualComplexTest::rotation, + &DualComplexTest::translation, + &DualComplexTest::combinedTransformParts, + &DualComplexTest::matrix, + &DualComplexTest::transformPoint, - &DualComplexTest::debug); + &DualComplexTest::debug}); } void DualComplexTest::construct() { diff --git a/src/Math/Test/DualQuaternionTest.cpp b/src/Math/Test/DualQuaternionTest.cpp index 7bcbcbccd..fcbe9e021 100644 --- a/src/Math/Test/DualQuaternionTest.cpp +++ b/src/Math/Test/DualQuaternionTest.cpp @@ -59,30 +59,30 @@ typedef Math::Quaternion Quaternion; typedef Math::Vector3 Vector3; DualQuaternionTest::DualQuaternionTest() { - addTests(&DualQuaternionTest::construct, - &DualQuaternionTest::constructDefault, - &DualQuaternionTest::constructFromVector, - - &DualQuaternionTest::constExpressions, - - &DualQuaternionTest::lengthSquared, - &DualQuaternionTest::length, - &DualQuaternionTest::normalized, - - &DualQuaternionTest::quaternionConjugated, - &DualQuaternionTest::dualConjugated, - &DualQuaternionTest::conjugated, - &DualQuaternionTest::inverted, - &DualQuaternionTest::invertedNormalized, - - &DualQuaternionTest::rotation, - &DualQuaternionTest::translation, - &DualQuaternionTest::combinedTransformParts, - &DualQuaternionTest::matrix, - &DualQuaternionTest::transformPoint, - &DualQuaternionTest::transformPointNormalized, - - &DualQuaternionTest::debug); + addTests({&DualQuaternionTest::construct, + &DualQuaternionTest::constructDefault, + &DualQuaternionTest::constructFromVector, + + &DualQuaternionTest::constExpressions, + + &DualQuaternionTest::lengthSquared, + &DualQuaternionTest::length, + &DualQuaternionTest::normalized, + + &DualQuaternionTest::quaternionConjugated, + &DualQuaternionTest::dualConjugated, + &DualQuaternionTest::conjugated, + &DualQuaternionTest::inverted, + &DualQuaternionTest::invertedNormalized, + + &DualQuaternionTest::rotation, + &DualQuaternionTest::translation, + &DualQuaternionTest::combinedTransformParts, + &DualQuaternionTest::matrix, + &DualQuaternionTest::transformPoint, + &DualQuaternionTest::transformPointNormalized, + + &DualQuaternionTest::debug}); } void DualQuaternionTest::construct() { diff --git a/src/Math/Test/DualTest.cpp b/src/Math/Test/DualTest.cpp index e1be57922..74c7588b6 100644 --- a/src/Math/Test/DualTest.cpp +++ b/src/Math/Test/DualTest.cpp @@ -43,20 +43,20 @@ class DualTest: public Corrade::TestSuite::Tester { typedef Math::Dual Dual; DualTest::DualTest() { - addTests(&DualTest::construct, - &DualTest::constructDefault, - &DualTest::compare, + addTests({&DualTest::construct, + &DualTest::constructDefault, + &DualTest::compare, - &DualTest::constExpressions, + &DualTest::constExpressions, - &DualTest::addSubtract, - &DualTest::negated, - &DualTest::multiplyDivide, + &DualTest::addSubtract, + &DualTest::negated, + &DualTest::multiplyDivide, - &DualTest::conjugated, - &DualTest::sqrt, + &DualTest::conjugated, + &DualTest::sqrt, - &DualTest::debug); + &DualTest::debug}); } void DualTest::construct() { diff --git a/src/Math/Test/FunctionsTest.cpp b/src/Math/Test/FunctionsTest.cpp index cfe7b64d4..3551aa338 100644 --- a/src/Math/Test/FunctionsTest.cpp +++ b/src/Math/Test/FunctionsTest.cpp @@ -54,25 +54,25 @@ typedef Math::Vector3 Vector3b; typedef Math::Vector3 Vector3i; FunctionsTest::FunctionsTest() { - addTests(&FunctionsTest::min, - &FunctionsTest::max, - &FunctionsTest::abs, - &FunctionsTest::sqrt, - &FunctionsTest::clamp, - &FunctionsTest::lerp, - &FunctionsTest::normalizeUnsigned, - &FunctionsTest::normalizeSigned, - &FunctionsTest::denormalizeUnsigned, - &FunctionsTest::denormalizeSigned, - &FunctionsTest::renormalizeUnsinged, - &FunctionsTest::renormalizeSinged, - - &FunctionsTest::normalizeTypeDeduction, - - &FunctionsTest::pow, - &FunctionsTest::log, - &FunctionsTest::log2, - &FunctionsTest::trigonometric); + addTests({&FunctionsTest::min, + &FunctionsTest::max, + &FunctionsTest::abs, + &FunctionsTest::sqrt, + &FunctionsTest::clamp, + &FunctionsTest::lerp, + &FunctionsTest::normalizeUnsigned, + &FunctionsTest::normalizeSigned, + &FunctionsTest::denormalizeUnsigned, + &FunctionsTest::denormalizeSigned, + &FunctionsTest::renormalizeUnsinged, + &FunctionsTest::renormalizeSinged, + + &FunctionsTest::normalizeTypeDeduction, + + &FunctionsTest::pow, + &FunctionsTest::log, + &FunctionsTest::log2, + &FunctionsTest::trigonometric}); } void FunctionsTest::min() { diff --git a/src/Math/Test/MathTypeTraitsTest.cpp b/src/Math/Test/MathTypeTraitsTest.cpp index 1f276b3a5..42616fb6e 100644 --- a/src/Math/Test/MathTypeTraitsTest.cpp +++ b/src/Math/Test/MathTypeTraitsTest.cpp @@ -33,8 +33,8 @@ class MathTypeTraitsTest: public Corrade::TestSuite::Tester { }; MathTypeTraitsTest::MathTypeTraitsTest() { - addTests(&MathTypeTraitsTest::equalsIntegral, - &MathTypeTraitsTest::equalsFloatingPoint); + addTests({&MathTypeTraitsTest::equalsIntegral, + &MathTypeTraitsTest::equalsFloatingPoint}); } void MathTypeTraitsTest::equalsIntegral() { diff --git a/src/Math/Test/Matrix3Test.cpp b/src/Math/Test/Matrix3Test.cpp index e34123275..f10efb385 100644 --- a/src/Math/Test/Matrix3Test.cpp +++ b/src/Math/Test/Matrix3Test.cpp @@ -54,26 +54,26 @@ typedef Math::Matrix<2, Float> Matrix2; typedef Math::Vector2 Vector2; Matrix3Test::Matrix3Test() { - addTests(&Matrix3Test::construct, - &Matrix3Test::constructIdentity, - &Matrix3Test::constructZero, - &Matrix3Test::constructConversion, - &Matrix3Test::constructCopy, - - &Matrix3Test::translation, - &Matrix3Test::scaling, - &Matrix3Test::rotation, - &Matrix3Test::reflection, - &Matrix3Test::projection, - &Matrix3Test::fromParts, - &Matrix3Test::rotationScalingPart, - &Matrix3Test::rotationPart, - &Matrix3Test::vectorParts, - &Matrix3Test::invertedEuclidean, - &Matrix3Test::transform, - - &Matrix3Test::debug, - &Matrix3Test::configuration); + addTests({&Matrix3Test::construct, + &Matrix3Test::constructIdentity, + &Matrix3Test::constructZero, + &Matrix3Test::constructConversion, + &Matrix3Test::constructCopy, + + &Matrix3Test::translation, + &Matrix3Test::scaling, + &Matrix3Test::rotation, + &Matrix3Test::reflection, + &Matrix3Test::projection, + &Matrix3Test::fromParts, + &Matrix3Test::rotationScalingPart, + &Matrix3Test::rotationPart, + &Matrix3Test::vectorParts, + &Matrix3Test::invertedEuclidean, + &Matrix3Test::transform, + + &Matrix3Test::debug, + &Matrix3Test::configuration}); } void Matrix3Test::construct() { diff --git a/src/Math/Test/Matrix4Test.cpp b/src/Math/Test/Matrix4Test.cpp index 09894f084..3cd612692 100644 --- a/src/Math/Test/Matrix4Test.cpp +++ b/src/Math/Test/Matrix4Test.cpp @@ -60,31 +60,31 @@ typedef Math::Matrix<3, Float> Matrix3; typedef Math::Vector3 Vector3; Matrix4Test::Matrix4Test() { - addTests(&Matrix4Test::construct, - &Matrix4Test::constructIdentity, - &Matrix4Test::constructZero, - &Matrix4Test::constructConversion, - &Matrix4Test::constructCopy, - - &Matrix4Test::translation, - &Matrix4Test::scaling, - &Matrix4Test::rotation, - &Matrix4Test::rotationX, - &Matrix4Test::rotationY, - &Matrix4Test::rotationZ, - &Matrix4Test::reflection, - &Matrix4Test::orthographicProjection, - &Matrix4Test::perspectiveProjection, - &Matrix4Test::perspectiveProjectionFov, - &Matrix4Test::fromParts, - &Matrix4Test::rotationScalingPart, - &Matrix4Test::rotationPart, - &Matrix4Test::vectorParts, - &Matrix4Test::invertedEuclidean, - &Matrix4Test::transform, - - &Matrix4Test::debug, - &Matrix4Test::configuration); + addTests({&Matrix4Test::construct, + &Matrix4Test::constructIdentity, + &Matrix4Test::constructZero, + &Matrix4Test::constructConversion, + &Matrix4Test::constructCopy, + + &Matrix4Test::translation, + &Matrix4Test::scaling, + &Matrix4Test::rotation, + &Matrix4Test::rotationX, + &Matrix4Test::rotationY, + &Matrix4Test::rotationZ, + &Matrix4Test::reflection, + &Matrix4Test::orthographicProjection, + &Matrix4Test::perspectiveProjection, + &Matrix4Test::perspectiveProjectionFov, + &Matrix4Test::fromParts, + &Matrix4Test::rotationScalingPart, + &Matrix4Test::rotationPart, + &Matrix4Test::vectorParts, + &Matrix4Test::invertedEuclidean, + &Matrix4Test::transform, + + &Matrix4Test::debug, + &Matrix4Test::configuration}); } void Matrix4Test::construct() { diff --git a/src/Math/Test/MatrixTest.cpp b/src/Math/Test/MatrixTest.cpp index 72525cd45..6d5567731 100644 --- a/src/Math/Test/MatrixTest.cpp +++ b/src/Math/Test/MatrixTest.cpp @@ -48,18 +48,18 @@ typedef Vector<4, Int> Vector4i; typedef Vector<3, Float> Vector3; MatrixTest::MatrixTest() { - addTests(&MatrixTest::construct, - &MatrixTest::constructIdentity, - &MatrixTest::constructZero, - &MatrixTest::constructConversion, - &MatrixTest::constructCopy, - - &MatrixTest::trace, - &MatrixTest::ij, - &MatrixTest::determinant, - &MatrixTest::inverted, - &MatrixTest::debug, - &MatrixTest::configuration); + addTests({&MatrixTest::construct, + &MatrixTest::constructIdentity, + &MatrixTest::constructZero, + &MatrixTest::constructConversion, + &MatrixTest::constructCopy, + + &MatrixTest::trace, + &MatrixTest::ij, + &MatrixTest::determinant, + &MatrixTest::inverted, + &MatrixTest::debug, + &MatrixTest::configuration}); } void MatrixTest::construct() { diff --git a/src/Math/Test/QuaternionTest.cpp b/src/Math/Test/QuaternionTest.cpp index 2d4be8a32..b7ba2aad9 100644 --- a/src/Math/Test/QuaternionTest.cpp +++ b/src/Math/Test/QuaternionTest.cpp @@ -66,36 +66,36 @@ typedef Math::Vector3 Vector3; typedef Math::Vector4 Vector4; QuaternionTest::QuaternionTest() { - addTests(&QuaternionTest::construct, - &QuaternionTest::constructDefault, - &QuaternionTest::constructFromVector, - &QuaternionTest::compare, - - &QuaternionTest::constExpressions, - - &QuaternionTest::addSubtract, - &QuaternionTest::negated, - &QuaternionTest::multiplyDivideScalar, - &QuaternionTest::multiply, - - &QuaternionTest::dot, - &QuaternionTest::dotSelf, - &QuaternionTest::length, - &QuaternionTest::normalized, - - &QuaternionTest::conjugated, - &QuaternionTest::inverted, - &QuaternionTest::invertedNormalized, - - &QuaternionTest::rotation, - &QuaternionTest::angle, - &QuaternionTest::matrix, - &QuaternionTest::lerp, - &QuaternionTest::slerp, - &QuaternionTest::transformVector, - &QuaternionTest::transformVectorNormalized, - - &QuaternionTest::debug); + addTests({&QuaternionTest::construct, + &QuaternionTest::constructDefault, + &QuaternionTest::constructFromVector, + &QuaternionTest::compare, + + &QuaternionTest::constExpressions, + + &QuaternionTest::addSubtract, + &QuaternionTest::negated, + &QuaternionTest::multiplyDivideScalar, + &QuaternionTest::multiply, + + &QuaternionTest::dot, + &QuaternionTest::dotSelf, + &QuaternionTest::length, + &QuaternionTest::normalized, + + &QuaternionTest::conjugated, + &QuaternionTest::inverted, + &QuaternionTest::invertedNormalized, + + &QuaternionTest::rotation, + &QuaternionTest::angle, + &QuaternionTest::matrix, + &QuaternionTest::lerp, + &QuaternionTest::slerp, + &QuaternionTest::transformVector, + &QuaternionTest::transformVectorNormalized, + + &QuaternionTest::debug}); } void QuaternionTest::construct() { diff --git a/src/Math/Test/RectangularMatrixTest.cpp b/src/Math/Test/RectangularMatrixTest.cpp index 5782f1635..bfdd0f3b4 100644 --- a/src/Math/Test/RectangularMatrixTest.cpp +++ b/src/Math/Test/RectangularMatrixTest.cpp @@ -64,33 +64,33 @@ typedef Vector<2, Float> Vector2; typedef Vector<2, Int> Vector2i; RectangularMatrixTest::RectangularMatrixTest() { - addTests(&RectangularMatrixTest::construct, - &RectangularMatrixTest::constructDefault, - &RectangularMatrixTest::constructConversion, - &RectangularMatrixTest::constructFromData, - &RectangularMatrixTest::constructFromDiagonal, - &RectangularMatrixTest::constructCopy, - &RectangularMatrixTest::data, - - &RectangularMatrixTest::compare, - - &RectangularMatrixTest::negative, - &RectangularMatrixTest::addSubtract, - &RectangularMatrixTest::multiplyDivide, - &RectangularMatrixTest::multiply, - - &RectangularMatrixTest::transposed, - &RectangularMatrixTest::diagonal, - - &RectangularMatrixTest::sum, - &RectangularMatrixTest::product, - &RectangularMatrixTest::min, - &RectangularMatrixTest::minAbs, - &RectangularMatrixTest::max, - &RectangularMatrixTest::maxAbs, - - &RectangularMatrixTest::debug, - &RectangularMatrixTest::configuration); + addTests({&RectangularMatrixTest::construct, + &RectangularMatrixTest::constructDefault, + &RectangularMatrixTest::constructConversion, + &RectangularMatrixTest::constructFromData, + &RectangularMatrixTest::constructFromDiagonal, + &RectangularMatrixTest::constructCopy, + &RectangularMatrixTest::data, + + &RectangularMatrixTest::compare, + + &RectangularMatrixTest::negative, + &RectangularMatrixTest::addSubtract, + &RectangularMatrixTest::multiplyDivide, + &RectangularMatrixTest::multiply, + + &RectangularMatrixTest::transposed, + &RectangularMatrixTest::diagonal, + + &RectangularMatrixTest::sum, + &RectangularMatrixTest::product, + &RectangularMatrixTest::min, + &RectangularMatrixTest::minAbs, + &RectangularMatrixTest::max, + &RectangularMatrixTest::maxAbs, + + &RectangularMatrixTest::debug, + &RectangularMatrixTest::configuration}); } void RectangularMatrixTest::construct() { diff --git a/src/Math/Test/SwizzleTest.cpp b/src/Math/Test/SwizzleTest.cpp index fd51bdc38..4ce3dfca9 100644 --- a/src/Math/Test/SwizzleTest.cpp +++ b/src/Math/Test/SwizzleTest.cpp @@ -32,10 +32,10 @@ class SwizzleTest: public Corrade::TestSuite::Tester { typedef Vector<4, Int> Vector4i; SwizzleTest::SwizzleTest() { - addTests(&SwizzleTest::components, - &SwizzleTest::constants, - &SwizzleTest::sizes, - &SwizzleTest::constExpressions); + addTests({&SwizzleTest::components, + &SwizzleTest::constants, + &SwizzleTest::sizes, + &SwizzleTest::constExpressions}); } void SwizzleTest::components() { diff --git a/src/Math/Test/UnitTest.cpp b/src/Math/Test/UnitTest.cpp index 347474d53..b575342ed 100644 --- a/src/Math/Test/UnitTest.cpp +++ b/src/Math/Test/UnitTest.cpp @@ -34,14 +34,14 @@ class UnitTest: public Corrade::TestSuite::Tester { }; UnitTest::UnitTest() { - addTests(&UnitTest::construct, - &UnitTest::constructDefault, - &UnitTest::constructConversion, - &UnitTest::compare, - - &UnitTest::negated, - &UnitTest::addSubtract, - &UnitTest::multiplyDivide); + addTests({&UnitTest::construct, + &UnitTest::constructDefault, + &UnitTest::constructConversion, + &UnitTest::compare, + + &UnitTest::negated, + &UnitTest::addSubtract, + &UnitTest::multiplyDivide}); } template struct Sec_; diff --git a/src/Math/Test/Vector2Test.cpp b/src/Math/Test/Vector2Test.cpp index d4936ad48..3367b9814 100644 --- a/src/Math/Test/Vector2Test.cpp +++ b/src/Math/Test/Vector2Test.cpp @@ -43,17 +43,18 @@ typedef Math::Vector2 Vector2; typedef Math::Vector2 Vector2i; Vector2Test::Vector2Test() { - addTests(&Vector2Test::construct, - &Vector2Test::constructDefault, - &Vector2Test::constructOneValue, - &Vector2Test::constructConversion, - &Vector2Test::constructCopy, - - &Vector2Test::access, - &Vector2Test::axes, - &Vector2Test::scales, - &Vector2Test::debug, - &Vector2Test::configuration); + addTests({&Vector2Test::construct, + &Vector2Test::constructDefault, + &Vector2Test::constructOneValue, + &Vector2Test::constructConversion, + &Vector2Test::constructCopy, + + &Vector2Test::access, + &Vector2Test::axes, + &Vector2Test::scales, + + &Vector2Test::debug, + &Vector2Test::configuration}); } void Vector2Test::construct() { diff --git a/src/Math/Test/Vector3Test.cpp b/src/Math/Test/Vector3Test.cpp index e30508de7..b046c9b32 100644 --- a/src/Math/Test/Vector3Test.cpp +++ b/src/Math/Test/Vector3Test.cpp @@ -47,21 +47,21 @@ typedef Math::Vector3 Vector3i; typedef Math::Vector2 Vector2; Vector3Test::Vector3Test() { - addTests(&Vector3Test::construct, - &Vector3Test::constructDefault, - &Vector3Test::constructOneValue, - &Vector3Test::constructParts, - &Vector3Test::constructConversion, - &Vector3Test::constructCopy, - - &Vector3Test::access, - &Vector3Test::cross, - &Vector3Test::axes, - &Vector3Test::scales, - &Vector3Test::twoComponent, - - &Vector3Test::debug, - &Vector3Test::configuration); + addTests({&Vector3Test::construct, + &Vector3Test::constructDefault, + &Vector3Test::constructOneValue, + &Vector3Test::constructParts, + &Vector3Test::constructConversion, + &Vector3Test::constructCopy, + + &Vector3Test::access, + &Vector3Test::cross, + &Vector3Test::axes, + &Vector3Test::scales, + &Vector3Test::twoComponent, + + &Vector3Test::debug, + &Vector3Test::configuration}); } void Vector3Test::construct() { diff --git a/src/Math/Test/Vector4Test.cpp b/src/Math/Test/Vector4Test.cpp index c1496c31f..df5407ff8 100644 --- a/src/Math/Test/Vector4Test.cpp +++ b/src/Math/Test/Vector4Test.cpp @@ -46,19 +46,19 @@ typedef Math::Vector3 Vector3; typedef Math::Vector2 Vector2; Vector4Test::Vector4Test() { - addTests(&Vector4Test::construct, - &Vector4Test::constructDefault, - &Vector4Test::constructOneValue, - &Vector4Test::constructParts, - &Vector4Test::constructConversion, - &Vector4Test::constructCopy, - - &Vector4Test::access, - &Vector4Test::threeComponent, - &Vector4Test::twoComponent, - - &Vector4Test::debug, - &Vector4Test::configuration); + addTests({&Vector4Test::construct, + &Vector4Test::constructDefault, + &Vector4Test::constructOneValue, + &Vector4Test::constructParts, + &Vector4Test::constructConversion, + &Vector4Test::constructCopy, + + &Vector4Test::access, + &Vector4Test::threeComponent, + &Vector4Test::twoComponent, + + &Vector4Test::debug, + &Vector4Test::configuration}); } void Vector4Test::construct() { diff --git a/src/Math/Test/VectorTest.cpp b/src/Math/Test/VectorTest.cpp index 8c364b458..5086c0de8 100644 --- a/src/Math/Test/VectorTest.cpp +++ b/src/Math/Test/VectorTest.cpp @@ -68,41 +68,41 @@ typedef Vector<4, Float> Vector4; typedef Vector<4, Int> Vector4i; VectorTest::VectorTest() { - addTests(&VectorTest::construct, - &VectorTest::constructFromData, - &VectorTest::constructDefault, - &VectorTest::constructOneValue, - &VectorTest::constructOneComponent, - &VectorTest::constructConversion, - &VectorTest::constructCopy, - &VectorTest::data, - - &VectorTest::negative, - &VectorTest::addSubtract, - &VectorTest::multiplyDivide, - &VectorTest::multiplyDivideComponentWise, - - &VectorTest::compare, - &VectorTest::compareComponentWise, - - &VectorTest::dot, - &VectorTest::dotSelf, - &VectorTest::length, - &VectorTest::normalized, - - &VectorTest::sum, - &VectorTest::product, - &VectorTest::min, - &VectorTest::minAbs, - &VectorTest::max, - &VectorTest::maxAbs, - - &VectorTest::projected, - &VectorTest::projectedOntoNormalized, - &VectorTest::angle, - - &VectorTest::debug, - &VectorTest::configuration); + addTests({&VectorTest::construct, + &VectorTest::constructFromData, + &VectorTest::constructDefault, + &VectorTest::constructOneValue, + &VectorTest::constructOneComponent, + &VectorTest::constructConversion, + &VectorTest::constructCopy, + &VectorTest::data, + + &VectorTest::negative, + &VectorTest::addSubtract, + &VectorTest::multiplyDivide, + &VectorTest::multiplyDivideComponentWise, + + &VectorTest::compare, + &VectorTest::compareComponentWise, + + &VectorTest::dot, + &VectorTest::dotSelf, + &VectorTest::length, + &VectorTest::normalized, + + &VectorTest::sum, + &VectorTest::product, + &VectorTest::min, + &VectorTest::minAbs, + &VectorTest::max, + &VectorTest::maxAbs, + + &VectorTest::projected, + &VectorTest::projectedOntoNormalized, + &VectorTest::angle, + + &VectorTest::debug, + &VectorTest::configuration}); } void VectorTest::construct() { diff --git a/src/MeshTools/Test/CleanTest.cpp b/src/MeshTools/Test/CleanTest.cpp index 658c1296f..2e6372fc8 100644 --- a/src/MeshTools/Test/CleanTest.cpp +++ b/src/MeshTools/Test/CleanTest.cpp @@ -24,27 +24,26 @@ class CleanTest: public Corrade::TestSuite::Tester { CleanTest(); void cleanMesh(); +}; + +class Vector1 { + public: + static const std::size_t Size = 1; + typedef Int Type; + + Vector1(): data(0) {} + Vector1(Type i): data(i) {} + Type operator[](std::size_t) const { return data; } + Type& operator[](std::size_t) { return data; } + bool operator==(Vector1 i) const { return i.data == data; } + Vector1 operator-(Vector1 i) const { return data-i.data; } private: - class Vector1 { - public: - static const std::size_t Size = 1; - typedef Int Type; - - Vector1(): data(0) {} - Vector1(Type i): data(i) {} - Type operator[](std::size_t) const { return data; } - Type& operator[](std::size_t) { return data; } - bool operator==(Vector1 i) const { return i.data == data; } - Vector1 operator-(Vector1 i) const { return data-i.data; } - - private: - Type data; - }; + Type data; }; CleanTest::CleanTest() { - addTests(&CleanTest::cleanMesh); + addTests({&CleanTest::cleanMesh}); } void CleanTest::cleanMesh() { diff --git a/src/MeshTools/Test/CombineIndexedArraysTest.cpp b/src/MeshTools/Test/CombineIndexedArraysTest.cpp index ba7356f71..ee704b1c7 100644 --- a/src/MeshTools/Test/CombineIndexedArraysTest.cpp +++ b/src/MeshTools/Test/CombineIndexedArraysTest.cpp @@ -30,8 +30,8 @@ class CombineIndexedArraysTest: public Corrade::TestSuite::Tester { }; CombineIndexedArraysTest::CombineIndexedArraysTest() { - addTests(&CombineIndexedArraysTest::wrongIndexCount, - &CombineIndexedArraysTest::combine); + addTests({&CombineIndexedArraysTest::wrongIndexCount, + &CombineIndexedArraysTest::combine}); } void CombineIndexedArraysTest::wrongIndexCount() { diff --git a/src/MeshTools/Test/CompressIndicesTest.cpp b/src/MeshTools/Test/CompressIndicesTest.cpp index 417f7dda2..f18cfc712 100644 --- a/src/MeshTools/Test/CompressIndicesTest.cpp +++ b/src/MeshTools/Test/CompressIndicesTest.cpp @@ -32,9 +32,9 @@ class CompressIndicesTest: public Corrade::TestSuite::Tester { }; CompressIndicesTest::CompressIndicesTest() { - addTests(&CompressIndicesTest::compressChar, - &CompressIndicesTest::compressShort, - &CompressIndicesTest::compressInt); + addTests({&CompressIndicesTest::compressChar, + &CompressIndicesTest::compressShort, + &CompressIndicesTest::compressInt}); } void CompressIndicesTest::compressChar() { diff --git a/src/MeshTools/Test/FlipNormalsTest.cpp b/src/MeshTools/Test/FlipNormalsTest.cpp index a38a832e7..8cfa4c73f 100644 --- a/src/MeshTools/Test/FlipNormalsTest.cpp +++ b/src/MeshTools/Test/FlipNormalsTest.cpp @@ -31,9 +31,9 @@ class FlipNormalsTest: public Corrade::TestSuite::Tester { }; FlipNormalsTest::FlipNormalsTest() { - addTests(&FlipNormalsTest::wrongIndexCount, - &FlipNormalsTest::flipFaceWinding, - &FlipNormalsTest::flipNormals); + addTests({&FlipNormalsTest::wrongIndexCount, + &FlipNormalsTest::flipFaceWinding, + &FlipNormalsTest::flipNormals}); } void FlipNormalsTest::wrongIndexCount() { diff --git a/src/MeshTools/Test/GenerateFlatNormalsTest.cpp b/src/MeshTools/Test/GenerateFlatNormalsTest.cpp index f476452a1..5859ff549 100644 --- a/src/MeshTools/Test/GenerateFlatNormalsTest.cpp +++ b/src/MeshTools/Test/GenerateFlatNormalsTest.cpp @@ -30,8 +30,8 @@ class GenerateFlatNormalsTest: public Corrade::TestSuite::Tester { }; GenerateFlatNormalsTest::GenerateFlatNormalsTest() { - addTests(&GenerateFlatNormalsTest::wrongIndexCount, - &GenerateFlatNormalsTest::generate); + addTests({&GenerateFlatNormalsTest::wrongIndexCount, + &GenerateFlatNormalsTest::generate}); } void GenerateFlatNormalsTest::wrongIndexCount() { diff --git a/src/MeshTools/Test/InterleaveTest.cpp b/src/MeshTools/Test/InterleaveTest.cpp index fde0b5bd6..4b10121ec 100644 --- a/src/MeshTools/Test/InterleaveTest.cpp +++ b/src/MeshTools/Test/InterleaveTest.cpp @@ -37,12 +37,12 @@ class InterleaveTest: public Corrade::TestSuite::Tester { }; InterleaveTest::InterleaveTest() { - addTests(&InterleaveTest::attributeCount, - &InterleaveTest::attributeCountGaps, - &InterleaveTest::stride, - &InterleaveTest::strideGaps, - &InterleaveTest::write, - &InterleaveTest::writeGaps); + addTests({&InterleaveTest::attributeCount, + &InterleaveTest::attributeCountGaps, + &InterleaveTest::stride, + &InterleaveTest::strideGaps, + &InterleaveTest::write, + &InterleaveTest::writeGaps}); } void InterleaveTest::attributeCount() { diff --git a/src/MeshTools/Test/SubdivideTest.cpp b/src/MeshTools/Test/SubdivideTest.cpp index 72b15c49a..35919bd16 100644 --- a/src/MeshTools/Test/SubdivideTest.cpp +++ b/src/MeshTools/Test/SubdivideTest.cpp @@ -49,8 +49,8 @@ class SubdivideTest: public Corrade::TestSuite::Tester { }; SubdivideTest::SubdivideTest() { - addTests(&SubdivideTest::wrongIndexCount, - &SubdivideTest::subdivide); + addTests({&SubdivideTest::wrongIndexCount, + &SubdivideTest::subdivide}); } void SubdivideTest::wrongIndexCount() { diff --git a/src/MeshTools/Test/TipsifyTest.cpp b/src/MeshTools/Test/TipsifyTest.cpp index 38177e80e..98c32b98b 100644 --- a/src/MeshTools/Test/TipsifyTest.cpp +++ b/src/MeshTools/Test/TipsifyTest.cpp @@ -70,8 +70,8 @@ TipsifyTest::TipsifyTest(): indices{ 16, 17, 18 }, vertexCount(19) { - addTests(&TipsifyTest::buildAdjacency, - &TipsifyTest::tipsify); + addTests({&TipsifyTest::buildAdjacency, + &TipsifyTest::tipsify}); } void TipsifyTest::buildAdjacency() { diff --git a/src/MeshTools/Test/TransformTest.cpp b/src/MeshTools/Test/TransformTest.cpp index 9f5ede231..a0ad8184c 100644 --- a/src/MeshTools/Test/TransformTest.cpp +++ b/src/MeshTools/Test/TransformTest.cpp @@ -34,11 +34,11 @@ class TransformTest: public Corrade::TestSuite::Tester { }; TransformTest::TransformTest() { - addTests(&TransformTest::transformVectors2D, - &TransformTest::transformVectors3D, + addTests({&TransformTest::transformVectors2D, + &TransformTest::transformVectors3D, - &TransformTest::transformPoints2D, - &TransformTest::transformPoints3D); + &TransformTest::transformPoints2D, + &TransformTest::transformPoints3D}); } /* GCC < 4.7 doesn't like constexpr here, don't know why */ diff --git a/src/Physics/Test/AbstractShapeTest.cpp b/src/Physics/Test/AbstractShapeTest.cpp index 575d1d6df..1a44f46a6 100644 --- a/src/Physics/Test/AbstractShapeTest.cpp +++ b/src/Physics/Test/AbstractShapeTest.cpp @@ -28,7 +28,7 @@ class AbstractShapeTest: public Corrade::TestSuite::Tester { }; AbstractShapeTest::AbstractShapeTest() { - addTests(&AbstractShapeTest::debug); + addTests({&AbstractShapeTest::debug}); } void AbstractShapeTest::debug() { diff --git a/src/Physics/Test/AxisAlignedBoxTest.cpp b/src/Physics/Test/AxisAlignedBoxTest.cpp index ec8b0fde4..097c0f704 100644 --- a/src/Physics/Test/AxisAlignedBoxTest.cpp +++ b/src/Physics/Test/AxisAlignedBoxTest.cpp @@ -32,8 +32,8 @@ class AxisAlignedBoxTest: public Corrade::TestSuite::Tester, ShapeTestBase { }; AxisAlignedBoxTest::AxisAlignedBoxTest() { - addTests(&AxisAlignedBoxTest::applyTransformation, - &AxisAlignedBoxTest::collisionPoint); + addTests({&AxisAlignedBoxTest::applyTransformation, + &AxisAlignedBoxTest::collisionPoint}); } void AxisAlignedBoxTest::applyTransformation() { diff --git a/src/Physics/Test/BoxTest.cpp b/src/Physics/Test/BoxTest.cpp index 7c162baee..880f497d6 100644 --- a/src/Physics/Test/BoxTest.cpp +++ b/src/Physics/Test/BoxTest.cpp @@ -28,7 +28,7 @@ class BoxTest: public Corrade::TestSuite::Tester { }; BoxTest::BoxTest() { - addTests(&BoxTest::applyTransformation); + addTests({&BoxTest::applyTransformation}); } void BoxTest::applyTransformation() { diff --git a/src/Physics/Test/CapsuleTest.cpp b/src/Physics/Test/CapsuleTest.cpp index 6d0233a45..88636f4e6 100644 --- a/src/Physics/Test/CapsuleTest.cpp +++ b/src/Physics/Test/CapsuleTest.cpp @@ -31,8 +31,8 @@ class CapsuleTest: public Corrade::TestSuite::Tester, ShapeTestBase { }; CapsuleTest::CapsuleTest() { - addTests(&CapsuleTest::applyTransformation, - &CapsuleTest::collisionPoint); + addTests({&CapsuleTest::applyTransformation, + &CapsuleTest::collisionPoint}); } void CapsuleTest::applyTransformation() { diff --git a/src/Physics/Test/LineTest.cpp b/src/Physics/Test/LineTest.cpp index 31cb982cb..05a2076c7 100644 --- a/src/Physics/Test/LineTest.cpp +++ b/src/Physics/Test/LineTest.cpp @@ -28,7 +28,7 @@ class LineTest: public Corrade::TestSuite::Tester { }; LineTest::LineTest() { - addTests(&LineTest::applyTransformation); + addTests({&LineTest::applyTransformation}); } void LineTest::applyTransformation() { diff --git a/src/Physics/Test/ObjectShapeTest.cpp b/src/Physics/Test/ObjectShapeTest.cpp index 132dc48f4..8e978c813 100644 --- a/src/Physics/Test/ObjectShapeTest.cpp +++ b/src/Physics/Test/ObjectShapeTest.cpp @@ -36,8 +36,8 @@ typedef SceneGraph::Scene> Scene3D; typedef SceneGraph::Object> Object3D; ObjectShapeTest::ObjectShapeTest() { - addTests(&ObjectShapeTest::clean, - &ObjectShapeTest::firstCollision); + addTests({&ObjectShapeTest::clean, + &ObjectShapeTest::firstCollision}); } void ObjectShapeTest::clean() { diff --git a/src/Physics/Test/PlaneTest.cpp b/src/Physics/Test/PlaneTest.cpp index 81d021ada..877c1d01d 100644 --- a/src/Physics/Test/PlaneTest.cpp +++ b/src/Physics/Test/PlaneTest.cpp @@ -31,9 +31,9 @@ class PlaneTest: public Corrade::TestSuite::Tester, ShapeTestBase { }; PlaneTest::PlaneTest() { - addTests(&PlaneTest::applyTransformation, - &PlaneTest::collisionLine, - &PlaneTest::collisionLineSegment); + addTests({&PlaneTest::applyTransformation, + &PlaneTest::collisionLine, + &PlaneTest::collisionLineSegment}); } void PlaneTest::applyTransformation() { diff --git a/src/Physics/Test/PointTest.cpp b/src/Physics/Test/PointTest.cpp index 5a2cbe83f..d751d2b23 100644 --- a/src/Physics/Test/PointTest.cpp +++ b/src/Physics/Test/PointTest.cpp @@ -28,7 +28,7 @@ class PointTest: public Corrade::TestSuite::Tester { }; PointTest::PointTest() { - addTests(&PointTest::applyTransformation); + addTests({&PointTest::applyTransformation}); } void PointTest::applyTransformation() { diff --git a/src/Physics/Test/ShapeGroupTest.cpp b/src/Physics/Test/ShapeGroupTest.cpp index 74189b5ca..c5140db92 100644 --- a/src/Physics/Test/ShapeGroupTest.cpp +++ b/src/Physics/Test/ShapeGroupTest.cpp @@ -31,8 +31,8 @@ class ShapeGroupTest: public Corrade::TestSuite::Tester { }; ShapeGroupTest::ShapeGroupTest() { - addTests(&ShapeGroupTest::copy, - &ShapeGroupTest::reference); + addTests({&ShapeGroupTest::copy, + &ShapeGroupTest::reference}); } void ShapeGroupTest::copy() { diff --git a/src/Physics/Test/SphereTest.cpp b/src/Physics/Test/SphereTest.cpp index 544fc802e..225d31072 100644 --- a/src/Physics/Test/SphereTest.cpp +++ b/src/Physics/Test/SphereTest.cpp @@ -33,11 +33,11 @@ class SphereTest: public Corrade::TestSuite::Tester, ShapeTestBase { }; SphereTest::SphereTest() { - addTests(&SphereTest::applyTransformation, - &SphereTest::collisionPoint, - &SphereTest::collisionLine, - &SphereTest::collisionLineSegment, - &SphereTest::collisionSphere); + addTests({&SphereTest::applyTransformation, + &SphereTest::collisionPoint, + &SphereTest::collisionLine, + &SphereTest::collisionLineSegment, + &SphereTest::collisionSphere}); } void SphereTest::applyTransformation() { diff --git a/src/Primitives/Test/CapsuleTest.cpp b/src/Primitives/Test/CapsuleTest.cpp index d37ae82d9..bebcb9f4e 100644 --- a/src/Primitives/Test/CapsuleTest.cpp +++ b/src/Primitives/Test/CapsuleTest.cpp @@ -35,8 +35,8 @@ class CapsuleTest: public Corrade::TestSuite::Tester { }; CapsuleTest::CapsuleTest() { - addTests(&CapsuleTest::withoutTextureCoords, - &CapsuleTest::withTextureCoords); + addTests({&CapsuleTest::withoutTextureCoords, + &CapsuleTest::withTextureCoords}); } void CapsuleTest::withoutTextureCoords() { diff --git a/src/Primitives/Test/CylinderTest.cpp b/src/Primitives/Test/CylinderTest.cpp index 76cc5562e..351d5e28f 100644 --- a/src/Primitives/Test/CylinderTest.cpp +++ b/src/Primitives/Test/CylinderTest.cpp @@ -32,8 +32,8 @@ class CylinderTest: public Corrade::TestSuite::Tester { }; CylinderTest::CylinderTest() { - addTests(&CylinderTest::withoutAnything, - &CylinderTest::withTextureCoordsAndCaps); + addTests({&CylinderTest::withoutAnything, + &CylinderTest::withTextureCoordsAndCaps}); } void CylinderTest::withoutAnything() { diff --git a/src/Primitives/Test/UVSphereTest.cpp b/src/Primitives/Test/UVSphereTest.cpp index 3ede74162..65ce46088 100644 --- a/src/Primitives/Test/UVSphereTest.cpp +++ b/src/Primitives/Test/UVSphereTest.cpp @@ -32,8 +32,8 @@ class UVSphereTest: public Corrade::TestSuite::Tester { }; UVSphereTest::UVSphereTest() { - addTests(&UVSphereTest::withoutTextureCoords, - &UVSphereTest::withTextureCoords); + addTests({&UVSphereTest::withoutTextureCoords, + &UVSphereTest::withTextureCoords}); } void UVSphereTest::withoutTextureCoords() { diff --git a/src/SceneGraph/Test/AnimableTest.cpp b/src/SceneGraph/Test/AnimableTest.cpp index b7984c849..493a57739 100644 --- a/src/SceneGraph/Test/AnimableTest.cpp +++ b/src/SceneGraph/Test/AnimableTest.cpp @@ -39,13 +39,14 @@ class AnimableTest: public Corrade::TestSuite::Tester { typedef SceneGraph::Object> Object3D; AnimableTest::AnimableTest() { - addTests(&AnimableTest::state, - &AnimableTest::step, - &AnimableTest::duration, - &AnimableTest::repeat, - &AnimableTest::stop, - &AnimableTest::pause, - &AnimableTest::debug); + addTests({&AnimableTest::state, + &AnimableTest::step, + &AnimableTest::duration, + &AnimableTest::repeat, + &AnimableTest::stop, + &AnimableTest::pause, + + &AnimableTest::debug}); } void AnimableTest::state() { diff --git a/src/SceneGraph/Test/CameraTest.cpp b/src/SceneGraph/Test/CameraTest.cpp index 82e47eb8e..6ab6446ff 100644 --- a/src/SceneGraph/Test/CameraTest.cpp +++ b/src/SceneGraph/Test/CameraTest.cpp @@ -46,14 +46,14 @@ typedef SceneGraph::Camera2D<> Camera2D; typedef SceneGraph::Camera3D<> Camera3D; CameraTest::CameraTest() { - addTests(&CameraTest::fixAspectRatio, - &CameraTest::defaultProjection2D, - &CameraTest::defaultProjection3D, - &CameraTest::projectionSize2D, - &CameraTest::projectionSizeOrthographic, - &CameraTest::projectionSizePerspective, - &CameraTest::projectionSizeViewport, - &CameraTest::draw); + addTests({&CameraTest::fixAspectRatio, + &CameraTest::defaultProjection2D, + &CameraTest::defaultProjection3D, + &CameraTest::projectionSize2D, + &CameraTest::projectionSizeOrthographic, + &CameraTest::projectionSizePerspective, + &CameraTest::projectionSizeViewport, + &CameraTest::draw}); } void CameraTest::fixAspectRatio() { diff --git a/src/SceneGraph/Test/EuclideanMatrixTransformation2DTest.cpp b/src/SceneGraph/Test/EuclideanMatrixTransformation2DTest.cpp index 7c8a112a1..0be0e4795 100644 --- a/src/SceneGraph/Test/EuclideanMatrixTransformation2DTest.cpp +++ b/src/SceneGraph/Test/EuclideanMatrixTransformation2DTest.cpp @@ -40,16 +40,16 @@ class EuclideanMatrixTransformation2DTest: public Corrade::TestSuite::Tester { }; EuclideanMatrixTransformation2DTest::EuclideanMatrixTransformation2DTest() { - addTests(&EuclideanMatrixTransformation2DTest::fromMatrix, - &EuclideanMatrixTransformation2DTest::toMatrix, - &EuclideanMatrixTransformation2DTest::compose, - &EuclideanMatrixTransformation2DTest::inverted, - - &EuclideanMatrixTransformation2DTest::setTransformation, - &EuclideanMatrixTransformation2DTest::translate, - &EuclideanMatrixTransformation2DTest::rotate, - &EuclideanMatrixTransformation2DTest::reflect, - &EuclideanMatrixTransformation2DTest::normalizeRotation); + addTests({&EuclideanMatrixTransformation2DTest::fromMatrix, + &EuclideanMatrixTransformation2DTest::toMatrix, + &EuclideanMatrixTransformation2DTest::compose, + &EuclideanMatrixTransformation2DTest::inverted, + + &EuclideanMatrixTransformation2DTest::setTransformation, + &EuclideanMatrixTransformation2DTest::translate, + &EuclideanMatrixTransformation2DTest::rotate, + &EuclideanMatrixTransformation2DTest::reflect, + &EuclideanMatrixTransformation2DTest::normalizeRotation}); } void EuclideanMatrixTransformation2DTest::fromMatrix() { diff --git a/src/SceneGraph/Test/EuclideanMatrixTransformation3DTest.cpp b/src/SceneGraph/Test/EuclideanMatrixTransformation3DTest.cpp index 63d16772e..b3182236b 100644 --- a/src/SceneGraph/Test/EuclideanMatrixTransformation3DTest.cpp +++ b/src/SceneGraph/Test/EuclideanMatrixTransformation3DTest.cpp @@ -40,16 +40,16 @@ class EuclideanMatrixTransformation3DTest: public Corrade::TestSuite::Tester { }; EuclideanMatrixTransformation3DTest::EuclideanMatrixTransformation3DTest() { - addTests(&EuclideanMatrixTransformation3DTest::fromMatrix, - &EuclideanMatrixTransformation3DTest::toMatrix, - &EuclideanMatrixTransformation3DTest::compose, - &EuclideanMatrixTransformation3DTest::inverted, - - &EuclideanMatrixTransformation3DTest::setTransformation, - &EuclideanMatrixTransformation3DTest::translate, - &EuclideanMatrixTransformation3DTest::rotate, - &EuclideanMatrixTransformation3DTest::reflect, - &EuclideanMatrixTransformation3DTest::normalizeRotation); + addTests({&EuclideanMatrixTransformation3DTest::fromMatrix, + &EuclideanMatrixTransformation3DTest::toMatrix, + &EuclideanMatrixTransformation3DTest::compose, + &EuclideanMatrixTransformation3DTest::inverted, + + &EuclideanMatrixTransformation3DTest::setTransformation, + &EuclideanMatrixTransformation3DTest::translate, + &EuclideanMatrixTransformation3DTest::rotate, + &EuclideanMatrixTransformation3DTest::reflect, + &EuclideanMatrixTransformation3DTest::normalizeRotation}); } void EuclideanMatrixTransformation3DTest::fromMatrix() { diff --git a/src/SceneGraph/Test/MatrixTransformation2DTest.cpp b/src/SceneGraph/Test/MatrixTransformation2DTest.cpp index 617743c4b..eca05d982 100644 --- a/src/SceneGraph/Test/MatrixTransformation2DTest.cpp +++ b/src/SceneGraph/Test/MatrixTransformation2DTest.cpp @@ -41,17 +41,17 @@ class MatrixTransformation2DTest: public Corrade::TestSuite::Tester { }; MatrixTransformation2DTest::MatrixTransformation2DTest() { - addTests(&MatrixTransformation2DTest::fromMatrix, - &MatrixTransformation2DTest::toMatrix, - &MatrixTransformation2DTest::compose, - &MatrixTransformation2DTest::inverted, - - &MatrixTransformation2DTest::setTransformation, - &MatrixTransformation2DTest::transform, - &MatrixTransformation2DTest::translate, - &MatrixTransformation2DTest::rotate, - &MatrixTransformation2DTest::scale, - &MatrixTransformation2DTest::reflect); + addTests({&MatrixTransformation2DTest::fromMatrix, + &MatrixTransformation2DTest::toMatrix, + &MatrixTransformation2DTest::compose, + &MatrixTransformation2DTest::inverted, + + &MatrixTransformation2DTest::setTransformation, + &MatrixTransformation2DTest::transform, + &MatrixTransformation2DTest::translate, + &MatrixTransformation2DTest::rotate, + &MatrixTransformation2DTest::scale, + &MatrixTransformation2DTest::reflect}); } void MatrixTransformation2DTest::fromMatrix() { diff --git a/src/SceneGraph/Test/MatrixTransformation3DTest.cpp b/src/SceneGraph/Test/MatrixTransformation3DTest.cpp index 9844869a2..03c037fbb 100644 --- a/src/SceneGraph/Test/MatrixTransformation3DTest.cpp +++ b/src/SceneGraph/Test/MatrixTransformation3DTest.cpp @@ -41,17 +41,17 @@ class MatrixTransformation3DTest: public Corrade::TestSuite::Tester { }; MatrixTransformation3DTest::MatrixTransformation3DTest() { - addTests(&MatrixTransformation3DTest::fromMatrix, - &MatrixTransformation3DTest::toMatrix, - &MatrixTransformation3DTest::compose, - &MatrixTransformation3DTest::inverted, - - &MatrixTransformation3DTest::setTransformation, - &MatrixTransformation3DTest::transform, - &MatrixTransformation3DTest::translate, - &MatrixTransformation3DTest::rotate, - &MatrixTransformation3DTest::scale, - &MatrixTransformation3DTest::reflect); + addTests({&MatrixTransformation3DTest::fromMatrix, + &MatrixTransformation3DTest::toMatrix, + &MatrixTransformation3DTest::compose, + &MatrixTransformation3DTest::inverted, + + &MatrixTransformation3DTest::setTransformation, + &MatrixTransformation3DTest::transform, + &MatrixTransformation3DTest::translate, + &MatrixTransformation3DTest::rotate, + &MatrixTransformation3DTest::scale, + &MatrixTransformation3DTest::reflect}); } void MatrixTransformation3DTest::fromMatrix() { diff --git a/src/SceneGraph/Test/ObjectTest.cpp b/src/SceneGraph/Test/ObjectTest.cpp index 227a387e6..61988025f 100644 --- a/src/SceneGraph/Test/ObjectTest.cpp +++ b/src/SceneGraph/Test/ObjectTest.cpp @@ -54,15 +54,15 @@ class CachingObject: public Object3D, AbstractFeature<3> { }; ObjectTest::ObjectTest() { - addTests(&ObjectTest::parenting, - &ObjectTest::scene, - &ObjectTest::absoluteTransformation, - &ObjectTest::transformations, - &ObjectTest::transformationsRelative, - &ObjectTest::transformationsOrphan, - &ObjectTest::transformationsDuplicate, - &ObjectTest::setClean, - &ObjectTest::bulkSetClean); + addTests({&ObjectTest::parenting, + &ObjectTest::scene, + &ObjectTest::absoluteTransformation, + &ObjectTest::transformations, + &ObjectTest::transformationsRelative, + &ObjectTest::transformationsOrphan, + &ObjectTest::transformationsDuplicate, + &ObjectTest::setClean, + &ObjectTest::bulkSetClean}); } void ObjectTest::parenting() { diff --git a/src/SceneGraph/Test/SceneTest.cpp b/src/SceneGraph/Test/SceneTest.cpp index 1baebacb5..64d9cff35 100644 --- a/src/SceneGraph/Test/SceneTest.cpp +++ b/src/SceneGraph/Test/SceneTest.cpp @@ -32,8 +32,8 @@ typedef SceneGraph::Scene> Scene3D; typedef SceneGraph::Object> Object3D; SceneTest::SceneTest() { - addTests(&SceneTest::transformation, - &SceneTest::parent); + addTests({&SceneTest::transformation, + &SceneTest::parent}); } void SceneTest::transformation() { diff --git a/src/Test/AbstractImageTest.cpp b/src/Test/AbstractImageTest.cpp index 405cf26bf..e2007d9f0 100644 --- a/src/Test/AbstractImageTest.cpp +++ b/src/Test/AbstractImageTest.cpp @@ -29,8 +29,8 @@ class AbstractImageTest: public Corrade::TestSuite::Tester { }; AbstractImageTest::AbstractImageTest() { - addTests(&AbstractImageTest::debugFormat, - &AbstractImageTest::debugType); + addTests({&AbstractImageTest::debugFormat, + &AbstractImageTest::debugType}); } void AbstractImageTest::debugFormat() { diff --git a/src/Test/AbstractShaderProgramTest.cpp b/src/Test/AbstractShaderProgramTest.cpp index 1f8738b55..a7af82851 100644 --- a/src/Test/AbstractShaderProgramTest.cpp +++ b/src/Test/AbstractShaderProgramTest.cpp @@ -40,20 +40,20 @@ class AbstractShaderProgramTest: public Corrade::TestSuite::Tester { }; AbstractShaderProgramTest::AbstractShaderProgramTest() { - addTests(&AbstractShaderProgramTest::attributeScalar, - &AbstractShaderProgramTest::attributeScalarInt, - &AbstractShaderProgramTest::attributeScalarUnsignedInt, - &AbstractShaderProgramTest::attributeScalarDouble, - - &AbstractShaderProgramTest::attributeVector, - &AbstractShaderProgramTest::attributeVectorInt, - &AbstractShaderProgramTest::attributeVectorUnsignedInt, - &AbstractShaderProgramTest::attributeVectorDouble, - &AbstractShaderProgramTest::attributeVector4, - &AbstractShaderProgramTest::attributeVectorBGRA, - - &AbstractShaderProgramTest::attributeMatrix, - &AbstractShaderProgramTest::attributeMatrixDouble); + addTests({&AbstractShaderProgramTest::attributeScalar, + &AbstractShaderProgramTest::attributeScalarInt, + &AbstractShaderProgramTest::attributeScalarUnsignedInt, + &AbstractShaderProgramTest::attributeScalarDouble, + + &AbstractShaderProgramTest::attributeVector, + &AbstractShaderProgramTest::attributeVectorInt, + &AbstractShaderProgramTest::attributeVectorUnsignedInt, + &AbstractShaderProgramTest::attributeVectorDouble, + &AbstractShaderProgramTest::attributeVector4, + &AbstractShaderProgramTest::attributeVectorBGRA, + + &AbstractShaderProgramTest::attributeMatrix, + &AbstractShaderProgramTest::attributeMatrixDouble}); } void AbstractShaderProgramTest::attributeScalar() { diff --git a/src/Test/ArrayTest.cpp b/src/Test/ArrayTest.cpp index eb3fe1da9..8743a9526 100644 --- a/src/Test/ArrayTest.cpp +++ b/src/Test/ArrayTest.cpp @@ -34,10 +34,10 @@ typedef Magnum::Array2D Array2D; typedef Magnum::Array3D Array3D; ArrayTest::ArrayTest() { - addTests(&ArrayTest::construct, - &ArrayTest::constexprConstruct, - &ArrayTest::equality, - &ArrayTest::access); + addTests({&ArrayTest::construct, + &ArrayTest::constexprConstruct, + &ArrayTest::equality, + &ArrayTest::access}); } void ArrayTest::construct() { diff --git a/src/Test/ColorTest.cpp b/src/Test/ColorTest.cpp index d171637d4..e54fbf2ef 100644 --- a/src/Test/ColorTest.cpp +++ b/src/Test/ColorTest.cpp @@ -49,22 +49,22 @@ typedef Magnum::Color3 Color3f; typedef Magnum::Color4 Color4f; ColorTest::ColorTest() { - addTests(&ColorTest::access, + addTests({&ColorTest::access, - &ColorTest::fromHue, - &ColorTest::fromSaturation, - &ColorTest::fromValue, + &ColorTest::fromHue, + &ColorTest::fromSaturation, + &ColorTest::fromValue, - &ColorTest::hue, - &ColorTest::saturation, - &ColorTest::value, + &ColorTest::hue, + &ColorTest::saturation, + &ColorTest::value, - &ColorTest::hsv, - &ColorTest::hsvOverflow, - &ColorTest::hsvAlpha, + &ColorTest::hsv, + &ColorTest::hsvOverflow, + &ColorTest::hsvAlpha, - &ColorTest::debug, - &ColorTest::configuration); + &ColorTest::debug, + &ColorTest::configuration}); } void ColorTest::access() { diff --git a/src/Test/MeshTest.cpp b/src/Test/MeshTest.cpp index f436c305c..8733bf7ca 100644 --- a/src/Test/MeshTest.cpp +++ b/src/Test/MeshTest.cpp @@ -32,10 +32,10 @@ class MeshTest: public Corrade::TestSuite::Tester { }; MeshTest::MeshTest() { - addTests(&MeshTest::debugPrimitive, - &MeshTest::debugIndexType, - &MeshTest::configurationPrimitive, - &MeshTest::configurationIndexType); + addTests({&MeshTest::debugPrimitive, + &MeshTest::debugIndexType, + &MeshTest::configurationPrimitive, + &MeshTest::configurationIndexType}); } void MeshTest::debugPrimitive() { diff --git a/src/Test/ResourceManagerTest.cpp b/src/Test/ResourceManagerTest.cpp index 18f4ed22f..9f1bbe4ff 100644 --- a/src/Test/ResourceManagerTest.cpp +++ b/src/Test/ResourceManagerTest.cpp @@ -62,14 +62,14 @@ class IntResourceLoader: public AbstractResourceLoader { size_t Data::count = 0; ResourceManagerTest::ResourceManagerTest() { - addTests(&ResourceManagerTest::state, - &ResourceManagerTest::stateFallback, - &ResourceManagerTest::stateDisallowed, - &ResourceManagerTest::basic, - &ResourceManagerTest::residentPolicy, - &ResourceManagerTest::referenceCountedPolicy, - &ResourceManagerTest::manualPolicy, - &ResourceManagerTest::loader); + addTests({&ResourceManagerTest::state, + &ResourceManagerTest::stateFallback, + &ResourceManagerTest::stateDisallowed, + &ResourceManagerTest::basic, + &ResourceManagerTest::residentPolicy, + &ResourceManagerTest::referenceCountedPolicy, + &ResourceManagerTest::manualPolicy, + &ResourceManagerTest::loader}); } void ResourceManagerTest::state() { diff --git a/src/Test/SwizzleTest.cpp b/src/Test/SwizzleTest.cpp index 5a50565a4..7994c6eb8 100644 --- a/src/Test/SwizzleTest.cpp +++ b/src/Test/SwizzleTest.cpp @@ -29,9 +29,9 @@ class SwizzleTest: public Corrade::TestSuite::Tester { }; SwizzleTest::SwizzleTest() { - addTests(&SwizzleTest::rgba, - &SwizzleTest::type, - &SwizzleTest::defaultType); + addTests({&SwizzleTest::rgba, + &SwizzleTest::type, + &SwizzleTest::defaultType}); } void SwizzleTest::rgba() { diff --git a/src/TextureTools/Test/AtlasTest.cpp b/src/TextureTools/Test/AtlasTest.cpp index 9525f1a0f..a5b9cc311 100644 --- a/src/TextureTools/Test/AtlasTest.cpp +++ b/src/TextureTools/Test/AtlasTest.cpp @@ -32,10 +32,10 @@ class AtlasTest: public Corrade::TestSuite::Tester { }; AtlasTest::AtlasTest() { - addTests(&AtlasTest::create, - &AtlasTest::createPadding, - &AtlasTest::createEmpty, - &AtlasTest::createTooSmall); + addTests({&AtlasTest::create, + &AtlasTest::createPadding, + &AtlasTest::createEmpty, + &AtlasTest::createTooSmall}); } void AtlasTest::create() { diff --git a/src/Trade/AbstractImporter.h b/src/Trade/AbstractImporter.h index 7e4250a0b..544726b12 100644 --- a/src/Trade/AbstractImporter.h +++ b/src/Trade/AbstractImporter.h @@ -20,7 +20,7 @@ */ #include -#include +#include #include "Trade/Trade.h" @@ -44,7 +44,7 @@ be done in data parsing functions, because the user might want to import only some data. This is obviously not the case for single-data formats like images, as the file contains all data user wants to import. */ -class MAGNUM_EXPORT AbstractImporter: public Corrade::PluginManager::Plugin { +class MAGNUM_EXPORT AbstractImporter: public Corrade::PluginManager::AbstractPlugin { PLUGIN_INTERFACE("cz.mosra.magnum.Trade.AbstractImporter/0.2") public: @@ -61,9 +61,11 @@ class MAGNUM_EXPORT AbstractImporter: public Corrade::PluginManager::Plugin { /** @brief Set of features supported by this importer */ typedef Corrade::Containers::EnumSet Features; - /** @brief Constructor */ - /* GCC 4.6 can't handle {} as default parameter */ - inline explicit AbstractImporter(Corrade::PluginManager::AbstractPluginManager* manager = nullptr, const std::string& plugin = std::string()): Plugin(manager, plugin) {} + /** @brief Default constructor */ + inline explicit AbstractImporter() = default; + + /** @brief Plugin manager constructor */ + inline explicit AbstractImporter(Corrade::PluginManager::AbstractPluginManager* manager, std::string plugin): AbstractPlugin(manager, std::move(plugin)) {} /** @brief Features supported by this importer */ virtual Features features() const = 0; diff --git a/src/Trade/Test/ObjectData2DTest.cpp b/src/Trade/Test/ObjectData2DTest.cpp index 81e35b922..c2bdd6a6c 100644 --- a/src/Trade/Test/ObjectData2DTest.cpp +++ b/src/Trade/Test/ObjectData2DTest.cpp @@ -28,7 +28,7 @@ class ObjectData2DTest: public Corrade::TestSuite::Tester { }; ObjectData2DTest::ObjectData2DTest() { - addTests(&ObjectData2DTest::debug); + addTests({&ObjectData2DTest::debug}); } void ObjectData2DTest::debug() { diff --git a/src/Trade/Test/ObjectData3DTest.cpp b/src/Trade/Test/ObjectData3DTest.cpp index 95636e0cb..d6bcdafb9 100644 --- a/src/Trade/Test/ObjectData3DTest.cpp +++ b/src/Trade/Test/ObjectData3DTest.cpp @@ -28,7 +28,7 @@ class ObjectData3DTest: public Corrade::TestSuite::Tester { }; ObjectData3DTest::ObjectData3DTest() { - addTests(&ObjectData3DTest::debug); + addTests({&ObjectData3DTest::debug}); } void ObjectData3DTest::debug() {