Browse Source

Don't use fully qualified Corrade::Utility::Debug when not needed.

pull/7/head
Vladimír Vondruš 13 years ago
parent
commit
e58962dc43
  1. 14
      src/Array.h
  2. 4
      src/Color.h
  3. 2
      src/Math/Geometry/Test/RectangleTest.cpp
  4. 2
      src/Math/Test/BoolVectorTest.cpp
  5. 4
      src/Math/Test/Matrix3Test.cpp
  6. 4
      src/Math/Test/Matrix4Test.cpp
  7. 4
      src/Math/Test/MatrixTest.cpp
  8. 4
      src/Math/Test/Point2DTest.cpp
  9. 4
      src/Math/Test/Point3DTest.cpp
  10. 2
      src/Math/Test/QuaternionTest.cpp
  11. 4
      src/Math/Test/RectangularMatrixTest.cpp
  12. 4
      src/Math/Test/Vector2Test.cpp
  13. 4
      src/Math/Test/Vector3Test.cpp
  14. 4
      src/Math/Test/Vector4Test.cpp
  15. 4
      src/Math/Test/VectorTest.cpp
  16. 2
      src/Resource.h
  17. 4
      src/Test/ColorTest.cpp
  18. 6
      src/Test/MeshTest.cpp
  19. 2
      src/Test/ResourceManagerTest.cpp
  20. 2
      src/Trade/AbstractImporter.cpp

14
src/Array.h

