From e762fc1efcc55a4ae25800b4ba9591acd4264e55 Mon Sep 17 00:00:00 2001 From: Alice Margatroid Date: Fri, 7 Apr 2017 22:02:46 +0200 Subject: [PATCH] Modernize #1 --- src/Magnum/Context.cpp | 10 +++++----- .../Implementation/AbstractShapeRenderer.cpp | 2 +- src/Magnum/DebugTools/ResourceManager.cpp | 2 +- src/Magnum/Text/AbstractFont.cpp | 2 +- src/Magnum/Text/Renderer.cpp | 2 +- src/Magnum/TextureArray.cpp | 4 ++-- src/Magnum/TextureTools/DistanceField.cpp | 6 +++--- src/Magnum/Trade/AbstractMaterialData.cpp | 2 +- src/Magnum/Trade/PhongMaterialData.cpp | 2 +- src/Magnum/Version.cpp | 2 +- src/MagnumPlugins/ObjImporter/ObjImporter.cpp | 2 +- 11 files changed, 18 insertions(+), 18 deletions(-) diff --git a/src/Magnum/Context.cpp b/src/Magnum/Context.cpp index 027b541d1..0e74a549a 100644 --- a/src/Magnum/Context.cpp +++ b/src/Magnum/Context.cpp @@ -453,14 +453,14 @@ Context::Context(NoCreateT, Int argc, const char** argv, void functionLoader()): _disabledExtensions.push_back(extension); } -Context::Context(Context&& other): _version{std::move(other._version)}, +Context::Context(Context&& other): _version{other._version}, #ifndef MAGNUM_TARGET_WEBGL - _flags{std::move(other._flags)}, + _flags{other._flags}, #endif - _extensionRequiredVersion(std::move(other._extensionRequiredVersion)), - _extensionStatus{std::move(other._extensionStatus)}, + _extensionRequiredVersion(other._extensionRequiredVersion), + _extensionStatus{other._extensionStatus}, _supportedExtensions{std::move(other._supportedExtensions)}, - _state{std::move(other._state)}, + _state{other._state}, _detectedDrivers{std::move(other._detectedDrivers)} { other._state = nullptr; diff --git a/src/Magnum/DebugTools/Implementation/AbstractShapeRenderer.cpp b/src/Magnum/DebugTools/Implementation/AbstractShapeRenderer.cpp index 53a24a557..3dc5a2d4f 100644 --- a/src/Magnum/DebugTools/Implementation/AbstractShapeRenderer.cpp +++ b/src/Magnum/DebugTools/Implementation/AbstractShapeRenderer.cpp @@ -120,7 +120,7 @@ template AbstractShapeRenderer::AbstractShap new Shaders::Flat, ResourceDataState::Final, ResourcePolicy::Resident); } -template AbstractShapeRenderer::~AbstractShapeRenderer() {} +template AbstractShapeRenderer::~AbstractShapeRenderer() = default; template void AbstractShapeRenderer::createResources(typename MeshData::Type data) { create(data, wireframeMesh, vertexBuffer, indexBuffer); diff --git a/src/Magnum/DebugTools/ResourceManager.cpp b/src/Magnum/DebugTools/ResourceManager.cpp index 3661b3f6f..6dd2e71a7 100644 --- a/src/Magnum/DebugTools/ResourceManager.cpp +++ b/src/Magnum/DebugTools/ResourceManager.cpp @@ -48,6 +48,6 @@ ResourceManager::ResourceManager() { setFallback(new ShapeRendererOptions); } -ResourceManager::~ResourceManager() {} +ResourceManager::~ResourceManager() = default; }} diff --git a/src/Magnum/Text/AbstractFont.cpp b/src/Magnum/Text/AbstractFont.cpp index ade83be3e..861e8e4e5 100644 --- a/src/Magnum/Text/AbstractFont.cpp +++ b/src/Magnum/Text/AbstractFont.cpp @@ -165,7 +165,7 @@ std::unique_ptr AbstractFont::layout(const GlyphCache& cache, AbstractLayouter::AbstractLayouter(UnsignedInt glyphCount): _glyphCount(glyphCount) {} -AbstractLayouter::~AbstractLayouter() {} +AbstractLayouter::~AbstractLayouter() = default; std::pair AbstractLayouter::renderGlyph(const UnsignedInt i, Vector2& cursorPosition, Range2D& rectangle) { CORRADE_ASSERT(i < glyphCount(), "Text::AbstractLayouter::renderGlyph(): glyph index out of bounds", {}); diff --git a/src/Magnum/Text/Renderer.cpp b/src/Magnum/Text/Renderer.cpp index 5a720b7b2..de0e882d6 100644 --- a/src/Magnum/Text/Renderer.cpp +++ b/src/Magnum/Text/Renderer.cpp @@ -330,7 +330,7 @@ AbstractRenderer::AbstractRenderer(AbstractFont& font, const GlyphCache& cache, _mesh.setPrimitive(MeshPrimitive::Triangles); } -AbstractRenderer::~AbstractRenderer() {} +AbstractRenderer::~AbstractRenderer() = default; template Renderer::Renderer(AbstractFont& font, const GlyphCache& cache, const Float size, const Alignment alignment): AbstractRenderer(font, cache, size, alignment) { /* Finalize mesh configuration */ diff --git a/src/Magnum/TextureArray.cpp b/src/Magnum/TextureArray.cpp index 8ed75583d..741eeac2a 100644 --- a/src/Magnum/TextureArray.cpp +++ b/src/Magnum/TextureArray.cpp @@ -40,8 +40,8 @@ namespace Magnum { namespace { template struct VectorOrScalar; - template<> struct VectorOrScalar<1> { typedef Int Type; }; - template<> struct VectorOrScalar<2> { typedef Vector2i Type; }; + template<> struct VectorOrScalar<1> { using Type = Int; }; + template<> struct VectorOrScalar<2> { using Type = Vector2i; }; } template VectorTypeFor TextureArray::maxSize() { diff --git a/src/Magnum/TextureTools/DistanceField.cpp b/src/Magnum/TextureTools/DistanceField.cpp index 3bc85e281..5e5fddd31 100644 --- a/src/Magnum/TextureTools/DistanceField.cpp +++ b/src/Magnum/TextureTools/DistanceField.cpp @@ -77,12 +77,12 @@ class DistanceFieldShader: public AbstractShaderProgram { private: enum: Int { TextureUnit = 8 }; - Int radiusUniform, - scalingUniform, + Int radiusUniform{0}, + scalingUniform{1}, imageSizeInvertedUniform; }; -DistanceFieldShader::DistanceFieldShader(): radiusUniform(0), scalingUniform(1) { +DistanceFieldShader::DistanceFieldShader() { #ifdef MAGNUM_BUILD_STATIC /* Import resources on static build, if not already */ if(!Utility::Resource::hasGroup("MagnumTextureTools")) diff --git a/src/Magnum/Trade/AbstractMaterialData.cpp b/src/Magnum/Trade/AbstractMaterialData.cpp index c8a202232..bb5ce586d 100644 --- a/src/Magnum/Trade/AbstractMaterialData.cpp +++ b/src/Magnum/Trade/AbstractMaterialData.cpp @@ -31,7 +31,7 @@ namespace Magnum { namespace Trade { AbstractMaterialData::AbstractMaterialData(const MaterialType type, const void* const importerState) noexcept: _type{type}, _importerState{importerState} {} -AbstractMaterialData::~AbstractMaterialData() {} +AbstractMaterialData::~AbstractMaterialData() = default; Debug& operator<<(Debug& debug, const MaterialType value) { switch(value) { diff --git a/src/Magnum/Trade/PhongMaterialData.cpp b/src/Magnum/Trade/PhongMaterialData.cpp index 4264dc1c1..0755d7dc4 100644 --- a/src/Magnum/Trade/PhongMaterialData.cpp +++ b/src/Magnum/Trade/PhongMaterialData.cpp @@ -27,7 +27,7 @@ namespace Magnum { namespace Trade { -PhongMaterialData::PhongMaterialData(PhongMaterialData&& other) noexcept: AbstractMaterialData{std::move(other)}, _flags{std::move(other._flags)}, _shininess{std::move(other._shininess)} { +PhongMaterialData::PhongMaterialData(PhongMaterialData&& other) noexcept: AbstractMaterialData{std::move(other)}, _flags{other._flags}, _shininess{other._shininess} { if(_flags & Flag::AmbientTexture) _ambient.texture = other._ambient.texture; else diff --git a/src/Magnum/Version.cpp b/src/Magnum/Version.cpp index 41f9de1fc..0305e1e5c 100644 --- a/src/Magnum/Version.cpp +++ b/src/Magnum/Version.cpp @@ -33,7 +33,7 @@ namespace Magnum { Debug& operator<<(Debug& debug, Version value) { switch(value) { /* LCOV_EXCL_START */ - #define _c(value, string) case Version::value: return debug << string; + #define _c(value, string) case Version::value: return debug << (string); _c(None, "None") #ifndef MAGNUM_TARGET_GLES _c(GL210, "OpenGL 2.1") diff --git a/src/MagnumPlugins/ObjImporter/ObjImporter.cpp b/src/MagnumPlugins/ObjImporter/ObjImporter.cpp index b759fe04d..668c41bac 100644 --- a/src/MagnumPlugins/ObjImporter/ObjImporter.cpp +++ b/src/MagnumPlugins/ObjImporter/ObjImporter.cpp @@ -53,7 +53,7 @@ void ignoreLine(std::istream& in) { in.ignore(std::numeric_limits::max(), '\n'); } -template Math::Vector extractFloatData(std::string str, Float* extra = nullptr) { +template Math::Vector extractFloatData(const std::string& str, Float* extra = nullptr) { std::vector data = Utility::String::splitWithoutEmptyParts(str, ' '); if(data.size() < size || data.size() > size + (extra ? 1 : 0)) { Error() << "Trade::ObjImporter::mesh3D(): invalid float array size";