From cf5efb95609d89c1e3b03923da135ad2a4b73fc9 Mon Sep 17 00:00:00 2001 From: Filip Gawin Date: Sun, 18 Feb 2018 01:06:39 +0100 Subject: [PATCH] Use "= default" for trivial ctor/dtor --- rwengine/src/ai/CharacterController.hpp | 6 ++---- rwengine/src/data/ModelData.hpp | 3 +-- rwengine/src/engine/GameData.cpp | 4 +--- rwengine/src/loaders/LoaderIFP.hpp | 3 +-- rwengine/src/objects/CutsceneObject.cpp | 3 +-- rwengine/src/objects/InstanceObject.cpp | 3 +-- rwengine/src/render/OpenGLRenderer.cpp | 3 +-- rwengine/src/render/OpenGLRenderer.hpp | 6 ++---- rwengine/src/render/TextRenderer.cpp | 6 ++---- rwengine/src/render/VisualFX.cpp | 9 +++------ rwengine/src/render/WaterRenderer.cpp | 3 +-- rwengine/src/script/ScriptMachine.hpp | 6 +++--- rwgame/State.hpp | 3 +-- rwlib/source/data/Clump.cpp | 3 +-- rwlib/source/data/Clump.hpp | 3 +-- 15 files changed, 22 insertions(+), 42 deletions(-) diff --git a/rwengine/src/ai/CharacterController.hpp b/rwengine/src/ai/CharacterController.hpp index 4ef8dfcb..5fa86a44 100644 --- a/rwengine/src/ai/CharacterController.hpp +++ b/rwengine/src/ai/CharacterController.hpp @@ -20,8 +20,7 @@ public: * @brief The Activity struct interface */ struct Activity { - virtual ~Activity() { - } + virtual ~Activity() = default; virtual std::string name() const = 0; @@ -77,8 +76,7 @@ protected: public: CharacterController(); - virtual ~CharacterController() { - } + virtual ~CharacterController() = default; /** * Get the current Activity. diff --git a/rwengine/src/data/ModelData.hpp b/rwengine/src/data/ModelData.hpp index 85646e89..0662e049 100644 --- a/rwengine/src/data/ModelData.hpp +++ b/rwengine/src/data/ModelData.hpp @@ -49,8 +49,7 @@ public: BaseModelInfo(ModelDataType type) : type_(type) { } - virtual ~BaseModelInfo() { - } + virtual ~BaseModelInfo() = default; ModelID id() const { return modelid_; diff --git a/rwengine/src/engine/GameData.cpp b/rwengine/src/engine/GameData.cpp index 4fdf2e27..9391a949 100644 --- a/rwengine/src/engine/GameData.cpp +++ b/rwengine/src/engine/GameData.cpp @@ -38,9 +38,7 @@ GameData::GameData(Logger* log, const rwfs::path& path) }); } -GameData::~GameData() { - /// @todo don't leak models -} +GameData::~GameData() = default; void GameData::load() { index.indexGameDirectory(datpath); diff --git a/rwengine/src/loaders/LoaderIFP.hpp b/rwengine/src/loaders/LoaderIFP.hpp index 1aabd169..7e959fdf 100644 --- a/rwengine/src/loaders/LoaderIFP.hpp +++ b/rwengine/src/loaders/LoaderIFP.hpp @@ -27,8 +27,7 @@ struct AnimationKeyframe { , id(_id) { } - AnimationKeyframe() { - } + AnimationKeyframe() = default; }; struct AnimationBone { diff --git a/rwengine/src/objects/CutsceneObject.cpp b/rwengine/src/objects/CutsceneObject.cpp index 2f9546e1..3f753b0b 100644 --- a/rwengine/src/objects/CutsceneObject.cpp +++ b/rwengine/src/objects/CutsceneObject.cpp @@ -21,8 +21,7 @@ CutsceneObject::CutsceneObject(GameWorld *engine, const glm::vec3 &pos, animator = new Animator(getClump()); } -CutsceneObject::~CutsceneObject() { -} +CutsceneObject::~CutsceneObject() = default; void CutsceneObject::tick(float dt) { animator->tick(dt); diff --git a/rwengine/src/objects/InstanceObject.cpp b/rwengine/src/objects/InstanceObject.cpp index 5a8cc715..5048972a 100644 --- a/rwengine/src/objects/InstanceObject.cpp +++ b/rwengine/src/objects/InstanceObject.cpp @@ -43,8 +43,7 @@ InstanceObject::InstanceObject(GameWorld* engine, const glm::vec3& pos, } } -InstanceObject::~InstanceObject() { -} +InstanceObject::~InstanceObject() = default; void InstanceObject::tick(float dt) { if (animator) animator->tick(dt); diff --git a/rwengine/src/render/OpenGLRenderer.cpp b/rwengine/src/render/OpenGLRenderer.cpp index 40605eed..a42c1b9b 100644 --- a/rwengine/src/render/OpenGLRenderer.cpp +++ b/rwengine/src/render/OpenGLRenderer.cpp @@ -469,5 +469,4 @@ const Renderer::ProfileInfo& OpenGLRenderer::popDebugGroup() { return profileInfo[0]; } -Renderer::ShaderProgram::~ShaderProgram() { -} +Renderer::ShaderProgram::~ShaderProgram() = default; diff --git a/rwengine/src/render/OpenGLRenderer.hpp b/rwengine/src/render/OpenGLRenderer.hpp index ed53508b..206f5ddf 100644 --- a/rwengine/src/render/OpenGLRenderer.hpp +++ b/rwengine/src/render/OpenGLRenderer.hpp @@ -33,8 +33,7 @@ struct VertexP2 { : position({_x, _y}) { } - VertexP2() { - } + VertexP2() = default; }; @@ -51,8 +50,7 @@ struct VertexP3 { : position({_x, _y, _z}) { } - VertexP3() { - } + VertexP3() = default; }; class Renderer { diff --git a/rwengine/src/render/TextRenderer.cpp b/rwengine/src/render/TextRenderer.cpp index 54aaeb93..0fa04d96 100644 --- a/rwengine/src/render/TextRenderer.cpp +++ b/rwengine/src/render/TextRenderer.cpp @@ -71,8 +71,7 @@ struct TextVertex { , colour(_colour) { } - TextVertex() { - } + TextVertex() = default; static const AttributeList vertex_attributes() { return { @@ -132,8 +131,7 @@ TextRenderer::TextRenderer(GameRenderer* renderer) : renderer(renderer) { } } -TextRenderer::~TextRenderer() { -} +TextRenderer::~TextRenderer() = default; void TextRenderer::setFontTexture(int index, const std::string& texture) { if (index < GAME_FONTS) { diff --git a/rwengine/src/render/VisualFX.cpp b/rwengine/src/render/VisualFX.cpp index 97baf396..ea4d4e4a 100644 --- a/rwengine/src/render/VisualFX.cpp +++ b/rwengine/src/render/VisualFX.cpp @@ -2,14 +2,11 @@ #include -VisualFX::LightData::~LightData() { -} +VisualFX::LightData::~LightData() = default; -VisualFX::ParticleData::~ParticleData() { -} +VisualFX::ParticleData::~ParticleData() = default; -VisualFX::TrailData::~TrailData() { -} +VisualFX::TrailData::~TrailData() = default; VisualFX::VisualFX(VisualFX::EffectType type) : type(type) { switch (type) { diff --git a/rwengine/src/render/WaterRenderer.cpp b/rwengine/src/render/WaterRenderer.cpp index 3deb839c..0a057707 100644 --- a/rwengine/src/render/WaterRenderer.cpp +++ b/rwengine/src/render/WaterRenderer.cpp @@ -55,8 +55,7 @@ WaterRenderer::WaterRenderer(GameRenderer* renderer) : waterProg(nullptr) { gridDraw.addGeometry(&gridGeom); } -WaterRenderer::~WaterRenderer() { -} +WaterRenderer::~WaterRenderer() = default; void WaterRenderer::setWaterTable(float* waterHeights, unsigned int nHeights, uint8_t* tiles, unsigned int nTiles) { diff --git a/rwengine/src/script/ScriptMachine.hpp b/rwengine/src/script/ScriptMachine.hpp index f707db3c..db08c969 100644 --- a/rwengine/src/script/ScriptMachine.hpp +++ b/rwengine/src/script/ScriptMachine.hpp @@ -26,8 +26,8 @@ class SCMFile; struct SCMException { - virtual ~SCMException() { - } + virtual ~SCMException() = default; + virtual std::string what() const = 0; }; @@ -119,7 +119,7 @@ struct SCMThread { class ScriptMachine { public: ScriptMachine(GameState* state, SCMFile* file, ScriptModule* ops); - ~ScriptMachine() { } + ~ScriptMachine() = default; SCMFile* getFile() const { return file; diff --git a/rwgame/State.hpp b/rwgame/State.hpp index 8708da72..540ea1bc 100644 --- a/rwgame/State.hpp +++ b/rwgame/State.hpp @@ -31,8 +31,7 @@ public: } } - virtual ~State() { - } + virtual ~State() = default; void enterMenu(const std::shared_ptr& menu) { nextMenu = menu; diff --git a/rwlib/source/data/Clump.cpp b/rwlib/source/data/Clump.cpp index 0e664512..66abe89b 100644 --- a/rwlib/source/data/Clump.cpp +++ b/rwlib/source/data/Clump.cpp @@ -98,8 +98,7 @@ ModelFrame* Clump::findFrame(const std::string& name) const { return rootframe_->findDescendant(name); } -Clump::~Clump() { -} +Clump::~Clump() = default; void Clump::recalculateMetrics() { boundingRadius = std::numeric_limits::min(); diff --git a/rwlib/source/data/Clump.hpp b/rwlib/source/data/Clump.hpp index 4d442e63..a4c6e9dc 100644 --- a/rwlib/source/data/Clump.hpp +++ b/rwlib/source/data/Clump.hpp @@ -135,8 +135,7 @@ struct GeometryVertex { , colour(_colour) { } - GeometryVertex() { - } + GeometryVertex() = default; }; /**