diff --git a/src/AbstractShaderProgram.cpp b/src/AbstractShaderProgram.cpp index d45a17e98..d27779996 100644 --- a/src/AbstractShaderProgram.cpp +++ b/src/AbstractShaderProgram.cpp @@ -20,7 +20,6 @@ #define LINKER_MESSAGE_MAX_LENGTH 1024 using namespace std; -using namespace Corrade::Utility; namespace Magnum { diff --git a/src/Contexts/GlutContext.cpp b/src/Contexts/GlutContext.cpp index 153c7ae10..a3d210e31 100644 --- a/src/Contexts/GlutContext.cpp +++ b/src/Contexts/GlutContext.cpp @@ -15,8 +15,6 @@ #include "GlutContext.h" -using namespace Corrade::Utility; - namespace Magnum { namespace Contexts { GlutContext* GlutContext::instance = nullptr; diff --git a/src/Contexts/Sdl2Context.cpp b/src/Contexts/Sdl2Context.cpp index d5fc2cfb0..1654eb4a8 100644 --- a/src/Contexts/Sdl2Context.cpp +++ b/src/Contexts/Sdl2Context.cpp @@ -15,8 +15,6 @@ #include "Sdl2Context.h" -using namespace Corrade::Utility; - namespace Magnum { namespace Contexts { Sdl2Context::Sdl2Context(int argc, char** argv, const std::string& name, const Math::Vector2& size): _redraw(true) { diff --git a/src/Magnum.h b/src/Magnum.h index a0595dd05..4ff5a1099 100644 --- a/src/Magnum.h +++ b/src/Magnum.h @@ -27,6 +27,11 @@ namespace Magnum { +/* Bring debugging facility from Corrade::Utility namespace */ +using Corrade::Utility::Debug; +using Corrade::Utility::Warning; +using Corrade::Utility::Error; + /** @brief Two-component floating-point vector */ typedef Math::Vector2 Vector2; diff --git a/src/MeshTools/Test/CombineIndexedArraysTest.cpp b/src/MeshTools/Test/CombineIndexedArraysTest.cpp index a348e2aae..ce8ee2134 100644 --- a/src/MeshTools/Test/CombineIndexedArraysTest.cpp +++ b/src/MeshTools/Test/CombineIndexedArraysTest.cpp @@ -23,7 +23,6 @@ QTEST_APPLESS_MAIN(Magnum::MeshTools::Test::CombineIndexedArraysTest) using namespace std; -using namespace Corrade::Utility; namespace Magnum { namespace MeshTools { namespace Test { diff --git a/src/MeshTools/Test/CompressIndicesTest.cpp b/src/MeshTools/Test/CompressIndicesTest.cpp index 9ff7b2cab..551108f2d 100644 --- a/src/MeshTools/Test/CompressIndicesTest.cpp +++ b/src/MeshTools/Test/CompressIndicesTest.cpp @@ -23,7 +23,7 @@ QTEST_APPLESS_MAIN(Magnum::MeshTools::Test::CompressIndicesTest) using namespace std; -using namespace Corrade::Utility; +using Corrade::Utility::Endianness; namespace Magnum { namespace MeshTools { namespace Test { diff --git a/src/MeshTools/Test/FlipNormalsTest.cpp b/src/MeshTools/Test/FlipNormalsTest.cpp index 1e3e4290b..dd6ec77ae 100644 --- a/src/MeshTools/Test/FlipNormalsTest.cpp +++ b/src/MeshTools/Test/FlipNormalsTest.cpp @@ -22,7 +22,6 @@ QTEST_APPLESS_MAIN(Magnum::MeshTools::Test::FlipNormalsTest) using namespace std; -using namespace Corrade::Utility; namespace Magnum { namespace MeshTools { namespace Test { diff --git a/src/MeshTools/Test/GenerateFlatNormalsTest.cpp b/src/MeshTools/Test/GenerateFlatNormalsTest.cpp index 4ff813db1..4fee48d40 100644 --- a/src/MeshTools/Test/GenerateFlatNormalsTest.cpp +++ b/src/MeshTools/Test/GenerateFlatNormalsTest.cpp @@ -22,7 +22,6 @@ QTEST_APPLESS_MAIN(Magnum::MeshTools::Test::GenerateFlatNormalsTest) using namespace std; -using namespace Corrade::Utility; namespace Magnum { namespace MeshTools { namespace Test { diff --git a/src/MeshTools/Test/InterleaveTest.cpp b/src/MeshTools/Test/InterleaveTest.cpp index acd1c9d21..6725560fb 100644 --- a/src/MeshTools/Test/InterleaveTest.cpp +++ b/src/MeshTools/Test/InterleaveTest.cpp @@ -25,7 +25,7 @@ QTEST_APPLESS_MAIN(Magnum::MeshTools::Test::InterleaveTest) using namespace std; -using namespace Corrade::Utility; +using Corrade::Utility::Endianness; namespace Magnum { namespace MeshTools { namespace Test { diff --git a/src/MeshTools/Test/SubdivideTest.cpp b/src/MeshTools/Test/SubdivideTest.cpp index 7ebeb3b88..11941edf7 100644 --- a/src/MeshTools/Test/SubdivideTest.cpp +++ b/src/MeshTools/Test/SubdivideTest.cpp @@ -24,7 +24,6 @@ QTEST_APPLESS_MAIN(Magnum::MeshTools::Test::SubdivideTest) using namespace std; -using namespace Corrade::Utility; namespace Magnum { namespace MeshTools { namespace Test { diff --git a/src/Primitives/UVSphere.cpp b/src/Primitives/UVSphere.cpp index 9fe9e5227..ba798f68a 100644 --- a/src/Primitives/UVSphere.cpp +++ b/src/Primitives/UVSphere.cpp @@ -16,7 +16,6 @@ #include "UVSphere.h" using namespace std; -using namespace Corrade::Utility; namespace Magnum { namespace Primitives { diff --git a/src/Shader.cpp b/src/Shader.cpp index 3f7886e56..6953d15d6 100644 --- a/src/Shader.cpp +++ b/src/Shader.cpp @@ -20,7 +20,6 @@ #define COMPILER_MESSAGE_MAX_LENGTH 1024 using namespace std; -using namespace Corrade::Utility; namespace Magnum { diff --git a/src/Shaders/PhongShader.cpp b/src/Shaders/PhongShader.cpp index 1a203cf61..be54c0117 100644 --- a/src/Shaders/PhongShader.cpp +++ b/src/Shaders/PhongShader.cpp @@ -17,12 +17,10 @@ #include "Utility/Resource.h" -using namespace Corrade::Utility; - namespace Magnum { namespace Shaders { PhongShader::PhongShader() { - Resource rs("shaders"); + Corrade::Utility::Resource rs("shaders"); attachShader(Shader::fromData(Shader::Type::Vertex, rs.get("PhongShader.vert"))); attachShader(Shader::fromData(Shader::Type::Fragment, rs.get("PhongShader.frag"))); diff --git a/src/SizeTraits.h b/src/SizeTraits.h index 481d9953e..5d03f3520 100644 --- a/src/SizeTraits.h +++ b/src/SizeTraits.h @@ -124,7 +124,7 @@ template struct SizeBasedCall: public Base { return Base::template run(std::forward(arguments)...); } - Corrade::Utility::Error() << "SizeBasedCall: no type able to index" << size << "elements."; + Error() << "SizeBasedCall: no type able to index" << size << "elements."; return decltype(Base::template run(std::forward(arguments)...))(); } diff --git a/src/Test/ObjectTest.cpp b/src/Test/ObjectTest.cpp index 880d70e9d..5d119d993 100644 --- a/src/Test/ObjectTest.cpp +++ b/src/Test/ObjectTest.cpp @@ -21,7 +21,6 @@ #include using namespace std; -using namespace Corrade::Utility; QTEST_APPLESS_MAIN(Magnum::Test::ObjectTest) diff --git a/src/Trade/AbstractImporter.cpp b/src/Trade/AbstractImporter.cpp index 5ab008726..271d5be44 100644 --- a/src/Trade/AbstractImporter.cpp +++ b/src/Trade/AbstractImporter.cpp @@ -16,7 +16,6 @@ #include "AbstractImporter.h" using namespace std; -using namespace Corrade::Utility; namespace Magnum { namespace Trade {