diff -r 8efa3a33172e -r 5509bec02c81 src/settings.h --- a/src/settings.h Mon Jun 20 02:04:51 2022 +0300 +++ b/src/settings.h Mon Jun 20 16:43:56 2022 +0300 @@ -5,16 +5,11 @@ #include "libraries.h" #include "gl/common.h" -// SettingType - get type of setting by enumerator -template -struct SettingId{}; - -template +template struct SettingInfo{}; #define SETTING(NAME, DEFVALUE) \ - namespace SettingIdTypes { class NAME; } \ - namespace Setting { constexpr SettingId NAME; } \ + namespace Setting { class NAME; } \ template<> \ struct SettingInfo \ { \ @@ -51,21 +46,21 @@ // ----------------------------------------------------------------------------- #undef SETTING -template +template using SettingType_t = typename SettingInfo::type; static_assert(std::is_same_v, bool>); -template +template const char* settingName = SettingInfo::name; -template +template inline auto settingDefaultValue() { return SettingInfo::defaultValue(); } // get() - get setting by enumerator -template +template inline SettingType_t setting() { static const QVariant defvariant = QVariant::fromValue(settingDefaultValue()); @@ -74,7 +69,7 @@ } // setSetting() - set value of setting -template +template inline void setSetting(const SettingType_t& value) { if (value == settingDefaultValue()) {