@ -23,6 +23,8 @@
#include <type_traits>
#include <Utility/Debug.h>
#include "Magnum.h"
namespace Magnum {
/**
@ -179,30 +181,30 @@ template<class T> class Array3D: public Array<3, T> {
};
/** @debugoperator{Magnum::Array} */
template<std::uint8_t dimensions, class T> Corrade::Utility::Debug operator<<(Corrade::Utility::Debug debug, const Array<dimensions, T>& value) {
template<std::uint8_t dimensions, class T> Debug operator<<(Debug debug, const Array<dimensions, T>& value) {
debug << "Array(";
debug.setFlag(Corrade::Utility::Debug::SpaceAfterEachValue, false);
debug.setFlag(Debug::SpaceAfterEachValue, false);
for(std::uint8_t i = 0; i != dimensions; ++i) {
if(i != 0) debug << ", ";
debug << value[i];
}
debug << ")";
debug.setFlag(Corrade::Utility::Debug::SpaceAfterEachValue, true);
debug.setFlag(Debug::SpaceAfterEachValue, true);
return debug;
}
/** @debugoperator{Magnum::Array1D} */
template<class T> inline Corrade::Utility::Debug operator<<(Corrade::Utility::Debug debug, const Array1D<T>& value) {
template<class T> inline Debug operator<<(Debug debug, const Array1D<T>& value) {
return debug << static_cast<const Array<1, T>&>(value);
}
/** @debugoperator{Magnum::Array2D} */
template<class T> inline Corrade::Utility::Debug operator<<(Corrade::Utility::Debug debug, const Array2D<T>& value) {
template<class T> inline Debug operator<<(Debug debug, const Array2D<T>& value) {
return debug << static_cast<const Array<2, T>&>(value);
}
/** @debugoperator{Magnum::Array3D} */
template<class T> inline Corrade::Utility::Debug operator<<(Corrade::Utility::Debug debug, const Array3D<T>& value) {
template<class T> inline Debug operator<<(Debug debug, const Array3D<T>& value) {
return debug << static_cast<const Array<3, T>&>(value);
}

4
src/Color.h

@ -375,12 +375,12 @@ class Color4: public Math::Vector4<T> {
MAGNUM_VECTOR_SUBCLASS_OPERATOR_IMPLEMENTATION(Color4, 4)
/** @debugoperator{Magnum::Color3} */
template<class T> inline Corrade::Utility::Debug operator<<(Corrade::Utility::Debug debug, const Color3<T>& value) {
template<class T> inline Debug operator<<(Debug debug, const Color3<T>& value) {
return debug << static_cast<const Math::Vector3<T>&>(value);
}
/** @debugoperator{Magnum::Color4} */
template<class T> inline Corrade::Utility::Debug operator<<(Corrade::Utility::Debug debug, const Color4<T>& value) {
template<class T> inline Debug operator<<(Debug debug, const Color4<T>& value) {
return debug << static_cast<const Math::Vector4<T>&>(value);
}

2
src/Math/Geometry/Test/RectangleTest.cpp

@ -87,7 +87,7 @@ void RectangleTest::size() {
void RectangleTest::debug() {
std::ostringstream o;
Corrade::Utility::Debug(&o) << Rectanglei({34, 23}, {47, 30});
Debug(&o) << Rectanglei({34, 23}, {47, 30});
CORRADE_COMPARE(o.str(), "Rectangle({34, 23}, {47, 30})\n");
}

2
src/Math/Test/BoolVectorTest.cpp

@ -156,7 +156,7 @@ void BoolVectorTest::bitAndOrXor() {
void BoolVectorTest::debug() {
std::ostringstream o;
Corrade::Utility::Debug(&o) << BoolVector19(0x25, 0x53, 0x02);
Debug(&o) << BoolVector19(0x25, 0x53, 0x02);
CORRADE_COMPARE(o.str(), "BoolVector(10100100 11001010 010)\n");
}

4
src/Math/Test/Matrix3Test.cpp

@ -20,8 +20,6 @@
#include "Math/Constants.h"
#include "Math/Matrix3.h"
using namespace Corrade::Utility;
namespace Magnum { namespace Math { namespace Test {
class Matrix3Test: public Corrade::TestSuite::Tester {
@ -218,7 +216,7 @@ void Matrix3Test::debug() {
}
void Matrix3Test::configuration() {
Configuration c;
Corrade::Utility::Configuration c;
Matrix3 m({5.0f, 8.0f, 4.0f},
{4.0f, 7.0f, 3.125f},

4
src/Math/Test/Matrix4Test.cpp

@ -20,8 +20,6 @@
#include "Math/Constants.h"
#include "Math/Matrix4.h"
using namespace Corrade::Utility;
namespace Magnum { namespace Math { namespace Test {
class Matrix4Test: public Corrade::TestSuite::Tester {
@ -294,7 +292,7 @@ void Matrix4Test::debug() {
}
void Matrix4Test::configuration() {
Configuration c;
Corrade::Utility::Configuration c;
Matrix4 m({3.0f, 5.0f, 8.0f, 4.0f},
{4.0f, 4.0f, 7.0f, 3.125f},

4
src/Math/Test/MatrixTest.cpp

@ -19,8 +19,6 @@
#include "Math/Matrix.h"
using namespace Corrade::Utility;
namespace Magnum { namespace Math { namespace Test {
class MatrixTest: public Corrade::TestSuite::Tester {
@ -182,7 +180,7 @@ void MatrixTest::debug() {
}
void MatrixTest::configuration() {
Configuration c;
Corrade::Utility::Configuration c;
Matrix4 m(Vector4(3.0f, 5.0f, 8.0f, 4.0f),
Vector4(4.0f, 4.0f, 7.0f, 3.125f),

4
src/Math/Test/Point2DTest.cpp

@ -19,8 +19,6 @@
#include "Math/Point2D.h"
using namespace Corrade::Utility;
namespace Magnum { namespace Math { namespace Test {
class Point2DTest: public Corrade::TestSuite::Tester {
@ -53,7 +51,7 @@ void Point2DTest::debug() {
}
void Point2DTest::configuration() {
Configuration c;
Corrade::Utility::Configuration c;
Point2D vec(3.0f, 3.125f, 9.55f);
std::string value("3 3.125 9.55");

4
src/Math/Test/Point3DTest.cpp

@ -19,8 +19,6 @@
#include "Math/Point3D.h"
using namespace Corrade::Utility;
namespace Magnum { namespace Math { namespace Test {
class Point3DTest: public Corrade::TestSuite::Tester {
@ -53,7 +51,7 @@ void Point3DTest::debug() {
}
void Point3DTest::configuration() {
Configuration c;
Corrade::Utility::Configuration c;
Point3D vec(3.0f, 3.125f, 9.0f, 9.55f);
std::string value("3 3.125 9 9.55");

2
src/Math/Test/QuaternionTest.cpp

@ -250,7 +250,7 @@ void QuaternionTest::slerp() {
void QuaternionTest::debug() {
std::ostringstream o;
Corrade::Utility::Debug(&o) << Quaternion({1.0f, 2.0f, 3.0f}, -4.0f);
Debug(&o) << Quaternion({1.0f, 2.0f, 3.0f}, -4.0f);
CORRADE_COMPARE(o.str(), "Quaternion({1, 2, 3}, -4)\n");
}

4
src/Math/Test/RectangularMatrixTest.cpp

@ -19,8 +19,6 @@
#include "Math/RectangularMatrix.h"
using namespace Corrade::Utility;
namespace Magnum { namespace Math { namespace Test {
class RectangularMatrixTest: public Corrade::TestSuite::Tester {
@ -314,7 +312,7 @@ void RectangularMatrixTest::configuration() {
Vector4(7.0f, -1.0f, 8.0f, 9.55f));
std::string value("3 4 7 5 4 -1 8 7 8 4 3.125 9.55");
Configuration c;
Corrade::Utility::Configuration c;
c.setValue<Matrix3x4>("matrix", m);
CORRADE_COMPARE(c.value("matrix"), value);

4
src/Math/Test/Vector2Test.cpp

@ -19,8 +19,6 @@
#include "Math/Vector2.h"
using namespace Corrade::Utility;
namespace Magnum { namespace Math { namespace Test {
class Vector2Test: public Corrade::TestSuite::Tester {
@ -78,7 +76,7 @@ void Vector2Test::debug() {
}
void Vector2Test::configuration() {
Configuration c;
Corrade::Utility::Configuration c;
Vector2 vec(3.125f, 9.0f);
std::string value("3.125 9");

4
src/Math/Test/Vector3Test.cpp

@ -19,8 +19,6 @@
#include "Math/Vector3.h"
using namespace Corrade::Utility;
namespace Magnum { namespace Math { namespace Test {
class Vector3Test: public Corrade::TestSuite::Tester {
@ -100,7 +98,7 @@ void Vector3Test::debug() {
}
void Vector3Test::configuration() {
Configuration c;
Corrade::Utility::Configuration c;
Vector3 vec(3.0f, 3.125f, 9.55f);
std::string value("3 3.125 9.55");

4
src/Math/Test/Vector4Test.cpp

@ -19,8 +19,6 @@
#include "Math/Vector4.h"
using namespace Corrade::Utility;
namespace Magnum { namespace Math { namespace Test {
class Vector4Test: public Corrade::TestSuite::Tester {
@ -84,7 +82,7 @@ void Vector4Test::debug() {
}
void Vector4Test::configuration() {
Configuration c;
Corrade::Utility::Configuration c;
Vector4 vec(3.0f, 3.125f, 9.0f, 9.55f);
std::string value("3 3.125 9 9.55");

4
src/Math/Test/VectorTest.cpp

@ -20,8 +20,6 @@
#include "Math/Constants.h"
#include "Math/Vector.h"
using namespace Corrade::Utility;
namespace Magnum { namespace Math { namespace Test {
class VectorTest: public Corrade::TestSuite::Tester {
@ -269,7 +267,7 @@ void VectorTest::debug() {
}
void VectorTest::configuration() {
Configuration c;
Corrade::Utility::Configuration c;
Vector4 vec(3.0f, 3.125f, 9.0f, 9.55f);
std::string value("3 3.125 9 9.55");

2
src/Resource.h

@ -90,7 +90,7 @@ class ResourceKey: public Corrade::Utility::MurmurHash2::Digest {
};
/** @debugoperator{Magnum::ResourceKey} */
inline Corrade::Utility::Debug operator<<(Corrade::Utility::Debug debug, const ResourceKey& value) {
inline Debug operator<<(Debug debug, const ResourceKey& value) {
return debug << static_cast<const Corrade::Utility::HashDigest<sizeof(std::size_t)>&>(value);
}

4
src/Test/ColorTest.cpp

@ -19,8 +19,6 @@
#include "Color.h"
using namespace Corrade::Utility;
namespace Magnum { namespace Test {
class ColorTest: public Corrade::TestSuite::Tester {
@ -170,7 +168,7 @@ void ColorTest::debug() {
}
void ColorTest::configuration() {
Configuration c;
Corrade::Utility::Configuration c;
Color3f color3(0.5f, 0.75f, 1.0f);
std::string value3("0.5 0.75 1");

6
src/Test/MeshTest.cpp

@ -19,8 +19,6 @@
#include "Mesh.h"
using namespace Corrade::Utility;
namespace Magnum { namespace Test {
class MeshTest: public Corrade::TestSuite::Tester {
@ -53,7 +51,7 @@ void MeshTest::debugIndexType() {
}
void MeshTest::configurationPrimitive() {
Configuration c;
Corrade::Utility::Configuration c;
c.setValue("primitive", Mesh::Primitive::LineStrip);
CORRADE_COMPARE(c.value<std::string>("primitive"), "LineStrip");
@ -61,7 +59,7 @@ void MeshTest::configurationPrimitive() {
}
void MeshTest::configurationIndexType() {
Configuration c;
Corrade::Utility::Configuration c;
c.setValue("type", Mesh::IndexType::UnsignedByte);
CORRADE_COMPARE(c.value<std::string>("type"), "UnsignedByte");

2
src/Test/ResourceManagerTest.cpp

@ -21,8 +21,6 @@
#include "corradeCompatibility.h"
using namespace Corrade::Utility;
namespace Magnum { namespace Test {
class ResourceManagerTest: public Corrade::TestSuite::Tester {

2
src/Trade/AbstractImporter.cpp

@ -17,7 +17,7 @@
#include <Utility/Debug.h>
using namespace Corrade::Utility;
#include "Magnum.h"
namespace Magnum { namespace Trade {

Loading…
Cancel
Save