moved ChatterinoSetting into src/common

src/singletons/Settings.hpp

@@ -1,9 +1,9 @@
 #pragma once
 
+#include "common/ChatterinoSetting.hpp"
 #include "controllers/highlights/HighlightPhrase.hpp"
 #include "controllers/moderationactions/ModerationAction.hpp"
 #include "messages/MessageElement.hpp"
-#include "singletons/helper/ChatterinoSetting.hpp"
 
 #include <pajlada/settings/setting.hpp>
 #include <pajlada/settings/settinglistener.hpp>

src/singletons/helper/ChatterinoSetting.cpp

@@ -1,12 +0,0 @@
-#include "singletons/helper/ChatterinoSetting.hpp"
-
-#include "singletons/Settings.hpp"
-
-namespace chatterino {
-
-void _registerSetting(std::weak_ptr<pajlada::Settings::ISettingData> setting)
-{
-    _actuallyRegisterSetting(setting);
-}
-
-}  // namespace chatterino

src/singletons/helper/ChatterinoSetting.hpp

@@ -1,53 +0,0 @@
-#pragma once
-
-#include <QString>
-#include <pajlada/settings.hpp>
-
-namespace chatterino {
-
-void _registerSetting(std::weak_ptr<pajlada::Settings::ISettingData> setting);
-
-template <typename Type>
-class ChatterinoSetting : public pajlada::Settings::Setting<Type>
-{
-public:
-    ChatterinoSetting(const std::string &_path)
-        : pajlada::Settings::Setting<Type>(_path)
-    {
-        _registerSetting(this->data);
-    }
-
-    ChatterinoSetting(const std::string &_path, const Type &_defaultValue)
-        : pajlada::Settings::Setting<Type>(_path, _defaultValue)
-    {
-        _registerSetting(this->data);
-    }
-
-    template <typename T2>
-    ChatterinoSetting &operator=(const T2 &newValue)
-    {
-        this->setValue(newValue);
-
-        return *this;
-    }
-
-    ChatterinoSetting &operator=(Type &&newValue) noexcept
-    {
-        pajlada::Settings::Setting<Type>::operator=(newValue);
-
-        return *this;
-    }
-
-    using pajlada::Settings::Setting<Type>::operator==;
-    using pajlada::Settings::Setting<Type>::operator!=;
-
-    using pajlada::Settings::Setting<Type>::operator const Type;
-};
-
-using BoolSetting = ChatterinoSetting<bool>;
-using FloatSetting = ChatterinoSetting<float>;
-using IntSetting = ChatterinoSetting<int>;
-using StringSetting = ChatterinoSetting<std::string>;
-using QStringSetting = ChatterinoSetting<QString>;
-
-}  // namespace chatterino