From 38ec076edabbf978ffc7fb997292a00350d073bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Sun, 17 Mar 2013 20:55:23 +0100 Subject: [PATCH] Minor code cleanup (unused parameters). --- src/AbstractFramebuffer.h | 8 ++++---- src/AbstractImage.h | 8 ++++---- src/AbstractShaderProgram.h | 8 ++++---- src/AbstractTexture.h | 4 ++-- src/Buffer.h | 8 ++++---- src/BufferTexture.h | 8 ++++---- src/Mesh.h | 4 ++-- src/Physics/ShapeGroup.h | 4 ++-- src/Platform/AbstractXApplication.h | 8 ++++---- src/Platform/GlutApplication.h | 8 ++++---- src/Platform/NaClApplication.h | 8 ++++---- src/Platform/Sdl2Application.h | 8 ++++---- src/Renderbuffer.h | 8 ++++---- src/SceneGraph/Object.h | 8 ++++---- src/Shader.h | 4 ++-- src/Trade/AbstractMaterialData.h | 8 ++++---- src/Trade/CameraData.h | 8 ++++---- src/Trade/LightData.h | 8 ++++---- src/Trade/MeshData2D.h | 4 ++-- src/Trade/MeshData3D.h | 4 ++-- src/Trade/MeshObjectData2D.h | 8 ++++---- src/Trade/MeshObjectData3D.h | 8 ++++---- src/Trade/ObjectData2D.h | 8 ++++---- src/Trade/ObjectData3D.h | 8 ++++---- src/Trade/SceneData.h | 8 ++++---- src/Trade/TextureData.h | 8 ++++---- 26 files changed, 92 insertions(+), 92 deletions(-) diff --git a/src/AbstractFramebuffer.h b/src/AbstractFramebuffer.h index 34615da53..0be1f2e34 100644 --- a/src/AbstractFramebuffer.h +++ b/src/AbstractFramebuffer.h @@ -52,10 +52,10 @@ switching framebuffers. class MAGNUM_EXPORT AbstractFramebuffer { friend class Context; - AbstractFramebuffer(const AbstractFramebuffer& other) = delete; - AbstractFramebuffer(AbstractFramebuffer&& other) = delete; - AbstractFramebuffer& operator=(const AbstractFramebuffer& other) = delete; - AbstractFramebuffer& operator=(AbstractFramebuffer&& other) = delete; + AbstractFramebuffer(const AbstractFramebuffer&) = delete; + AbstractFramebuffer(AbstractFramebuffer&&) = delete; + AbstractFramebuffer& operator=(const AbstractFramebuffer&) = delete; + AbstractFramebuffer& operator=(AbstractFramebuffer&&) = delete; public: /** diff --git a/src/AbstractImage.h b/src/AbstractImage.h index 6de9cd7cc..0274d5846 100644 --- a/src/AbstractImage.h +++ b/src/AbstractImage.h @@ -47,10 +47,10 @@ functions operating with images). It also possibly needs to be "stackable" to easily revert the state back. */ class MAGNUM_EXPORT AbstractImage { - AbstractImage(const AbstractImage& other) = delete; - AbstractImage(AbstractImage&& other) = delete; - AbstractImage& operator=(const AbstractImage& other) = delete; - AbstractImage& operator=(AbstractImage&& other) = delete; + AbstractImage(const AbstractImage&) = delete; + AbstractImage(AbstractImage&&) = delete; + AbstractImage& operator=(const AbstractImage&) = delete; + AbstractImage& operator=(AbstractImage&&) = delete; public: /** diff --git a/src/AbstractShaderProgram.h b/src/AbstractShaderProgram.h index 02e161d58..814cf4d33 100644 --- a/src/AbstractShaderProgram.h +++ b/src/AbstractShaderProgram.h @@ -285,10 +285,10 @@ comes in handy. class MAGNUM_EXPORT AbstractShaderProgram { friend class Context; - AbstractShaderProgram(const AbstractShaderProgram& other) = delete; - AbstractShaderProgram(AbstractShaderProgram&& other) = delete; - AbstractShaderProgram& operator=(const AbstractShaderProgram& other) = delete; - AbstractShaderProgram& operator=(AbstractShaderProgram&& other) = delete; + AbstractShaderProgram(const AbstractShaderProgram&) = delete; + AbstractShaderProgram(AbstractShaderProgram&&) = delete; + AbstractShaderProgram& operator=(const AbstractShaderProgram&) = delete; + AbstractShaderProgram& operator=(AbstractShaderProgram&&) = delete; public: /** diff --git a/src/AbstractTexture.h b/src/AbstractTexture.h index 19a5fe974..6f256102a 100644 --- a/src/AbstractTexture.h +++ b/src/AbstractTexture.h @@ -82,8 +82,8 @@ do nothing. class MAGNUM_EXPORT AbstractTexture { friend class Context; - AbstractTexture(const AbstractTexture& other) = delete; - AbstractTexture& operator=(const AbstractTexture& other) = delete; + AbstractTexture(const AbstractTexture&) = delete; + AbstractTexture& operator=(const AbstractTexture&) = delete; public: /** diff --git a/src/Buffer.h b/src/Buffer.h index c1f41a2f7..9fe1d26bc 100644 --- a/src/Buffer.h +++ b/src/Buffer.h @@ -123,10 +123,10 @@ nothing. class MAGNUM_EXPORT Buffer { friend class Context; - Buffer(const Buffer& other) = delete; - Buffer(Buffer&& other) = delete; - Buffer& operator=(const Buffer& other) = delete; - Buffer& operator=(Buffer&& other) = delete; + Buffer(const Buffer&) = delete; + Buffer(Buffer&&) = delete; + Buffer& operator=(const Buffer&) = delete; + Buffer& operator=(Buffer&&) = delete; public: /** diff --git a/src/BufferTexture.h b/src/BufferTexture.h index 1f0fdeb52..38adaa430 100644 --- a/src/BufferTexture.h +++ b/src/BufferTexture.h @@ -82,10 +82,10 @@ documentation for more information. class MAGNUM_EXPORT BufferTexture: private AbstractTexture { friend class Context; - BufferTexture(const BufferTexture& other) = delete; - BufferTexture(BufferTexture&& other) = delete; - BufferTexture& operator=(const BufferTexture& other) = delete; - BufferTexture& operator=(BufferTexture&& other) = delete; + BufferTexture(const BufferTexture&) = delete; + BufferTexture(BufferTexture&&) = delete; + BufferTexture& operator=(const BufferTexture&) = delete; + BufferTexture& operator=(BufferTexture&&) = delete; public: /** diff --git a/src/Mesh.h b/src/Mesh.h index 7f7d47b8d..a2b3489e5 100644 --- a/src/Mesh.h +++ b/src/Mesh.h @@ -240,8 +240,8 @@ for more information. class MAGNUM_EXPORT Mesh { friend class Context; - Mesh(const Mesh& other) = delete; - Mesh& operator=(const Mesh& other) = delete; + Mesh(const Mesh&) = delete; + Mesh& operator=(const Mesh&) = delete; public: /** @name Polygon drawing settings */ diff --git a/src/Physics/ShapeGroup.h b/src/Physics/ShapeGroup.h index 40e222936..b546d60ba 100644 --- a/src/Physics/ShapeGroup.h +++ b/src/Physics/ShapeGroup.h @@ -95,8 +95,8 @@ template class MAGNUM_PHYSICS_EXPORT ShapeGroup: public #undef friendOp #endif - ShapeGroup(const ShapeGroup& other) = delete; - ShapeGroup& operator=(const ShapeGroup& other) = delete; + ShapeGroup(const ShapeGroup&) = delete; + ShapeGroup& operator=(const ShapeGroup&) = delete; public: /** @brief Default constructor */ diff --git a/src/Platform/AbstractXApplication.h b/src/Platform/AbstractXApplication.h index 1de097e9a..415105fa1 100644 --- a/src/Platform/AbstractXApplication.h +++ b/src/Platform/AbstractXApplication.h @@ -161,10 +161,10 @@ CORRADE_ENUMSET_OPERATORS(AbstractXApplication::Flags) mousePressEvent(), mouseReleaseEvent(), mouseMoveEvent() */ class AbstractXApplication::InputEvent { - InputEvent(const InputEvent& other) = delete; - InputEvent(InputEvent&& other) = delete; - InputEvent& operator=(const InputEvent& other) = delete; - InputEvent& operator=(InputEvent&& other) = delete; + InputEvent(const InputEvent&) = delete; + InputEvent(InputEvent&&) = delete; + InputEvent& operator=(const InputEvent&) = delete; + InputEvent& operator=(InputEvent&&) = delete; public: public: diff --git a/src/Platform/GlutApplication.h b/src/Platform/GlutApplication.h index 15921fb12..2dd33de0c 100644 --- a/src/Platform/GlutApplication.h +++ b/src/Platform/GlutApplication.h @@ -231,10 +231,10 @@ class GlutApplication { mouseReleaseEvent(), mouseMoveEvent() */ class GlutApplication::InputEvent { - InputEvent(const InputEvent& other) = delete; - InputEvent(InputEvent&& other) = delete; - InputEvent& operator=(const InputEvent& other) = delete; - InputEvent& operator=(InputEvent&& other) = delete; + InputEvent(const InputEvent&) = delete; + InputEvent(InputEvent&&) = delete; + InputEvent& operator=(const InputEvent&) = delete; + InputEvent& operator=(InputEvent&&) = delete; public: inline virtual ~InputEvent() {} diff --git a/src/Platform/NaClApplication.h b/src/Platform/NaClApplication.h index bd3145b0d..2508b50bd 100644 --- a/src/Platform/NaClApplication.h +++ b/src/Platform/NaClApplication.h @@ -228,10 +228,10 @@ propagated to the browser. mousePressEvent(), mouseReleaseEvent(), mouseMoveEvent() */ class NaClApplication::InputEvent { - InputEvent(const InputEvent& other) = delete; - InputEvent(InputEvent&& other) = delete; - InputEvent& operator=(const InputEvent& other) = delete; - InputEvent& operator=(InputEvent&& other) = delete; + InputEvent(const InputEvent&) = delete; + InputEvent(InputEvent&&) = delete; + InputEvent& operator=(const InputEvent&) = delete; + InputEvent& operator=(InputEvent&&) = delete; public: /** diff --git a/src/Platform/Sdl2Application.h b/src/Platform/Sdl2Application.h index 7a4d783cf..e7c69601b 100644 --- a/src/Platform/Sdl2Application.h +++ b/src/Platform/Sdl2Application.h @@ -186,10 +186,10 @@ CORRADE_ENUMSET_OPERATORS(Sdl2Application::Flags) mousePressEvent(), mouseReleaseEvent(), mouseMoveEvent() */ class Sdl2Application::InputEvent { - InputEvent(const InputEvent& other) = delete; - InputEvent(InputEvent&& other) = delete; - InputEvent& operator=(const InputEvent& other) = delete; - InputEvent& operator=(InputEvent&& other) = delete; + InputEvent(const InputEvent&) = delete; + InputEvent(InputEvent&&) = delete; + InputEvent& operator=(const InputEvent&) = delete; + InputEvent& operator=(InputEvent&&) = delete; public: /** diff --git a/src/Renderbuffer.h b/src/Renderbuffer.h index 20420056b..8c9cc8957 100644 --- a/src/Renderbuffer.h +++ b/src/Renderbuffer.h @@ -54,10 +54,10 @@ See its documentation for more information. class MAGNUM_EXPORT Renderbuffer { friend class Context; - Renderbuffer(const Renderbuffer& other) = delete; - Renderbuffer(Renderbuffer&& other) = delete; - Renderbuffer& operator=(const Renderbuffer& other) = delete; - Renderbuffer& operator=(Renderbuffer&& other) = delete; + Renderbuffer(const Renderbuffer&) = delete; + Renderbuffer(Renderbuffer&&) = delete; + Renderbuffer& operator=(const Renderbuffer&) = delete; + Renderbuffer& operator=(Renderbuffer&&) = delete; public: /** diff --git a/src/SceneGraph/Object.h b/src/SceneGraph/Object.h index 07bfc61b1..f287af3b4 100644 --- a/src/SceneGraph/Object.h +++ b/src/SceneGraph/Object.h @@ -99,10 +99,10 @@ template class MAGNUM_SCENEGRAPH_EXPORT Object: public Abs friend class Corrade::Containers::LinkedListItem, Object>; #ifndef DOXYGEN_GENERATING_OUTPUT - Object(const Object& other) = delete; - Object(Object&& other) = delete; - Object& operator=(const Object& other) = delete; - Object& operator=(Object&& other) = delete; + Object(const Object&) = delete; + Object(Object&&) = delete; + Object& operator=(const Object&) = delete; + Object& operator=(Object&&) = delete; #endif public: diff --git a/src/Shader.h b/src/Shader.h index 5332b0e7b..944ca2ff2 100644 --- a/src/Shader.h +++ b/src/Shader.h @@ -45,8 +45,8 @@ Allows loading and compiling the shader from file or directly from source string. See AbstractShaderProgram for more information. */ class MAGNUM_EXPORT Shader { - Shader(const Shader& other) = delete; - Shader& operator=(const Shader& other) = delete; + Shader(const Shader&) = delete; + Shader& operator=(const Shader&) = delete; public: /** @brief %Shader type */ diff --git a/src/Trade/AbstractMaterialData.h b/src/Trade/AbstractMaterialData.h index 311644a1e..92630b427 100644 --- a/src/Trade/AbstractMaterialData.h +++ b/src/Trade/AbstractMaterialData.h @@ -38,10 +38,10 @@ namespace Magnum { namespace Trade { Subclasses provide access to parameters for given material type. */ class AbstractMaterialData { - AbstractMaterialData(const AbstractMaterialData& other) = delete; - AbstractMaterialData(AbstractMaterialData&& other) = delete; - AbstractMaterialData& operator=(const AbstractMaterialData& other) = delete; - AbstractMaterialData& operator=(AbstractMaterialData&& other) = delete; + AbstractMaterialData(const AbstractMaterialData&) = delete; + AbstractMaterialData(AbstractMaterialData&&) = delete; + AbstractMaterialData& operator=(const AbstractMaterialData&) = delete; + AbstractMaterialData& operator=(AbstractMaterialData&&) = delete; public: /** @brief Material type */ diff --git a/src/Trade/CameraData.h b/src/Trade/CameraData.h index a8bfad918..1701bcabd 100644 --- a/src/Trade/CameraData.h +++ b/src/Trade/CameraData.h @@ -36,10 +36,10 @@ namespace Magnum { namespace Trade { @brief %Camera data */ class MAGNUM_EXPORT CameraData { - CameraData(const CameraData& other) = delete; - CameraData(CameraData&& other) = delete; - CameraData& operator=(const CameraData& other) = delete; - CameraData& operator=(CameraData&& other) = delete; + CameraData(const CameraData&) = delete; + CameraData(CameraData&&) = delete; + CameraData& operator=(const CameraData&) = delete; + CameraData& operator=(CameraData&&) = delete; }; }} diff --git a/src/Trade/LightData.h b/src/Trade/LightData.h index b06e16773..c43d6815e 100644 --- a/src/Trade/LightData.h +++ b/src/Trade/LightData.h @@ -36,10 +36,10 @@ namespace Magnum { namespace Trade { @brief %Light data */ class MAGNUM_EXPORT LightData { - LightData(const LightData& other) = delete; - LightData(LightData&& other) = delete; - LightData& operator=(const LightData& other) = delete; - LightData& operator=(LightData&& other) = delete; + LightData(const LightData&) = delete; + LightData(LightData&&) = delete; + LightData& operator=(const LightData&) = delete; + LightData& operator=(LightData&&) = delete; }; }} diff --git a/src/Trade/MeshData2D.h b/src/Trade/MeshData2D.h index cb48f55b4..696a3bd70 100644 --- a/src/Trade/MeshData2D.h +++ b/src/Trade/MeshData2D.h @@ -42,8 +42,8 @@ type. @see MeshData3D */ class MAGNUM_EXPORT MeshData2D { - MeshData2D(const MeshData2D& other) = delete; - MeshData2D& operator=(const MeshData2D& other) = delete; + MeshData2D(const MeshData2D&) = delete; + MeshData2D& operator=(const MeshData2D&) = delete; public: /** diff --git a/src/Trade/MeshData3D.h b/src/Trade/MeshData3D.h index 94a3996d1..54fef49aa 100644 --- a/src/Trade/MeshData3D.h +++ b/src/Trade/MeshData3D.h @@ -42,8 +42,8 @@ type. @see MeshData2D */ class MAGNUM_EXPORT MeshData3D { - MeshData3D(const MeshData3D& other) = delete; - MeshData3D& operator=(const MeshData3D& other) = delete; + MeshData3D(const MeshData3D&) = delete; + MeshData3D& operator=(const MeshData3D&) = delete; public: /** diff --git a/src/Trade/MeshObjectData2D.h b/src/Trade/MeshObjectData2D.h index e144880c9..d6137fffc 100644 --- a/src/Trade/MeshObjectData2D.h +++ b/src/Trade/MeshObjectData2D.h @@ -39,10 +39,10 @@ Provides access to material information for given mesh instance. @see MeshObjectData3D */ class MeshObjectData2D: public ObjectData2D { - MeshObjectData2D(const MeshObjectData2D& other) = delete; - MeshObjectData2D(MeshObjectData2D&& other) = delete; - MeshObjectData2D& operator=(const MeshObjectData2D& other) = delete; - MeshObjectData2D& operator=(MeshObjectData2D&& other) = delete; + MeshObjectData2D(const MeshObjectData2D&) = delete; + MeshObjectData2D(MeshObjectData2D&&) = delete; + MeshObjectData2D& operator=(const MeshObjectData2D&) = delete; + MeshObjectData2D& operator=(MeshObjectData2D&&) = delete; public: /** diff --git a/src/Trade/MeshObjectData3D.h b/src/Trade/MeshObjectData3D.h index 348b3f4a4..b692b51e2 100644 --- a/src/Trade/MeshObjectData3D.h +++ b/src/Trade/MeshObjectData3D.h @@ -39,10 +39,10 @@ Provides access to material information for given mesh instance. @see MeshObjectData2D */ class MeshObjectData3D: public ObjectData3D { - MeshObjectData3D(const MeshObjectData3D& other) = delete; - MeshObjectData3D(MeshObjectData3D&& other) = delete; - MeshObjectData3D& operator=(const MeshObjectData3D& other) = delete; - MeshObjectData3D& operator=(MeshObjectData3D&& other) = delete; + MeshObjectData3D(const MeshObjectData3D&) = delete; + MeshObjectData3D(MeshObjectData3D&&) = delete; + MeshObjectData3D& operator=(const MeshObjectData3D&) = delete; + MeshObjectData3D& operator=(MeshObjectData3D&&) = delete; public: /** diff --git a/src/Trade/ObjectData2D.h b/src/Trade/ObjectData2D.h index 7e934486b..466b8d18e 100644 --- a/src/Trade/ObjectData2D.h +++ b/src/Trade/ObjectData2D.h @@ -43,10 +43,10 @@ MeshObjectData2D, which is specialized for objects with mesh instance type. @see ObjectData3D */ class ObjectData2D { - ObjectData2D(const ObjectData2D& other) = delete; - ObjectData2D(ObjectData2D&& other) = delete; - ObjectData2D& operator=(const ObjectData2D& other) = delete; - ObjectData2D& operator=(ObjectData2D&& other) = delete; + ObjectData2D(const ObjectData2D&) = delete; + ObjectData2D(ObjectData2D&&) = delete; + ObjectData2D& operator=(const ObjectData2D&) = delete; + ObjectData2D& operator=(ObjectData2D&&) = delete; public: /** @brief Instance type */ diff --git a/src/Trade/ObjectData3D.h b/src/Trade/ObjectData3D.h index c1ff82db4..8b5be8a68 100644 --- a/src/Trade/ObjectData3D.h +++ b/src/Trade/ObjectData3D.h @@ -43,10 +43,10 @@ MeshObjectData3D, which is specialized for objects with mesh instance type. @see ObjectData2D */ class ObjectData3D { - ObjectData3D(const ObjectData3D& other) = delete; - ObjectData3D(ObjectData3D&& other) = delete; - ObjectData3D& operator=(const ObjectData3D& other) = delete; - ObjectData3D& operator=(ObjectData3D&& other) = delete; + ObjectData3D(const ObjectData3D&) = delete; + ObjectData3D(ObjectData3D&&) = delete; + ObjectData3D& operator=(const ObjectData3D&) = delete; + ObjectData3D& operator=(ObjectData3D&&) = delete; public: /** @brief Instance type */ diff --git a/src/Trade/SceneData.h b/src/Trade/SceneData.h index cdf3718b5..519573fb9 100644 --- a/src/Trade/SceneData.h +++ b/src/Trade/SceneData.h @@ -39,10 +39,10 @@ namespace Magnum { namespace Trade { @brief %Scene data */ class MAGNUM_EXPORT SceneData { - SceneData(const SceneData& other) = delete; - SceneData(SceneData&& other) = delete; - SceneData& operator=(const SceneData& other) = delete; - SceneData& operator=(SceneData&& other) = delete; + SceneData(const SceneData&) = delete; + SceneData(SceneData&&) = delete; + SceneData& operator=(const SceneData&) = delete; + SceneData& operator=(SceneData&&) = delete; public: /** diff --git a/src/Trade/TextureData.h b/src/Trade/TextureData.h index dd35fc191..870ab392d 100644 --- a/src/Trade/TextureData.h +++ b/src/Trade/TextureData.h @@ -34,10 +34,10 @@ namespace Magnum { namespace Trade { @brief %Texture data */ class MAGNUM_EXPORT TextureData { - TextureData(const TextureData& other) = delete; - TextureData(TextureData&& other) = delete; - TextureData& operator=(const TextureData& other) = delete; - TextureData& operator=(TextureData&& other) = delete; + TextureData(const TextureData&) = delete; + TextureData(TextureData&&) = delete; + TextureData& operator=(const TextureData&) = delete; + TextureData& operator=(TextureData&&) = delete; }; }}