diff --git a/src/libs/vmisc/def.h b/src/libs/vmisc/def.h index 88e563da5..518170c9f 100644 --- a/src/libs/vmisc/def.h +++ b/src/libs/vmisc/def.h @@ -356,8 +356,8 @@ enum class GSizes : unsigned char { ALL, #endif // defined(__cplusplus) #endif // QT_VERSION < QT_VERSION_CHECK(5, 8, 0) -template -const auto & ConstFirst (const T &container) +template class Cont> +inline const T& ConstFirst (const Cont &container) { #if QT_VERSION >= QT_VERSION_CHECK(5, 6, 0) return container.constFirst(); @@ -366,6 +366,15 @@ const auto & ConstFirst (const T &container) #endif } +template +inline const T& ConstFirst (const C &container) +{ +#if QT_VERSION >= QT_VERSION_CHECK(5, 6, 0) + return container.constFirst(); +#else + return container.first(); // clazy:exclude=detaching-temporary +#endif +} bool IsOptionSet(int argc, char *argv[], const char *option); void InitHighDpiScaling(int argc, char *argv[]); diff --git a/src/libs/vmisc/vcommonsettings.cpp b/src/libs/vmisc/vcommonsettings.cpp index ef7b1890e..100b30335 100644 --- a/src/libs/vmisc/vcommonsettings.cpp +++ b/src/libs/vmisc/vcommonsettings.cpp @@ -1011,10 +1011,10 @@ void VCommonSettings::SetHideLabels(bool value) QString VCommonSettings::GetLabelDateFormat() const { const QString format = value(*settingLabelDateFormat, - ConstFirst (VCommonSettings::PredefinedDateFormats())).toString(); + ConstFirst (VCommonSettings::PredefinedDateFormats())).toString(); const QStringList allFormats = VCommonSettings::PredefinedDateFormats() + GetUserDefinedDateFormats(); - return allFormats.contains(format) ? format : ConstFirst (VCommonSettings::PredefinedDateFormats()); + return allFormats.contains(format) ? format : ConstFirst (VCommonSettings::PredefinedDateFormats()); } //--------------------------------------------------------------------------------------------------------------------- @@ -1067,10 +1067,10 @@ void VCommonSettings::SetUserDefinedDateFormats(const QStringList &formats) QString VCommonSettings::GetLabelTimeFormat() const { const QString format = value(*settingLabelTimeFormat, - ConstFirst (VCommonSettings::PredefinedTimeFormats())).toString(); + ConstFirst (VCommonSettings::PredefinedTimeFormats())).toString(); const QStringList allFormats = VCommonSettings::PredefinedTimeFormats() + GetUserDefinedTimeFormats(); - return allFormats.contains(format) ? format : ConstFirst (VCommonSettings::PredefinedTimeFormats()); + return allFormats.contains(format) ? format : ConstFirst (VCommonSettings::PredefinedTimeFormats()); } //---------------------------------------------------------------------------------------------------------------------