From: Manuel Nickschas <sputnick@quassel-irc.org>
Date: Mon, 10 Sep 2018 21:24:07 +0000 (+0200)
Subject: qa: Don't return a const ref from Settings::localValue()
X-Git-Tag: 0.13-rc2~32
X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=commitdiff_plain;h=7a878bda2ba617ff2eac98b7089f0f0053a9ea30;hp=29252b7065315dfb5b4a226f7ab7998bfd08ee65

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.
---

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