SettingsInterface: Make strings the only virtual type

Others can be resolved by the base class.

Author: stenzek

src/common/layered_settings_interface.cpp

@@ -14,132 +14,23 @@ bool LayeredSettingsInterface::IsEmpty()
   return false;
 }
 
-bool LayeredSettingsInterface::GetIntValue(const char* section, const char* key, s32* value) const
+bool LayeredSettingsInterface::LookupValue(const char* section, const char* key, std::string_view* value) const
 {
   for (u32 layer = FIRST_LAYER; layer <= LAST_LAYER; layer++)
   {
     if (SettingsInterface* sif = m_layers[layer]; sif != nullptr)
     {
-      if (sif->GetIntValue(section, key, value))
+      if (sif->LookupValue(section, key, value))
         return true;
     }
   }
 
   return false;
 }
 
-bool LayeredSettingsInterface::GetUIntValue(const char* section, const char* key, u32* value) const
+void LayeredSettingsInterface::StoreValue(const char* section, const char* key, std::string_view value)
 {
-  for (u32 layer = FIRST_LAYER; layer <= LAST_LAYER; layer++)
-  {
-    if (SettingsInterface* sif = m_layers[layer]; sif != nullptr)
-    {
-      if (sif->GetUIntValue(section, key, value))
-        return true;
-    }
-  }
-
-  return false;
-}
-
-bool LayeredSettingsInterface::GetFloatValue(const char* section, const char* key, float* value) const
-{
-  for (u32 layer = FIRST_LAYER; layer <= LAST_LAYER; layer++)
-  {
-    if (SettingsInterface* sif = m_layers[layer]; sif != nullptr)
-    {
-      if (sif->GetFloatValue(section, key, value))
-        return true;
-    }
-  }
-
-  return false;
-}
-
-bool LayeredSettingsInterface::GetDoubleValue(const char* section, const char* key, double* value) const
-{
-  for (u32 layer = FIRST_LAYER; layer <= LAST_LAYER; layer++)
-  {
-    if (SettingsInterface* sif = m_layers[layer]; sif != nullptr)
-    {
-      if (sif->GetDoubleValue(section, key, value))
-        return true;
-    }
-  }
-
-  return false;
-}
-
-bool LayeredSettingsInterface::GetBoolValue(const char* section, const char* key, bool* value) const
-{
-  for (u32 layer = FIRST_LAYER; layer <= LAST_LAYER; layer++)
-  {
-    if (SettingsInterface* sif = m_layers[layer]; sif != nullptr)
-    {
-      if (sif->GetBoolValue(section, key, value))
-        return true;
-    }
-  }
-
-  return false;
-}
-
-bool LayeredSettingsInterface::GetStringValue(const char* section, const char* key, std::string* value) const
-{
-  for (u32 layer = FIRST_LAYER; layer <= LAST_LAYER; layer++)
-  {
-    if (SettingsInterface* sif = m_layers[layer]; sif != nullptr)
-    {
-      if (sif->GetStringValue(section, key, value))
-        return true;
-    }
-  }
-
-  return false;
-}
-
-bool LayeredSettingsInterface::GetStringValue(const char* section, const char* key, SmallStringBase* value) const
-{
-  for (u32 layer = FIRST_LAYER; layer <= LAST_LAYER; layer++)
-  {
-    if (SettingsInterface* sif = m_layers[layer]; sif != nullptr)
-    {
-      if (sif->GetStringValue(section, key, value))
-        return true;
-    }
-  }
-
-  return false;
-}
-
-void LayeredSettingsInterface::SetIntValue(const char* section, const char* key, int value)
-{
-  Panic("Attempt to call SetIntValue() on layered settings interface");
-}
-
-void LayeredSettingsInterface::SetUIntValue(const char* section, const char* key, u32 value)
-{
-  Panic("Attempt to call SetUIntValue() on layered settings interface");
-}
-
-void LayeredSettingsInterface::SetFloatValue(const char* section, const char* key, float value)
-{
-  Panic("Attempt to call SetFloatValue() on layered settings interface");
-}
-
-void LayeredSettingsInterface::SetDoubleValue(const char* section, const char* key, double value)
-{
-  Panic("Attempt to call SetDoubleValue() on layered settings interface");
-}
-
-void LayeredSettingsInterface::SetBoolValue(const char* section, const char* key, bool value)
-{
-  Panic("Attempt to call SetBoolValue() on layered settings interface");
-}
-
-void LayeredSettingsInterface::SetStringValue(const char* section, const char* key, const char* value)
-{
-  Panic("Attempt to call SetStringValue() on layered settings interface");
+  Panic("Attempt to call StoreValue() on layered settings interface");
 }
 
 bool LayeredSettingsInterface::ContainsValue(const char* section, const char* key) const

src/common/layered_settings_interface.h

@@ -24,20 +24,8 @@ class LayeredSettingsInterface final : public SettingsInterface
 
   bool IsEmpty() override;
 
-  bool GetIntValue(const char* section, const char* key, s32* value) const override;
-  bool GetUIntValue(const char* section, const char* key, u32* value) const override;
-  bool GetFloatValue(const char* section, const char* key, float* value) const override;
-  bool GetDoubleValue(const char* section, const char* key, double* value) const override;
-  bool GetBoolValue(const char* section, const char* key, bool* value) const override;
-  bool GetStringValue(const char* section, const char* key, std::string* value) const override;
-  bool GetStringValue(const char* section, const char* key, SmallStringBase* value) const override;
-
-  void SetIntValue(const char* section, const char* key, s32 value) override;
-  void SetUIntValue(const char* section, const char* key, u32 value) override;
-  void SetFloatValue(const char* section, const char* key, float value) override;
-  void SetDoubleValue(const char* section, const char* key, double value) override;
-  void SetBoolValue(const char* section, const char* key, bool value) override;
-  void SetStringValue(const char* section, const char* key, const char* value) override;
+  bool LookupValue(const char* section, const char* key, std::string_view* value) const override;
+  void StoreValue(const char* section, const char* key, std::string_view value) override;
   bool ContainsValue(const char* section, const char* key) const override;
   void DeleteValue(const char* section, const char* key) override;
   void ClearSection(const char* section) override;
@@ -52,14 +40,6 @@ class LayeredSettingsInterface final : public SettingsInterface
   std::vector<std::pair<std::string, std::string>> GetKeyValueList(const char* section) const override;
   void SetKeyValueList(const char* section, const std::vector<std::pair<std::string, std::string>>& items) override;
 
-  // default parameter overloads
-  using SettingsInterface::GetBoolValue;
-  using SettingsInterface::GetDoubleValue;
-  using SettingsInterface::GetFloatValue;
-  using SettingsInterface::GetIntValue;
-  using SettingsInterface::GetStringValue;
-  using SettingsInterface::GetUIntValue;
-
 private:
   static constexpr Layer FIRST_LAYER = LAYER_GAME;
   static constexpr Layer LAST_LAYER = LAYER_BASE;