fix shared_ptr

xbmc · May 24, 2017 · 3021828 · 3021828
1 parent 5d1b4e5
commit 3021828
Show file tree

Hide file tree

Showing 9 changed files with 43 additions and 32 deletions.
diff --git a/xbmc/Autorun.h b/xbmc/Autorun.h
@@ -32,6 +32,7 @@
 
 #ifdef HAS_DVD_DRIVE
 
+#include <memory>
 #include <string>
 #include <utility>
 #include <vector>

diff --git a/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAESettings.h b/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAESettings.h
@@ -20,6 +20,7 @@
 
 #pragma once
 
+#include <memory>
 #include <string>
 #include <vector>
 

diff --git a/xbmc/linux/LinuxTimezone.cpp b/xbmc/linux/LinuxTimezone.cpp
@@ -160,7 +160,7 @@ void CLinuxTimezone::OnSettingChanged(std::shared_ptr<const CSetting> setting)
   const std::string &settingId = setting->GetId();
   if (settingId == CSettings::SETTING_LOCALE_TIMEZONE)
   {
-    SetTimezone(std::static_pointer_cast<CSettingString>(setting)->GetValue());
+    SetTimezone(std::static_pointer_cast<const CSettingString>(setting)->GetValue());
 
     CDateTime::ResetTimezoneBias();
   }

diff --git a/xbmc/powermanagement/PowerManager.h b/xbmc/powermanagement/PowerManager.h
@@ -20,6 +20,7 @@
  *
  */
 
+#include <memory>
 #include <string>
 #include <utility>
 #include <vector>

diff --git a/xbmc/settings/lib/Setting.cpp b/xbmc/settings/lib/Setting.cpp
@@ -487,20 +487,20 @@ bool CSettingList::SetValue(const SettingList &values)
   m_values.clear();
   m_values.insert(m_values.begin(), values.begin(), values.end());
 
-  if (!OnSettingChanging(shared_from_this()))
+  if (!OnSettingChanging(shared_from_base<CSettingList>()))
   {
     m_values = oldValues;
 
     // the setting couldn't be changed because one of the
     // callback handlers failed the OnSettingChanging()
     // callback so we need to let all the callback handlers
     // know that the setting hasn't changed
-    OnSettingChanging(shared_from_this());
+    OnSettingChanging(shared_from_base<CSettingList>());
     return false;
   }
 
   m_changed = (toString(m_values) != toString(m_defaults));
-  OnSettingChanged(shared_from_this());
+  OnSettingChanged(shared_from_base<CSettingList>());
   return true;
 }
 
@@ -679,20 +679,20 @@ bool CSettingBool::SetValue(bool value)
   bool oldValue = m_value;
   m_value = value;
 
-  if (!OnSettingChanging(shared_from_this()))
+  if (!OnSettingChanging(shared_from_base<CSettingBool>()))
   {
     m_value = oldValue;
 
     // the setting couldn't be changed because one of the
     // callback handlers failed the OnSettingChanging()
     // callback so we need to let all the callback handlers
     // know that the setting hasn't changed
-    OnSettingChanging(shared_from_this());
+    OnSettingChanging(shared_from_base<CSettingBool>());
     return false;
   }
 
   m_changed = m_value != m_default;
-  OnSettingChanged(shared_from_this());
+  OnSettingChanged(shared_from_base<CSettingBool>());
   return true;
 }
 
@@ -810,7 +810,7 @@ bool CSettingInt::Deserialize(const TiXmlNode *node, bool update /* = false */)
         m_optionsFillerName = options->FirstChild()->ValueStr();
         if (!m_optionsFillerName.empty())
         {
-          m_optionsFiller = (IntegerSettingOptionsFiller)m_settingsManager->GetSettingOptionsFiller(shared_from_this());
+          m_optionsFiller = (IntegerSettingOptionsFiller)m_settingsManager->GetSettingOptionsFiller(shared_from_base<CSettingInt>());
           if (m_optionsFiller == NULL)
             CLog::Log(LOGWARNING, "CSettingInt: unknown options filler \"%s\" of \"%s\"", m_optionsFillerName.c_str(), m_id.c_str());
         }
@@ -908,20 +908,20 @@ bool CSettingInt::SetValue(int value)
   int oldValue = m_value;
   m_value = value;
 
-  if (!OnSettingChanging(shared_from_this()))
+  if (!OnSettingChanging(shared_from_base<CSettingInt>()))
   {
     m_value = oldValue;
 
     // the setting couldn't be changed because one of the
     // callback handlers failed the OnSettingChanging()
     // callback so we need to let all the callback handlers
     // know that the setting hasn't changed
-    OnSettingChanging(shared_from_this());
+    OnSettingChanging(shared_from_base<CSettingInt>());
     return false;
   }
 
   m_changed = m_value != m_default;
-  OnSettingChanged(shared_from_this());
+  OnSettingChanged(shared_from_base<CSettingInt>());
   return true;
 }
 
