From b0d79bbad8c0dd8349a461efd76c0eaa06dbf469 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= <mosra@centrum.cz>
Date: Wed, 27 Feb 2013 11:45:06 +0100
Subject: [PATCH] Math: minor code cleanup.

---
 src/Math/DualQuaternion.h            | 4 ++--
 src/Math/Math.h                      | 4 ++--
 src/Math/Test/CMakeLists.txt         | 4 ++--
 src/Math/Test/DualQuaternionTest.cpp | 1 -
 src/Math/Test/QuaternionTest.cpp     | 4 ++--
 5 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/src/Math/DualQuaternion.h b/src/Math/DualQuaternion.h
index 8c2e87b82..6ebbd74ea 100644
--- a/src/Math/DualQuaternion.h
+++ b/src/Math/DualQuaternion.h
@@ -239,7 +239,7 @@ template<class T> class DualQuaternion: public Dual<Quaternion<T>> {
          * @see inverted()
          */
         inline DualQuaternion<T> invertedNormalized() const {
-            CORRADE_ASSERT(MathTypeTraits<T>::equals(lengthSquared(), T(1)),
+            CORRADE_ASSERT(lengthSquared() == Dual<T>(1),
                            "Math::DualQuaternion::invertedNormalized(): dual quaternion must be normalized", {});
             return quaternionConjugated();
         }
@@ -269,7 +269,7 @@ template<class T> class DualQuaternion: public Dual<Quaternion<T>> {
          *      Quaternion::transformVectorNormalized()
          */
         inline Vector3<T> transformPointNormalized(const Vector3<T>& vector) const {
-            CORRADE_ASSERT(MathTypeTraits<Dual<T>>::equals(lengthSquared(), Dual<T>(1)),
+            CORRADE_ASSERT(lengthSquared() == Dual<T>(1),
                            "Math::DualQuaternion::transformPointNormalized(): dual quaternion must be normalized",
                            Vector3<T>(std::numeric_limits<T>::quiet_NaN()));
             return ((*this)*DualQuaternion<T>(vector)*conjugated()).dual().vector();
diff --git a/src/Math/Math.h b/src/Math/Math.h
index 2f11f3023..a05da0a1c 100644
--- a/src/Math/Math.h
+++ b/src/Math/Math.h
@@ -27,8 +27,8 @@ namespace Magnum { namespace Math {
 #ifndef DOXYGEN_GENERATING_OUTPUT
 /* Class Constants used only statically */
 
-template<class T> class Complex;
-template<class T> class Dual;
+template<class> class Complex;
+template<class> class Dual;
 template<class> class DualQuaternion;
 
 template<std::size_t, class> class Matrix;
diff --git a/src/Math/Test/CMakeLists.txt b/src/Math/Test/CMakeLists.txt
index 76d7980dc..e0e8b22be 100644
--- a/src/Math/Test/CMakeLists.txt
+++ b/src/Math/Test/CMakeLists.txt
@@ -17,8 +17,8 @@ corrade_add_test(MathSwizzleTest SwizzleTest.cpp LIBRARIES MagnumMathTestLib)
 corrade_add_test(MathUnitTest UnitTest.cpp)
 corrade_add_test(MathAngleTest AngleTest.cpp LIBRARIES MagnumMathTestLib)
 
-corrade_add_test(MathComplexTest ComplexTest.cpp LIBRARIES MagnumMathTestLib)
 corrade_add_test(MathDualTest DualTest.cpp)
+corrade_add_test(MathComplexTest ComplexTest.cpp LIBRARIES MagnumMathTestLib)
 corrade_add_test(MathQuaternionTest QuaternionTest.cpp LIBRARIES MagnumMathTestLib)
 corrade_add_test(MathDualQuaternionTest DualQuaternionTest.cpp LIBRARIES MagnumMathTestLib)
 
@@ -27,6 +27,6 @@ set_target_properties(
     MathMatrix3Test
     MathMatrix4Test
     MathComplexTest
-    MathDualQuaternionTest
     MathQuaternionTest
+    MathDualQuaternionTest
     PROPERTIES COMPILE_FLAGS -DCORRADE_GRACEFUL_ASSERT)
diff --git a/src/Math/Test/DualQuaternionTest.cpp b/src/Math/Test/DualQuaternionTest.cpp
index da954935f..0a49372ab 100644
--- a/src/Math/Test/DualQuaternionTest.cpp
+++ b/src/Math/Test/DualQuaternionTest.cpp
@@ -56,7 +56,6 @@ typedef Math::Matrix4<float> Matrix4;
 typedef Math::DualQuaternion<float> DualQuaternion;
 typedef Math::Quaternion<float> Quaternion;
 typedef Math::Vector3<float> Vector3;
-typedef Math::Vector4<float> Vector4;
 
 DualQuaternionTest::DualQuaternionTest() {
     addTests(&DualQuaternionTest::construct,
diff --git a/src/Math/Test/QuaternionTest.cpp b/src/Math/Test/QuaternionTest.cpp
index da7b16ed8..06f3e9ac8 100644
--- a/src/Math/Test/QuaternionTest.cpp
+++ b/src/Math/Test/QuaternionTest.cpp
@@ -212,7 +212,7 @@ void QuaternionTest::invertedNormalized() {
     Quaternion a = Quaternion({1.0f, 3.0f, -2.0f}, -4.0f);
 
     std::ostringstream o;
-    Corrade::Utility::Error::setOutput(&o);
+    Error::setOutput(&o);
     Quaternion notInverted = a.invertedNormalized();
     CORRADE_COMPARE(notInverted.vector(), Vector3());
     CORRADE_COMPARE(notInverted.scalar(), std::numeric_limits<float>::quiet_NaN());
@@ -221,7 +221,7 @@ void QuaternionTest::invertedNormalized() {
     Quaternion aNormalized = a.normalized();
     Quaternion inverted = aNormalized.invertedNormalized();
     CORRADE_COMPARE(aNormalized*inverted, Quaternion());
-    CORRADE_COMPARE(inverted*aNormalized.normalized(), Quaternion());
+    CORRADE_COMPARE(inverted*aNormalized, Quaternion());
     CORRADE_COMPARE(inverted, Quaternion({-1.0f, -3.0f, 2.0f}, -4.0f)/std::sqrt(30.0f));
 }