Merge pull request #16669 from Rechi/modernize/use-equals-default

[modernize] use-equals-default
xbmc · Sep 26, 2019 · f7c59fc · f7c59fc
2 parents b8b5fc7 + eecc666
commit f7c59fc
Show file tree

Hide file tree

Showing 104 changed files with 106 additions and 357 deletions.
diff --git a/tools/EventClients/Clients/OSXRemote/xbmcclientwrapper.mm b/tools/EventClients/Clients/OSXRemote/xbmcclientwrapper.mm
@@ -30,7 +30,7 @@
 //helper class for easy EventSequence handling
 class XBMCClientEventSequence{
 public:
-  XBMCClientEventSequence(){}
+  XBMCClientEventSequence() = default;
 
   //implicit conversion
   XBMCClientEventSequence(eATVClientEvent f_event){

diff --git a/tools/EventClients/lib/c++/xbmcclient.h b/tools/EventClients/lib/c++/xbmcclient.h
@@ -140,8 +140,8 @@ class CAddress
 class XBMCClientUtils
 {
 public:
-  XBMCClientUtils() {}
-  ~XBMCClientUtils() {}
+  XBMCClientUtils() = default;
+  ~XBMCClientUtils() = default;
   static unsigned int GetUniqueIdentifier()
   {
     static time_t id = time(NULL);
@@ -196,8 +196,7 @@ class CPacket
   {
     m_PacketType = 0;
   }
-  virtual ~CPacket()
-  { }
+  virtual ~CPacket() = default;
 
   bool Send(int Socket, CAddress &Addr, unsigned int UID = XBMCClientUtils::GetUniqueIdentifier())
   {
@@ -595,8 +594,7 @@ class CPacketPING : public CPacket
   {
     m_PacketType = PT_PING;
   }
-  virtual ~CPacketPING()
-  { }
+  virtual ~CPacketPING() = default;
 };
 
 class CPacketBYE : public CPacket
@@ -609,8 +607,7 @@ class CPacketBYE : public CPacket
   {
     m_PacketType = PT_BYE;
   }
-  virtual ~CPacketBYE()
-  { }
+  virtual ~CPacketBYE() = default;
 };
 
 class CPacketMOUSE : public CPacket
@@ -648,8 +645,7 @@ class CPacketMOUSE : public CPacket
     m_Payload.push_back( (m_Y & 0x00ff));
   }
 
-  virtual ~CPacketMOUSE()
-  { }
+  virtual ~CPacketMOUSE() = default;
 };
 
 class CPacketLOG : public CPacket
@@ -693,8 +689,7 @@ class CPacketLOG : public CPacket
     m_Payload.push_back('\0');
   }
 
-  virtual ~CPacketLOG()
-  { }
+  virtual ~CPacketLOG() = default;
 };
 
 class CPacketACTION : public CPacket
@@ -729,8 +724,7 @@ class CPacketACTION : public CPacket
     m_Payload.push_back('\0');
   }
 
-  virtual ~CPacketACTION()
-  { }
+  virtual ~CPacketACTION() = default;
 };
 
 class CXBMCClient

diff --git a/xbmc/AppParamParser.cpp b/xbmc/AppParamParser.cpp
@@ -23,9 +23,7 @@ CAppParamParser::CAppParamParser()
 {
 }
 
