From 7a878bda2ba617ff2eac98b7089f0f0053a9ea30 Mon Sep 17 00:00:00 2001 From: Manuel Nickschas Date: Mon, 10 Sep 2018 23:24:07 +0200 Subject: [PATCH] qa: Don't return a const ref from Settings::localValue() Stumbled on this by accident because one particular CI configuration warned about Settings::localValue() returning a stack reference (may happen if the default value (which is a const ref itself) is returned). Not sure why I don't see this warning in my own setup, but it's legitimate; thus fix the issue. --- src/common/settings.cpp | 2 +- src/common/settings.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/common/settings.cpp b/src/common/settings.cpp index d742af16..2330f45f 100644 --- a/src/common/settings.cpp +++ b/src/common/settings.cpp @@ -195,7 +195,7 @@ void Settings::setLocalValue(const QString &key, const QVariant &data) } -const QVariant &Settings::localValue(const QString &key, const QVariant &def) +QVariant Settings::localValue(const QString &key, const QVariant &def) { QString normKey = normalizedKey(group, key); if (!isCached(normKey)) { diff --git a/src/common/settings.h b/src/common/settings.h index 625291e8..681e5b27 100644 --- a/src/common/settings.h +++ b/src/common/settings.h @@ -108,7 +108,7 @@ protected: virtual QStringList localChildGroups(const QString &rootkey = QString()); virtual void setLocalValue(const QString &key, const QVariant &data); - virtual const QVariant &localValue(const QString &key, const QVariant &def = QVariant()); + virtual QVariant localValue(const QString &key, const QVariant &def = QVariant()); /** * Gets if a key exists in settings -- 2.20.1