From 5840279f166f48b5dd372118c346d35d34b4585b Mon Sep 17 00:00:00 2001 From: jvoisin Date: Thu, 24 Jun 2021 00:26:15 +0200 Subject: [PATCH] Use `default` instead of empty constructors/destructors See https://pvs-studio.com/en/docs/warnings/v832/ for details --- apps/openmw/mwdialogue/journalentry.cpp | 4 ---- apps/openmw/mwdialogue/journalentry.hpp | 4 ++-- apps/openmw/mwgui/bookpage.cpp | 4 +--- apps/openmw/mwmechanics/objects.cpp | 4 ---- apps/openmw/mwmechanics/objects.hpp | 2 +- apps/openmw/mwrender/animation.cpp | 5 ----- apps/openmw/mwrender/animation.hpp | 2 +- apps/openmw/mwrender/localmap.cpp | 5 ----- apps/openmw/mwrender/localmap.hpp | 2 +- apps/openmw/mwsound/sound.hpp | 4 ++-- apps/openmw/mwworld/containerstore.hpp | 2 +- components/esm/util.hpp | 4 ++-- components/misc/rng.cpp | 3 --- components/misc/rng.hpp | 2 +- components/shader/shadervisitor.cpp | 5 ----- components/shader/shadervisitor.hpp | 2 +- 16 files changed, 13 insertions(+), 41 deletions(-) diff --git a/apps/openmw/mwdialogue/journalentry.cpp b/apps/openmw/mwdialogue/journalentry.cpp index 5eab6d5cae..32b2b101d9 100644 --- a/apps/openmw/mwdialogue/journalentry.cpp +++ b/apps/openmw/mwdialogue/journalentry.cpp @@ -16,8 +16,6 @@ namespace MWDialogue { - Entry::Entry() {} - Entry::Entry (const std::string& topic, const std::string& infoId, const MWWorld::Ptr& actor) : mInfoId (infoId) { @@ -60,8 +58,6 @@ namespace MWDialogue } - JournalEntry::JournalEntry() {} - JournalEntry::JournalEntry (const std::string& topic, const std::string& infoId, const MWWorld::Ptr& actor) : Entry (topic, infoId, actor), mTopic (topic) {} diff --git a/apps/openmw/mwdialogue/journalentry.hpp b/apps/openmw/mwdialogue/journalentry.hpp index 8711ab53a7..af09908891 100644 --- a/apps/openmw/mwdialogue/journalentry.hpp +++ b/apps/openmw/mwdialogue/journalentry.hpp @@ -22,7 +22,7 @@ namespace MWDialogue std::string mText; std::string mActorName; // optional - Entry(); + Entry() = default; /// actor is optional Entry (const std::string& topic, const std::string& infoId, const MWWorld::Ptr& actor); @@ -41,7 +41,7 @@ namespace MWDialogue { std::string mTopic; - JournalEntry(); + JournalEntry() = default; JournalEntry (const std::string& topic, const std::string& infoId, const MWWorld::Ptr& actor); diff --git a/apps/openmw/mwgui/bookpage.cpp b/apps/openmw/mwgui/bookpage.cpp index fba136f88f..49fae04619 100644 --- a/apps/openmw/mwgui/bookpage.cpp +++ b/apps/openmw/mwgui/bookpage.cpp @@ -746,9 +746,7 @@ namespace mVertexColourType = MyGUI::RenderManager::getInstance().getVertexFormat(); } - ~GlyphStream () - { - } + ~GlyphStream () = default; MyGUI::Vertex* end () const { return mVertices; } diff --git a/apps/openmw/mwmechanics/objects.cpp b/apps/openmw/mwmechanics/objects.cpp index 5b18fc2c30..eea0655dd8 100644 --- a/apps/openmw/mwmechanics/objects.cpp +++ b/apps/openmw/mwmechanics/objects.cpp @@ -13,10 +13,6 @@ namespace MWMechanics { -Objects::Objects() -{ -} - Objects::~Objects() { for(auto& object : mObjects) diff --git a/apps/openmw/mwmechanics/objects.hpp b/apps/openmw/mwmechanics/objects.hpp index 5160114a3f..ba39fdbd4f 100644 --- a/apps/openmw/mwmechanics/objects.hpp +++ b/apps/openmw/mwmechanics/objects.hpp @@ -26,7 +26,7 @@ namespace MWMechanics PtrControllerMap mObjects; public: - Objects(); + Objects() = default; ~Objects(); void addObject (const MWWorld::Ptr& ptr); diff --git a/apps/openmw/mwrender/animation.cpp b/apps/openmw/mwrender/animation.cpp index a11d97779c..53673d8a22 100644 --- a/apps/openmw/mwrender/animation.cpp +++ b/apps/openmw/mwrender/animation.cpp @@ -1973,11 +1973,6 @@ namespace MWRender return SceneUtil::hasUserDescription(mObjectRoot, Constants::HerbalismLabel); } - Animation::AnimState::~AnimState() - { - - } - // ------------------------------ PartHolder::PartHolder(osg::ref_ptr node) diff --git a/apps/openmw/mwrender/animation.hpp b/apps/openmw/mwrender/animation.hpp index 213a4f7049..24478439c1 100644 --- a/apps/openmw/mwrender/animation.hpp +++ b/apps/openmw/mwrender/animation.hpp @@ -207,7 +207,7 @@ protected: mLoopCount(0), mPriority(0), mBlendMask(0), mAutoDisable(true) { } - ~AnimState(); + ~AnimState() = default; float getTime() const { diff --git a/apps/openmw/mwrender/localmap.cpp b/apps/openmw/mwrender/localmap.cpp index 686078879d..24c00048d9 100644 --- a/apps/openmw/mwrender/localmap.cpp +++ b/apps/openmw/mwrender/localmap.cpp @@ -673,11 +673,6 @@ LocalMap::MapSegment::MapSegment() { } -LocalMap::MapSegment::~MapSegment() -{ - -} - void LocalMap::MapSegment::createFogOfWarTexture() { if (mFogOfWarTexture) diff --git a/apps/openmw/mwrender/localmap.hpp b/apps/openmw/mwrender/localmap.hpp index 83a975aeda..e586f8fb02 100644 --- a/apps/openmw/mwrender/localmap.hpp +++ b/apps/openmw/mwrender/localmap.hpp @@ -115,7 +115,7 @@ namespace MWRender struct MapSegment { MapSegment(); - ~MapSegment(); + ~MapSegment() = default; void initFogOfWar(); void loadFogOfWar(const ESM::FogTexture& fog); diff --git a/apps/openmw/mwsound/sound.hpp b/apps/openmw/mwsound/sound.hpp index d2e65c9895..17f052aec0 100644 --- a/apps/openmw/mwsound/sound.hpp +++ b/apps/openmw/mwsound/sound.hpp @@ -85,7 +85,7 @@ namespace MWSound Sound(Sound&&) = delete; public: - Sound() { } + Sound() = default; }; class Stream : public SoundBase { @@ -94,7 +94,7 @@ namespace MWSound Stream(Stream&&) = delete; public: - Stream() { } + Stream() = default; }; } diff --git a/apps/openmw/mwworld/containerstore.hpp b/apps/openmw/mwworld/containerstore.hpp index 5044b0f451..f18a595466 100644 --- a/apps/openmw/mwworld/containerstore.hpp +++ b/apps/openmw/mwworld/containerstore.hpp @@ -58,7 +58,7 @@ namespace MWWorld std::shared_ptr mListener; public: ResolutionHandle(std::shared_ptr listener) : mListener(listener) {} - ResolutionHandle() {} + ResolutionHandle() = default; }; class ContainerStoreListener diff --git a/components/esm/util.hpp b/components/esm/util.hpp index a80df2456f..204de371fb 100644 --- a/components/esm/util.hpp +++ b/components/esm/util.hpp @@ -13,7 +13,7 @@ struct Quaternion { float mValues[4]; - Quaternion() {} + Quaternion() = default; Quaternion(const osg::Quat& q) { @@ -33,7 +33,7 @@ struct Vector3 { float mValues[3]; - Vector3() {} + Vector3() = default; Vector3(const osg::Vec3f& v) { diff --git a/components/misc/rng.cpp b/components/misc/rng.cpp index 4805f0d91c..113e7b1d5b 100644 --- a/components/misc/rng.cpp +++ b/components/misc/rng.cpp @@ -10,9 +10,6 @@ namespace namespace Misc { - - Rng::Seed::Seed() {} - Rng::Seed::Seed(unsigned int seed) { mGenerator.seed(seed); diff --git a/components/misc/rng.hpp b/components/misc/rng.hpp index 998ac0d535..06e94897be 100644 --- a/components/misc/rng.hpp +++ b/components/misc/rng.hpp @@ -17,7 +17,7 @@ public: { std::mt19937 mGenerator; public: - Seed(); + Seed() = default; Seed(const Seed&) = delete; Seed(unsigned int seed); friend class Rng; diff --git a/components/shader/shadervisitor.cpp b/components/shader/shadervisitor.cpp index e8ac7d9c36..3c5898b873 100644 --- a/components/shader/shadervisitor.cpp +++ b/components/shader/shadervisitor.cpp @@ -38,11 +38,6 @@ namespace Shader { } - ShaderVisitor::ShaderRequirements::~ShaderRequirements() - { - - } - ShaderVisitor::ShaderVisitor(ShaderManager& shaderManager, Resource::ImageManager& imageManager, const std::string &defaultShaderPrefix) : osg::NodeVisitor(TRAVERSE_ALL_CHILDREN) , mForceShaders(false) diff --git a/components/shader/shadervisitor.hpp b/components/shader/shadervisitor.hpp index 30ff41a33c..a5add473a6 100644 --- a/components/shader/shadervisitor.hpp +++ b/components/shader/shadervisitor.hpp @@ -77,7 +77,7 @@ namespace Shader struct ShaderRequirements { ShaderRequirements(); - ~ShaderRequirements(); + ~ShaderRequirements() = default; // std::map mTextures;