-CAppParamParser::~CAppParamParser()
-{
-}
+CAppParamParser::~CAppParamParser() = default;
 
 void CAppParamParser::Parse(const char* const* argv, int nArgs)
 {

diff --git a/xbmc/ApplicationPlayer.cpp b/xbmc/ApplicationPlayer.cpp
@@ -19,11 +19,6 @@
 #include "guilib/GUIWindowManager.h"
 #include "settings/MediaSettings.h"
 
-CApplicationPlayer::CApplicationPlayer()
-{
-
-}
-
 std::shared_ptr<IPlayer> CApplicationPlayer::GetInternal() const
 {
   CSingleLock lock(m_playerLock);

diff --git a/xbmc/ApplicationPlayer.h b/xbmc/ApplicationPlayer.h
@@ -31,7 +31,7 @@ struct TextCacheStruct_t;
 class CApplicationPlayer
 {
 public:
-  CApplicationPlayer();
+  CApplicationPlayer() = default;
 
   // player management
   void ClosePlayer();

diff --git a/xbmc/ApplicationStackHelper.cpp b/xbmc/ApplicationStackHelper.cpp
@@ -24,10 +24,6 @@ CApplicationStackHelper::CApplicationStackHelper(void)
 {
 }
 
-CApplicationStackHelper::~CApplicationStackHelper(void)
-{
-}
-
 void CApplicationStackHelper::Clear()
 {
   m_currentStackPosition = 0;

diff --git a/xbmc/ApplicationStackHelper.h b/xbmc/ApplicationStackHelper.h
@@ -15,7 +15,7 @@ class CApplicationStackHelper
 {
 public:
   CApplicationStackHelper(void);
-  ~CApplicationStackHelper(void);
+  ~CApplicationStackHelper() = default;
 
   void Clear();
   void OnPlayBackStarted(const CFileItem& item);

diff --git a/xbmc/ServiceManager.cpp b/xbmc/ServiceManager.cpp
@@ -35,9 +35,7 @@
 
 using namespace KODI;
 
-CServiceManager::CServiceManager()
-{
-}
+CServiceManager::CServiceManager() = default;
 
 CServiceManager::~CServiceManager()
 {

diff --git a/xbmc/addons/AddonVersion.h b/xbmc/addons/AddonVersion.h
@@ -57,11 +57,5 @@ namespace ADDON
     static int CompareComponent(const char *a, const char *b);
   };
 
-  inline AddonVersion& AddonVersion::operator=(const AddonVersion& other)
-  {
-    mEpoch = other.mEpoch;
-    mUpstream = other.mUpstream;
-    mRevision = other.mRevision;
-    return *this;
-  }
+  inline AddonVersion& AddonVersion::operator=(const AddonVersion& other) = default;
 }
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/addon-instance/PeripheralUtils.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/addon-instance/PeripheralUtils.h
@@ -150,9 +150,7 @@ namespace addon
   class PeripheralEvent
   {
   public:
-    PeripheralEvent(void)
-    {
-    }
+    PeripheralEvent() = default;
 
     PeripheralEvent(unsigned int peripheralIndex, unsigned int buttonIndex, JOYSTICK_STATE_BUTTON state) :
       m_type(PERIPHERAL_EVENT_TYPE_DRIVER_BUTTON),

diff --git a/xbmc/commons/Buffer.h b/xbmc/commons/Buffer.h
@@ -132,8 +132,7 @@ namespace XbmcCommons
      * in the source buffer and vice/vrs. However, each buffer maintains
      * its own indexing.
      */
-    inline Buffer(const Buffer& buf) : bufferRef(buf.bufferRef), buffer(buf.buffer),
-      mposition(buf.mposition), mcapacity(buf.mcapacity), mlimit(buf.mlimit) { }
+    inline Buffer(const Buffer& buf) = default;
 
     /**
      * Copy another buffer. This is a "shallow copy" and therefore

diff --git a/xbmc/commons/Exception.h b/xbmc/commons/Exception.h
@@ -52,7 +52,7 @@ namespace XbmcCommons
 
     inline explicit Exception(const char* classname_) : classname(classname_) { }
     inline Exception(const char* classname_, const char* message_) : classname(classname_), message(message_) { }
-    inline Exception(const Exception& other) : classname(other.classname), message(other.message) { }
+    inline Exception(const Exception& other) = default;
 
     /**
      * This method is called from the constructor of subclasses. It

diff --git a/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAEBuffer.cpp b/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAEBuffer.cpp
@@ -29,10 +29,6 @@ CSoundPacket::~CSoundPacket()
     CActiveAE::FreeSoundSample(data);
 }
 
-CSampleBuffer::CSampleBuffer()
-{
-}
-
 CSampleBuffer::~CSampleBuffer()
 {
   delete pkt;

diff --git a/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAEBuffer.h b/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAEBuffer.h
@@ -45,7 +45,7 @@ class CActiveAEBufferPool;
 class CSampleBuffer
 {
 public:
-  CSampleBuffer();
+  CSampleBuffer() = default;
   ~CSampleBuffer();
   CSampleBuffer *Acquire();
   void Return();

diff --git a/xbmc/cores/AudioEngine/Sinks/AESinkDARWINIOS.h b/xbmc/cores/AudioEngine/Sinks/AESinkDARWINIOS.h
@@ -29,7 +29,7 @@ class CAESinkDARWINIOS : public IAESink
   virtual const char *GetName() { return "DARWINIOS"; }
 
   CAESinkDARWINIOS();
-  virtual ~CAESinkDARWINIOS();
+  virtual ~CAESinkDARWINIOS() = default;
 
   static void Register();
   static void EnumerateDevicesEx(AEDeviceInfoList &list, bool force);

diff --git a/xbmc/cores/AudioEngine/Sinks/AESinkDARWINIOS.mm b/xbmc/cores/AudioEngine/Sinks/AESinkDARWINIOS.mm
@@ -583,10 +583,6 @@ static void EnumerateDevices(AEDeviceInfoList &list)
 {
 }
 
-CAESinkDARWINIOS::~CAESinkDARWINIOS()
-{
-}
-
 void CAESinkDARWINIOS::Register()
 {
   AE::AESinkRegEntry reg;

diff --git a/xbmc/cores/AudioEngine/Sinks/osx/AEDeviceEnumerationOSX.h b/xbmc/cores/AudioEngine/Sinks/osx/AEDeviceEnumerationOSX.h
@@ -40,7 +40,7 @@ class AEDeviceEnumerationOSX
   */
   AEDeviceEnumerationOSX(AudioDeviceID deviceID);
   // d'tor
-  ~AEDeviceEnumerationOSX(){};
+  ~AEDeviceEnumerationOSX() = default;
 
   /*!
   * @brief Gets the device list which was enumerated by the last call to Enumerate

diff --git a/xbmc/cores/AudioEngine/Utils/AEAudioFormat.h b/xbmc/cores/AudioEngine/Utils/AEAudioFormat.h
@@ -66,16 +66,6 @@ struct AEAudioFormat
             m_streamInfo    ==  fmt.m_streamInfo;
   }
 
-  AEAudioFormat& operator=(const AEAudioFormat& fmt)
-  {
-    m_dataFormat = fmt.m_dataFormat;
-    m_sampleRate = fmt.m_sampleRate;
-    m_channelLayout = fmt.m_channelLayout;
-    m_frames = fmt.m_frames;
-    m_frameSize = fmt.m_frameSize;
-    m_streamInfo = fmt.m_streamInfo;
-
-    return *this;
-  }
+  AEAudioFormat& operator=(const AEAudioFormat& fmt) = default;
 };
 
diff --git a/xbmc/cores/RetroPlayer/buffers/IRenderBuffer.h b/xbmc/cores/RetroPlayer/buffers/IRenderBuffer.h
@@ -24,7 +24,7 @@ namespace RETRO
   class IRenderBuffer
   {
   public:
-    virtual ~IRenderBuffer() { }
+    virtual ~IRenderBuffer() = default;
 
     // Pool functions
     virtual void Acquire() = 0;

diff --git a/xbmc/cores/VideoPlayer/DVDCodecs/Overlay/DVDOverlayText.h b/xbmc/cores/VideoPlayer/DVDCodecs/Overlay/DVDOverlayText.h
@@ -66,11 +66,7 @@ class CDVDOverlayText : public CDVDOverlay
     {
     }
 
-    CElementText(CElementText& src)
-     : CElement(src),
-       m_text(src.m_text)
-    {
-    }
+    CElementText(CElementText& src) = default;
 
     const std::string& GetText()
     { return m_text; }

diff --git a/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecAndroidMediaCodec.h b/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecAndroidMediaCodec.h
@@ -66,7 +66,7 @@ class CMediaCodecVideoBuffer : public CVideoBuffer
 public:
   CMediaCodecVideoBuffer(int id)
     : CVideoBuffer(id){};
-  virtual ~CMediaCodecVideoBuffer(){};
+  virtual ~CMediaCodecVideoBuffer() = default;
 
   void Set(int internalId,
            int textureId,

diff --git a/xbmc/cores/VideoPlayer/Process/android/ProcessInfoAndroid.cpp b/xbmc/cores/VideoPlayer/Process/android/ProcessInfoAndroid.cpp
@@ -15,10 +15,6 @@ CProcessInfo* CProcessInfoAndroid::Create()
   return new CProcessInfoAndroid();
 }
 
-CProcessInfoAndroid::CProcessInfoAndroid()
-{
-}
-
 void CProcessInfoAndroid::Register()
 {
   CProcessInfo::RegisterProcessControl("android", CProcessInfoAndroid::Create);

diff --git a/xbmc/cores/VideoPlayer/Process/android/ProcessInfoAndroid.h b/xbmc/cores/VideoPlayer/Process/android/ProcessInfoAndroid.h
@@ -16,7 +16,7 @@ namespace VIDEOPLAYER
   class CProcessInfoAndroid : public CProcessInfo
   {
   public:
-    CProcessInfoAndroid();
+    CProcessInfoAndroid() = default;
     static CProcessInfo* Create();
     static void Register();
     EINTERLACEMETHOD GetFallbackDeintMethod() override;

diff --git a/xbmc/cores/VideoPlayer/Process/gbm/ProcessInfoGBM.cpp b/xbmc/cores/VideoPlayer/Process/gbm/ProcessInfoGBM.cpp
@@ -20,10 +20,6 @@ void CProcessInfoGBM::Register()
   CProcessInfo::RegisterProcessControl("gbm", CProcessInfoGBM::Create);
 }
 
-CProcessInfoGBM::CProcessInfoGBM()
-{
-}
-
 EINTERLACEMETHOD CProcessInfoGBM::GetFallbackDeintMethod()
 {
 #if defined(__arm__)

diff --git a/xbmc/cores/VideoPlayer/Process/gbm/ProcessInfoGBM.h b/xbmc/cores/VideoPlayer/Process/gbm/ProcessInfoGBM.h
@@ -17,7 +17,7 @@ namespace VIDEOPLAYER
 class CProcessInfoGBM : public CProcessInfo
 {
 public:
-  CProcessInfoGBM();
+  CProcessInfoGBM() = default;
   static CProcessInfo* Create();
   static void Register();
   EINTERLACEMETHOD GetFallbackDeintMethod() override;

diff --git a/xbmc/cores/VideoPlayer/VideoRenderers/ColorManager.cpp b/xbmc/cores/VideoPlayer/VideoRenderers/ColorManager.cpp
@@ -34,16 +34,18 @@ CColorManager::CColorManager()
 #endif  //defined(HAVE_LCMS2)
 }
 
+#if defined(HAVE_LCMS2)
 CColorManager::~CColorManager()
 {
-#if defined(HAVE_LCMS2)
   if (m_hProfile)
   {
     cmsCloseProfile(m_hProfile);
     m_hProfile = nullptr;
   }
-#endif  //defined(HAVE_LCMS2)
 }
+#else
+CColorManager::~CColorManager() = default;
+#endif //defined(HAVE_LCMS2)
 
 bool CColorManager::IsEnabled() const
 {

diff --git a/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/RendererVTBGL.cpp b/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/RendererVTBGL.cpp
@@ -36,10 +36,6 @@ bool CRendererVTB::Register()
   return true;
 }
 
-CRendererVTB::CRendererVTB()
-{
-}
-
 CRendererVTB::~CRendererVTB()
 {
   for (int i = 0; i < NUM_BUFFERS; ++i)

diff --git a/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/RendererVTBGL.h b/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/RendererVTBGL.h
@@ -14,7 +14,7 @@
 class CRendererVTB : public CLinuxRendererGL
 {
 public:
-  CRendererVTB();
+  CRendererVTB() = default;
   virtual ~CRendererVTB();
 
   static CBaseRenderer* Create(CVideoBuffer *buffer);

diff --git a/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/VaapiEGL.cpp b/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/VaapiEGL.cpp
@@ -19,10 +19,6 @@
 
 using namespace VAAPI;
 
-CVaapi1Texture::CVaapi1Texture()
-{
-}
-
 void CVaapi1Texture::Init(InteropInfo &interop)
 {
   m_interop = interop;

diff --git a/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/VaapiEGL.h b/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/VaapiEGL.h
@@ -61,7 +61,7 @@ class CVaapiTexture
 class CVaapi1Texture : public CVaapiTexture
 {
 public:
-  CVaapi1Texture();
+  CVaapi1Texture() = default;
 
   bool Map(CVaapiRenderPicture *pic) override;
   void Unmap() override;

diff --git a/xbmc/dbwrappers/qry_dat.h b/xbmc/dbwrappers/qry_dat.h
@@ -209,9 +209,7 @@ typedef query_data::iterator qry_itor;
 class result_set
 {
 public:
-  result_set()
-  {
-  };
+  result_set() = default;
   ~result_set()
   {
     clear();