Merge branch 'default' into 'master'

Use `default` instead of empty constructors/destructors

See merge request OpenMW/openmw!957

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)
     {}

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);
 

apps/openmw/mwgui/bookpage.cpp

@@ -746,9 +746,7 @@ namespace
             mVertexColourType = MyGUI::RenderManager::getInstance().getVertexFormat();
         }
 
-        ~GlyphStream ()
+        ~GlyphStream () = default;
-        {
-        }
 
         MyGUI::Vertex* end () const { return mVertices; }
 

apps/openmw/mwmechanics/objects.cpp

@@ -13,10 +13,6 @@
 namespace MWMechanics
 {
 
-Objects::Objects()
-{
-}
-
 Objects::~Objects()
 {
   for(auto& object : mObjects)

apps/openmw/mwmechanics/objects.hpp

@@ -26,7 +26,7 @@ namespace MWMechanics
         PtrControllerMap mObjects;
 
     public:
-        Objects();
+        Objects() = default;
         ~Objects();
 
         void addObject (const MWWorld::Ptr& ptr);

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<osg::Node> node)

apps/openmw/mwrender/animation.hpp

@@ -207,7 +207,7 @@ protected:
                       mLoopCount(0), mPriority(0), mBlendMask(0), mAutoDisable(true)
         {
         }
-        ~AnimState();
+        ~AnimState() = default;
 
         float getTime() const
         {

apps/openmw/mwrender/localmap.cpp

@@ -673,11 +673,6 @@ LocalMap::MapSegment::MapSegment()
 {
 }
 
-LocalMap::MapSegment::~MapSegment()
-{
-
-}
-
 void LocalMap::MapSegment::createFogOfWarTexture()
 {
     if (mFogOfWarTexture)

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);

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;
     };
 }
 

apps/openmw/mwworld/containerstore.hpp

@@ -58,7 +58,7 @@ namespace MWWorld
             std::shared_ptr<ResolutionListener> mListener;
         public:
             ResolutionHandle(std::shared_ptr<ResolutionListener> listener) : mListener(listener) {}
-            ResolutionHandle() {}
+            ResolutionHandle() = default;
     };
     
     class ContainerStoreListener

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)
     {

components/misc/rng.cpp

@@ -10,9 +10,6 @@ namespace
 
 namespace Misc
 {
-
-    Rng::Seed::Seed() {}
-
     Rng::Seed::Seed(unsigned int seed)
     {
         mGenerator.seed(seed);

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;

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)

components/shader/shadervisitor.hpp

@@ -77,7 +77,7 @@ namespace Shader
         struct ShaderRequirements
         {
             ShaderRequirements();
-            ~ShaderRequirements();
+            ~ShaderRequirements() = default;
 
             // <texture stage, texture name>
             std::map<int, std::string> mTextures;