diff --git a/modules/gui/qt/dialogs/toolbar/controlbar_profile_model.cpp b/modules/gui/qt/dialogs/toolbar/controlbar_profile_model.cpp index 12959d6054b97c8c6cc96628aa8e669a0a397ff7..96d2800a9263fb144f44c12d0af7404ac109b083 100644 --- a/modules/gui/qt/dialogs/toolbar/controlbar_profile_model.cpp +++ b/modules/gui/qt/dialogs/toolbar/controlbar_profile_model.cpp @@ -25,14 +25,16 @@ #include "player/control_list_model.hpp" #include "player/player_controlbar_model.hpp" -#define SETTINGS_KEY_SELECTEDPROFILE "SelectedProfile" -#define SETTINGS_ARRAYNAME_PROFILES "Profiles" -#define SETTINGS_KEY_NAME "Name" -#define SETTINGS_KEY_MODEL "Model" +// NOTE: QSettings started to accept QAnyStringView with Qt 6.4, +// so instead of a QString(Literal), use QLatin1String(View): +constexpr QLatin1String SETTINGS_KEY_SELECTEDPROFILE {"SelectedProfile"}; +constexpr QLatin1String SETTINGS_ARRAYNAME_PROFILES {"Profiles"}; +constexpr QLatin1String SETTINGS_KEY_NAME {"Name"}; +constexpr QLatin1String SETTINGS_KEY_MODEL {"Model"}; -#define SETTINGS_CONTROL_SEPARATOR QChar(',') -#define SETTINGS_CONFIGURATION_SEPARATOR QChar('|') -#define SETTINGS_PROFILE_SEPARATOR QChar('$') +constexpr QChar SETTINGS_CONTROL_SEPARATOR {','}; +constexpr QChar SETTINGS_CONFIGURATION_SEPARATOR {'|'}; +constexpr QChar SETTINGS_PROFILE_SEPARATOR {'$'}; decltype (ControlbarProfileModel::m_defaults) ControlbarProfileModel::m_defaults = @@ -726,16 +728,14 @@ void ControlbarProfileModel::save(bool clearDirty) const return ret; }; - { - val += SETTINGS_PROFILE_SEPARATOR; - val += QString::number(identifier); - val += SETTINGS_CONFIGURATION_SEPARATOR; - val += join(serializedModels[0]); - val += SETTINGS_CONFIGURATION_SEPARATOR; - val += join(serializedModels[1]); - val += SETTINGS_CONFIGURATION_SEPARATOR; - val += join(serializedModels[2]); - } + val += SETTINGS_PROFILE_SEPARATOR % + QString::number(identifier) % + SETTINGS_CONFIGURATION_SEPARATOR % + join(serializedModels[0]) % + SETTINGS_CONFIGURATION_SEPARATOR % + join(serializedModels[1]) % + SETTINGS_CONFIGURATION_SEPARATOR % + join(serializedModels[2]); } if (clearDirty)