@@ -957,13 +957,13 @@ IntegerSettingOptions CSettingInt::UpdateDynamicOptions()
 
   if (m_optionsFiller == NULL)
   {
-    m_optionsFiller = (IntegerSettingOptionsFiller)m_settingsManager->GetSettingOptionsFiller(shared_from_this());
+    m_optionsFiller = (IntegerSettingOptionsFiller)m_settingsManager->GetSettingOptionsFiller(shared_from_base<CSettingInt>());
     if (m_optionsFiller == NULL)
       return options;
   }
 
   int bestMatchingValue = m_value;
-  m_optionsFiller(shared_from_this(), options, bestMatchingValue, m_optionsFillerData);
+  m_optionsFiller(shared_from_base<CSettingInt>(), options, bestMatchingValue, m_optionsFillerData);
 
   if (bestMatchingValue != m_value)
     SetValue(bestMatchingValue);
@@ -985,7 +985,7 @@ IntegerSettingOptions CSettingInt::UpdateDynamicOptions()
   if (changed)
   {
     m_dynamicOptions = options;
-    OnSettingPropertyChanged(shared_from_this(), "options");
+    OnSettingPropertyChanged(shared_from_base<CSettingInt>(), "options");
   }
 
   return options;
@@ -1143,20 +1143,20 @@ bool CSettingNumber::SetValue(double value)
   double oldValue = m_value;
   m_value = value;
 
-  if (!OnSettingChanging(shared_from_this()))
+  if (!OnSettingChanging(shared_from_base<CSettingNumber>()))
   {
     m_value = oldValue;
 
     // the setting couldn't be changed because one of the
     // callback handlers failed the OnSettingChanging()
     // callback so we need to let all the callback handlers
     // know that the setting hasn't changed
-    OnSettingChanging(shared_from_this());
+    OnSettingChanging(shared_from_base<CSettingNumber>());
     return false;
   }
 
   m_changed = m_value != m_default;
-  OnSettingChanged(shared_from_this());
+  OnSettingChanged(shared_from_base<CSettingNumber>());
   return true;
 }
 
