Browse Source

Minor code cleanup (unused parameters).

pull/278/head
Vladimír Vondruš 13 years ago
parent
commit
38ec076eda
  1. 8
      src/AbstractFramebuffer.h
  2. 8
      src/AbstractImage.h
  3. 8
      src/AbstractShaderProgram.h
  4. 4
      src/AbstractTexture.h
  5. 8
      src/Buffer.h
  6. 8
      src/BufferTexture.h
  7. 4
      src/Mesh.h
  8. 4
      src/Physics/ShapeGroup.h
  9. 8
      src/Platform/AbstractXApplication.h
  10. 8
      src/Platform/GlutApplication.h
  11. 8
      src/Platform/NaClApplication.h
  12. 8
      src/Platform/Sdl2Application.h
  13. 8
      src/Renderbuffer.h
  14. 8
      src/SceneGraph/Object.h
  15. 4
      src/Shader.h
  16. 8
      src/Trade/AbstractMaterialData.h
  17. 8
      src/Trade/CameraData.h
  18. 8
      src/Trade/LightData.h
  19. 4
      src/Trade/MeshData2D.h
  20. 4
      src/Trade/MeshData3D.h
  21. 8
      src/Trade/MeshObjectData2D.h
  22. 8
      src/Trade/MeshObjectData3D.h
  23. 8
      src/Trade/ObjectData2D.h
  24. 8
      src/Trade/ObjectData3D.h
  25. 8
      src/Trade/SceneData.h
  26. 8
      src/Trade/TextureData.h

8
src/AbstractFramebuffer.h