@@ -1246,7 +1246,7 @@ bool CSettingString::Deserialize(const TiXmlNode *node, bool update /* = false *
         m_optionsFillerName = options->FirstChild()->ValueStr();
         if (!m_optionsFillerName.empty())
         {
-          m_optionsFiller = (StringSettingOptionsFiller)m_settingsManager->GetSettingOptionsFiller(shared_from_this());
+          m_optionsFiller = (StringSettingOptionsFiller)m_settingsManager->GetSettingOptionsFiller(shared_from_base<CSettingString>());
           if (m_optionsFiller == NULL)
             CLog::Log(LOGWARNING, "CSettingString: unknown options filler \"%s\" of \"%s\"", m_optionsFillerName.c_str(), m_id.c_str());
         }
@@ -1317,20 +1317,20 @@ bool CSettingString::SetValue(const std::string &value)
   std::string oldValue = m_value;
   m_value = value;
 
-  if (!OnSettingChanging(shared_from_this()))
+  if (!OnSettingChanging(shared_from_base<CSettingString>()))
   {
     m_value = oldValue;
 
     // the setting couldn't be changed because one of the
     // callback handlers failed the OnSettingChanging()
     // callback so we need to let all the callback handlers
     // know that the setting hasn't changed
-    OnSettingChanging(shared_from_this());
+    OnSettingChanging(shared_from_base<CSettingString>());
     return false;
   }
 
   m_changed = m_value != m_default;
-  OnSettingChanged(shared_from_this());
+  OnSettingChanged(shared_from_base<CSettingString>());
   return true;
 }
 
@@ -1366,13 +1366,13 @@ StringSettingOptions CSettingString::UpdateDynamicOptions()
 
   if (m_optionsFiller == NULL)
   {
-    m_optionsFiller = (StringSettingOptionsFiller)m_settingsManager->GetSettingOptionsFiller(shared_from_this());
+    m_optionsFiller = (StringSettingOptionsFiller)m_settingsManager->GetSettingOptionsFiller(shared_from_base<CSettingString>());
     if (m_optionsFiller == NULL)
       return options;
   }
 
   std::string bestMatchingValue = m_value;
-  m_optionsFiller(shared_from_this(), options, bestMatchingValue, m_optionsFillerData);
+  m_optionsFiller(shared_from_base<CSettingString>(), options, bestMatchingValue, m_optionsFillerData);
 
   if (bestMatchingValue != m_value)
     SetValue(bestMatchingValue);
@@ -1395,7 +1395,7 @@ StringSettingOptions CSettingString::UpdateDynamicOptions()
   if (changed)
   {
     m_dynamicOptions = options;
-    OnSettingPropertyChanged(shared_from_this(), "options");
+    OnSettingPropertyChanged(shared_from_base<CSettingString>(), "options");
   }
 
   return options;

diff --git a/xbmc/settings/lib/Setting.h b/xbmc/settings/lib/Setting.h
@@ -79,7 +79,7 @@ typedef std::vector<std::shared_ptr<CSetting>> SettingList;
  */
 class CSetting : public ISetting,
                  protected ISettingCallback,
-                 protected std::enable_shared_from_this<CSetting>
+                 public std::enable_shared_from_this<CSetting>
 {
 public:
   CSetting(const std::string &id, CSettingsManager *settingsManager = NULL);
@@ -132,6 +132,12 @@ class CSetting : public ISetting,
 
   void Copy(const CSetting &setting);
 
+  template<class TSetting>
+  std::shared_ptr<TSetting> shared_from_base()
+  {
+    return std::static_pointer_cast<TSetting>(shared_from_this());
+  }
+
   ISettingCallback *m_callback;
   int m_label;
   int m_help;

diff --git a/xbmc/settings/lib/SettingDefinitions.h b/xbmc/settings/lib/SettingDefinitions.h
@@ -19,6 +19,7 @@
  *
  */
 
+#include <memory>
 #include <string>
 #include <utility>
 #include <vector>

diff --git a/xbmc/settings/windows/GUIControlSettings.h b/xbmc/settings/windows/GUIControlSettings.h
@@ -21,6 +21,7 @@
 
 #include <stdlib.h>
 #include <functional>
+#include <memory>
 #include <string>
 
 #include "guilib/ISliderCallback.h"

diff --git a/xbmc/video/dialogs/GUIDialogCMSSettings.cpp b/xbmc/video/dialogs/GUIDialogCMSSettings.cpp
@@ -193,21 +193,21 @@ void CGUIDialogCMSSettings::OnSettingChanged(std::shared_ptr<const CSetting> set
 
   const std::string &settingId = setting->GetId();
   if (settingId == SETTING_VIDEO_CMSENABLE)
-    CServiceBroker::GetSettings().SetBool(SETTING_VIDEO_CMSENABLE, (std::static_pointer_cast<CSettingBool>(setting)->GetValue()));
+    CServiceBroker::GetSettings().SetBool(SETTING_VIDEO_CMSENABLE, (std::static_pointer_cast<const CSettingBool>(setting)->GetValue()));
   else if (settingId == SETTING_VIDEO_CMSMODE)
-    CServiceBroker::GetSettings().SetInt(SETTING_VIDEO_CMSMODE, static_cast<int>(std::static_pointer_cast<CSettingInt>(setting)->GetValue()));
+    CServiceBroker::GetSettings().SetInt(SETTING_VIDEO_CMSMODE, static_cast<int>(std::static_pointer_cast<const CSettingInt>(setting)->GetValue()));
   else if (settingId == SETTING_VIDEO_CMS3DLUT)
     CServiceBroker::GetSettings().SetString(SETTING_VIDEO_CMS3DLUT, static_cast<std::string>(std::static_pointer_cast<const CSettingString>(setting)->GetValue()));
   else if (settingId == SETTING_VIDEO_CMSWHITEPOINT)
-    CServiceBroker::GetSettings().SetInt(SETTING_VIDEO_CMSWHITEPOINT, static_cast<int>(std::static_pointer_cast<CSettingInt>(setting)->GetValue()));
+    CServiceBroker::GetSettings().SetInt(SETTING_VIDEO_CMSWHITEPOINT, static_cast<int>(std::static_pointer_cast<const CSettingInt>(setting)->GetValue()));
   else if (settingId == SETTING_VIDEO_CMSPRIMARIES)
-    CServiceBroker::GetSettings().SetInt(SETTING_VIDEO_CMSPRIMARIES, static_cast<int>(std::static_pointer_cast<CSettingInt>(setting)->GetValue()));
+    CServiceBroker::GetSettings().SetInt(SETTING_VIDEO_CMSPRIMARIES, static_cast<int>(std::static_pointer_cast<const CSettingInt>(setting)->GetValue()));
   else if (settingId == SETTING_VIDEO_CMSGAMMAMODE)
-    CServiceBroker::GetSettings().SetInt(SETTING_VIDEO_CMSGAMMAMODE, static_cast<int>(std::static_pointer_cast<CSettingInt>(setting)->GetValue()));
+    CServiceBroker::GetSettings().SetInt(SETTING_VIDEO_CMSGAMMAMODE, static_cast<int>(std::static_pointer_cast<const CSettingInt>(setting)->GetValue()));
   else if (settingId == SETTING_VIDEO_CMSGAMMA)
-    CServiceBroker::GetSettings().SetInt(SETTING_VIDEO_CMSGAMMA, static_cast<float>(std::static_pointer_cast<CSettingNumber>(setting)->GetValue())*100);
+    CServiceBroker::GetSettings().SetInt(SETTING_VIDEO_CMSGAMMA, static_cast<float>(std::static_pointer_cast<const CSettingNumber>(setting)->GetValue())*100);
   else if (settingId == SETTING_VIDEO_CMSLUTSIZE)
-    CServiceBroker::GetSettings().SetInt(SETTING_VIDEO_CMSLUTSIZE, static_cast<int>(std::static_pointer_cast<CSettingInt>(setting)->GetValue()));
+    CServiceBroker::GetSettings().SetInt(SETTING_VIDEO_CMSLUTSIZE, static_cast<int>(std::static_pointer_cast<const CSettingInt>(setting)->GetValue()));
 }
 
 bool CGUIDialogCMSSettings::OnBack(int actionID)