@ -52,10 +52,10 @@ switching framebuffers.
class MAGNUM_EXPORT AbstractFramebuffer { class MAGNUM_EXPORT AbstractFramebuffer {
friend class Context; friend class Context;
AbstractFramebuffer(const AbstractFramebuffer& other) = delete; AbstractFramebuffer(const AbstractFramebuffer&) = delete;
AbstractFramebuffer(AbstractFramebuffer&& other) = delete; AbstractFramebuffer(AbstractFramebuffer&&) = delete;
AbstractFramebuffer& operator=(const AbstractFramebuffer& other) = delete; AbstractFramebuffer& operator=(const AbstractFramebuffer&) = delete;
AbstractFramebuffer& operator=(AbstractFramebuffer&& other) = delete; AbstractFramebuffer& operator=(AbstractFramebuffer&&) = delete;
public: public:
/** /**

8
src/AbstractImage.h

@ -47,10 +47,10 @@ functions operating with images). It also possibly needs to be "stackable" to
easily revert the state back. easily revert the state back.
*/ */
class MAGNUM_EXPORT AbstractImage { class MAGNUM_EXPORT AbstractImage {
AbstractImage(const AbstractImage& other) = delete; AbstractImage(const AbstractImage&) = delete;
AbstractImage(AbstractImage&& other) = delete; AbstractImage(AbstractImage&&) = delete;
AbstractImage& operator=(const AbstractImage& other) = delete; AbstractImage& operator=(const AbstractImage&) = delete;
AbstractImage& operator=(AbstractImage&& other) = delete; AbstractImage& operator=(AbstractImage&&) = delete;
public: public:
/** /**

8
src/AbstractShaderProgram.h

@ -285,10 +285,10 @@ comes in handy.
class MAGNUM_EXPORT AbstractShaderProgram { class MAGNUM_EXPORT AbstractShaderProgram {
friend class Context; friend class Context;
AbstractShaderProgram(const AbstractShaderProgram& other) = delete; AbstractShaderProgram(const AbstractShaderProgram&) = delete;
AbstractShaderProgram(AbstractShaderProgram&& other) = delete; AbstractShaderProgram(AbstractShaderProgram&&) = delete;
AbstractShaderProgram& operator=(const AbstractShaderProgram& other) = delete; AbstractShaderProgram& operator=(const AbstractShaderProgram&) = delete;
AbstractShaderProgram& operator=(AbstractShaderProgram&& other) = delete; AbstractShaderProgram& operator=(AbstractShaderProgram&&) = delete;
public: public:
/** /**

4
src/AbstractTexture.h

@ -82,8 +82,8 @@ do nothing.
class MAGNUM_EXPORT AbstractTexture { class MAGNUM_EXPORT AbstractTexture {
friend class Context; friend class Context;
AbstractTexture(const AbstractTexture& other) = delete; AbstractTexture(const AbstractTexture&) = delete;
AbstractTexture& operator=(const AbstractTexture& other) = delete; AbstractTexture& operator=(const AbstractTexture&) = delete;
public: public:
/** /**

8
src/Buffer.h

@ -123,10 +123,10 @@ nothing.
class MAGNUM_EXPORT Buffer { class MAGNUM_EXPORT Buffer {
friend class Context; friend class Context;
Buffer(const Buffer& other) = delete; Buffer(const Buffer&) = delete;
Buffer(Buffer&& other) = delete; Buffer(Buffer&&) = delete;
Buffer& operator=(const Buffer& other) = delete; Buffer& operator=(const Buffer&) = delete;
Buffer& operator=(Buffer&& other) = delete; Buffer& operator=(Buffer&&) = delete;
public: public:
/** /**

8
src/BufferTexture.h

@ -82,10 +82,10 @@ documentation for more information.
class MAGNUM_EXPORT BufferTexture: private AbstractTexture { class MAGNUM_EXPORT BufferTexture: private AbstractTexture {
friend class Context; friend class Context;
BufferTexture(const BufferTexture& other) = delete; BufferTexture(const BufferTexture&) = delete;
BufferTexture(BufferTexture&& other) = delete; BufferTexture(BufferTexture&&) = delete;
BufferTexture& operator=(const BufferTexture& other) = delete; BufferTexture& operator=(const BufferTexture&) = delete;
BufferTexture& operator=(BufferTexture&& other) = delete; BufferTexture& operator=(BufferTexture&&) = delete;
public: public:
/** /**

4
src/Mesh.h

@ -240,8 +240,8 @@ for more information.
class MAGNUM_EXPORT Mesh { class MAGNUM_EXPORT Mesh {
friend class Context; friend class Context;
Mesh(const Mesh& other) = delete; Mesh(const Mesh&) = delete;
Mesh& operator=(const Mesh& other) = delete; Mesh& operator=(const Mesh&) = delete;
public: public:
/** @name Polygon drawing settings */ /** @name Polygon drawing settings */

4
src/Physics/ShapeGroup.h

@ -95,8 +95,8 @@ template<UnsignedInt dimensions> class MAGNUM_PHYSICS_EXPORT ShapeGroup: public
#undef friendOp #undef friendOp
#endif #endif
ShapeGroup(const ShapeGroup& other) = delete; ShapeGroup(const ShapeGroup&) = delete;
ShapeGroup& operator=(const ShapeGroup& other) = delete; ShapeGroup& operator=(const ShapeGroup&) = delete;
public: public:
/** @brief Default constructor */ /** @brief Default constructor */

8
src/Platform/AbstractXApplication.h

@ -161,10 +161,10 @@ CORRADE_ENUMSET_OPERATORS(AbstractXApplication::Flags)
mousePressEvent(), mouseReleaseEvent(), mouseMoveEvent() mousePressEvent(), mouseReleaseEvent(), mouseMoveEvent()
*/ */
class AbstractXApplication::InputEvent { class AbstractXApplication::InputEvent {
InputEvent(const InputEvent& other) = delete; InputEvent(const InputEvent&) = delete;
InputEvent(InputEvent&& other) = delete; InputEvent(InputEvent&&) = delete;
InputEvent& operator=(const InputEvent& other) = delete; InputEvent& operator=(const InputEvent&) = delete;
InputEvent& operator=(InputEvent&& other) = delete; InputEvent& operator=(InputEvent&&) = delete;
public: public:
public: public:

8
src/Platform/GlutApplication.h

@ -231,10 +231,10 @@ class GlutApplication {
mouseReleaseEvent(), mouseMoveEvent() mouseReleaseEvent(), mouseMoveEvent()
*/ */
class GlutApplication::InputEvent { class GlutApplication::InputEvent {
InputEvent(const InputEvent& other) = delete; InputEvent(const InputEvent&) = delete;
InputEvent(InputEvent&& other) = delete; InputEvent(InputEvent&&) = delete;
InputEvent& operator=(const InputEvent& other) = delete; InputEvent& operator=(const InputEvent&) = delete;
InputEvent& operator=(InputEvent&& other) = delete; InputEvent& operator=(InputEvent&&) = delete;
public: public:
inline virtual ~InputEvent() {} inline virtual ~InputEvent() {}

8
src/Platform/NaClApplication.h

@ -228,10 +228,10 @@ propagated to the browser.
mousePressEvent(), mouseReleaseEvent(), mouseMoveEvent() mousePressEvent(), mouseReleaseEvent(), mouseMoveEvent()
*/ */
class NaClApplication::InputEvent { class NaClApplication::InputEvent {
InputEvent(const InputEvent& other) = delete; InputEvent(const InputEvent&) = delete;
InputEvent(InputEvent&& other) = delete; InputEvent(InputEvent&&) = delete;
InputEvent& operator=(const InputEvent& other) = delete; InputEvent& operator=(const InputEvent&) = delete;
InputEvent& operator=(InputEvent&& other) = delete; InputEvent& operator=(InputEvent&&) = delete;
public: public:
/** /**

8
src/Platform/Sdl2Application.h

@ -186,10 +186,10 @@ CORRADE_ENUMSET_OPERATORS(Sdl2Application::Flags)
mousePressEvent(), mouseReleaseEvent(), mouseMoveEvent() mousePressEvent(), mouseReleaseEvent(), mouseMoveEvent()
*/ */
class Sdl2Application::InputEvent { class Sdl2Application::InputEvent {
InputEvent(const InputEvent& other) = delete; InputEvent(const InputEvent&) = delete;
InputEvent(InputEvent&& other) = delete; InputEvent(InputEvent&&) = delete;
InputEvent& operator=(const InputEvent& other) = delete; InputEvent& operator=(const InputEvent&) = delete;
InputEvent& operator=(InputEvent&& other) = delete; InputEvent& operator=(InputEvent&&) = delete;
public: public:
/** /**

8
src/Renderbuffer.h

@ -54,10 +54,10 @@ See its documentation for more information.
class MAGNUM_EXPORT Renderbuffer { class MAGNUM_EXPORT Renderbuffer {
friend class Context; friend class Context;
Renderbuffer(const Renderbuffer& other) = delete; Renderbuffer(const Renderbuffer&) = delete;
Renderbuffer(Renderbuffer&& other) = delete; Renderbuffer(Renderbuffer&&) = delete;
Renderbuffer& operator=(const Renderbuffer& other) = delete; Renderbuffer& operator=(const Renderbuffer&) = delete;
Renderbuffer& operator=(Renderbuffer&& other) = delete; Renderbuffer& operator=(Renderbuffer&&) = delete;
public: public:
/** /**

8
src/SceneGraph/Object.h

@ -99,10 +99,10 @@ template<class Transformation> class MAGNUM_SCENEGRAPH_EXPORT Object: public Abs
friend class Corrade::Containers::LinkedListItem<Object<Transformation>, Object<Transformation>>; friend class Corrade::Containers::LinkedListItem<Object<Transformation>, Object<Transformation>>;
#ifndef DOXYGEN_GENERATING_OUTPUT #ifndef DOXYGEN_GENERATING_OUTPUT
Object(const Object<Transformation>& other) = delete; Object(const Object<Transformation>&) = delete;
Object(Object<Transformation>&& other) = delete; Object(Object<Transformation>&&) = delete;
Object<Transformation>& operator=(const Object<Transformation>& other) = delete; Object<Transformation>& operator=(const Object<Transformation>&) = delete;
Object<Transformation>& operator=(Object<Transformation>&& other) = delete; Object<Transformation>& operator=(Object<Transformation>&&) = delete;
#endif #endif
public: public:

4
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. string. See AbstractShaderProgram for more information.
*/ */
class MAGNUM_EXPORT Shader { class MAGNUM_EXPORT Shader {
Shader(const Shader& other) = delete; Shader(const Shader&) = delete;
Shader& operator=(const Shader& other) = delete; Shader& operator=(const Shader&) = delete;
public: public:
/** @brief %Shader type */ /** @brief %Shader type */

8
src/Trade/AbstractMaterialData.h

@ -38,10 +38,10 @@ namespace Magnum { namespace Trade {
Subclasses provide access to parameters for given material type. Subclasses provide access to parameters for given material type.
*/ */
class AbstractMaterialData { class AbstractMaterialData {
AbstractMaterialData(const AbstractMaterialData& other) = delete; AbstractMaterialData(const AbstractMaterialData&) = delete;
AbstractMaterialData(AbstractMaterialData&& other) = delete; AbstractMaterialData(AbstractMaterialData&&) = delete;
AbstractMaterialData& operator=(const AbstractMaterialData& other) = delete; AbstractMaterialData& operator=(const AbstractMaterialData&) = delete;
AbstractMaterialData& operator=(AbstractMaterialData&& other) = delete; AbstractMaterialData& operator=(AbstractMaterialData&&) = delete;
public: public:
/** @brief Material type */ /** @brief Material type */

8
src/Trade/CameraData.h

@ -36,10 +36,10 @@ namespace Magnum { namespace Trade {
@brief %Camera data @brief %Camera data
*/ */
class MAGNUM_EXPORT CameraData { class MAGNUM_EXPORT CameraData {
CameraData(const CameraData& other) = delete; CameraData(const CameraData&) = delete;
CameraData(CameraData&& other) = delete; CameraData(CameraData&&) = delete;
CameraData& operator=(const CameraData& other) = delete; CameraData& operator=(const CameraData&) = delete;
CameraData& operator=(CameraData&& other) = delete; CameraData& operator=(CameraData&&) = delete;
}; };
}} }}

8
src/Trade/LightData.h

@ -36,10 +36,10 @@ namespace Magnum { namespace Trade {
@brief %Light data @brief %Light data
*/ */
class MAGNUM_EXPORT LightData { class MAGNUM_EXPORT LightData {
LightData(const LightData& other) = delete; LightData(const LightData&) = delete;
LightData(LightData&& other) = delete; LightData(LightData&&) = delete;
LightData& operator=(const LightData& other) = delete; LightData& operator=(const LightData&) = delete;
LightData& operator=(LightData&& other) = delete; LightData& operator=(LightData&&) = delete;
}; };
}} }}

4
src/Trade/MeshData2D.h

@ -42,8 +42,8 @@ type.
@see MeshData3D @see MeshData3D
*/ */
class MAGNUM_EXPORT MeshData2D { class MAGNUM_EXPORT MeshData2D {
MeshData2D(const MeshData2D& other) = delete; MeshData2D(const MeshData2D&) = delete;
MeshData2D& operator=(const MeshData2D& other) = delete; MeshData2D& operator=(const MeshData2D&) = delete;
public: public:
/** /**

4
src/Trade/MeshData3D.h

@ -42,8 +42,8 @@ type.
@see MeshData2D @see MeshData2D
*/ */
class MAGNUM_EXPORT MeshData3D { class MAGNUM_EXPORT MeshData3D {
MeshData3D(const MeshData3D& other) = delete; MeshData3D(const MeshData3D&) = delete;
MeshData3D& operator=(const MeshData3D& other) = delete; MeshData3D& operator=(const MeshData3D&) = delete;
public: public:
/** /**

8
src/Trade/MeshObjectData2D.h

@ -39,10 +39,10 @@ Provides access to material information for given mesh instance.
@see MeshObjectData3D @see MeshObjectData3D
*/ */
class MeshObjectData2D: public ObjectData2D { class MeshObjectData2D: public ObjectData2D {
MeshObjectData2D(const MeshObjectData2D& other) = delete; MeshObjectData2D(const MeshObjectData2D&) = delete;
MeshObjectData2D(MeshObjectData2D&& other) = delete; MeshObjectData2D(MeshObjectData2D&&) = delete;
MeshObjectData2D& operator=(const MeshObjectData2D& other) = delete; MeshObjectData2D& operator=(const MeshObjectData2D&) = delete;
MeshObjectData2D& operator=(MeshObjectData2D&& other) = delete; MeshObjectData2D& operator=(MeshObjectData2D&&) = delete;
public: public:
/** /**

8
src/Trade/MeshObjectData3D.h

@ -39,10 +39,10 @@ Provides access to material information for given mesh instance.
@see MeshObjectData2D @see MeshObjectData2D
*/ */
class MeshObjectData3D: public ObjectData3D { class MeshObjectData3D: public ObjectData3D {
MeshObjectData3D(const MeshObjectData3D& other) = delete; MeshObjectData3D(const MeshObjectData3D&) = delete;
MeshObjectData3D(MeshObjectData3D&& other) = delete; MeshObjectData3D(MeshObjectData3D&&) = delete;
MeshObjectData3D& operator=(const MeshObjectData3D& other) = delete; MeshObjectData3D& operator=(const MeshObjectData3D&) = delete;
MeshObjectData3D& operator=(MeshObjectData3D&& other) = delete; MeshObjectData3D& operator=(MeshObjectData3D&&) = delete;
public: public:
/** /**

8
src/Trade/ObjectData2D.h

@ -43,10 +43,10 @@ MeshObjectData2D, which is specialized for objects with mesh instance type.
@see ObjectData3D @see ObjectData3D
*/ */
class ObjectData2D { class ObjectData2D {
ObjectData2D(const ObjectData2D& other) = delete; ObjectData2D(const ObjectData2D&) = delete;
ObjectData2D(ObjectData2D&& other) = delete; ObjectData2D(ObjectData2D&&) = delete;
ObjectData2D& operator=(const ObjectData2D& other) = delete; ObjectData2D& operator=(const ObjectData2D&) = delete;
ObjectData2D& operator=(ObjectData2D&& other) = delete; ObjectData2D& operator=(ObjectData2D&&) = delete;
public: public:
/** @brief Instance type */ /** @brief Instance type */

8
src/Trade/ObjectData3D.h

@ -43,10 +43,10 @@ MeshObjectData3D, which is specialized for objects with mesh instance type.
@see ObjectData2D @see ObjectData2D
*/ */
class ObjectData3D { class ObjectData3D {
ObjectData3D(const ObjectData3D& other) = delete; ObjectData3D(const ObjectData3D&) = delete;
ObjectData3D(ObjectData3D&& other) = delete; ObjectData3D(ObjectData3D&&) = delete;
ObjectData3D& operator=(const ObjectData3D& other) = delete; ObjectData3D& operator=(const ObjectData3D&) = delete;
ObjectData3D& operator=(ObjectData3D&& other) = delete; ObjectData3D& operator=(ObjectData3D&&) = delete;
public: public:
/** @brief Instance type */ /** @brief Instance type */

8
src/Trade/SceneData.h

@ -39,10 +39,10 @@ namespace Magnum { namespace Trade {
@brief %Scene data @brief %Scene data
*/ */
class MAGNUM_EXPORT SceneData { class MAGNUM_EXPORT SceneData {
SceneData(const SceneData& other) = delete; SceneData(const SceneData&) = delete;
SceneData(SceneData&& other) = delete; SceneData(SceneData&&) = delete;
SceneData& operator=(const SceneData& other) = delete; SceneData& operator=(const SceneData&) = delete;
SceneData& operator=(SceneData&& other) = delete; SceneData& operator=(SceneData&&) = delete;
public: public:
/** /**

8
src/Trade/TextureData.h

@ -34,10 +34,10 @@ namespace Magnum { namespace Trade {
@brief %Texture data @brief %Texture data
*/ */
class MAGNUM_EXPORT TextureData { class MAGNUM_EXPORT TextureData {
TextureData(const TextureData& other) = delete; TextureData(const TextureData&) = delete;
TextureData(TextureData&& other) = delete; TextureData(TextureData&&) = delete;
TextureData& operator=(const TextureData& other) = delete; TextureData& operator=(const TextureData&) = delete;
TextureData& operator=(TextureData&& other) = delete; TextureData& operator=(TextureData&&) = delete;
}; };
}} }}

Loading…
Cancel
Save