From ccdf9a73cefab19880394365593ed75cfb3b3fda Mon Sep 17 00:00:00 2001 From: Marc Mutz Date: Sat, 12 Jun 2021 13:55:57 +0200 Subject: [PATCH] QSettings: hide the return type of actualKey() and normalizedKey() It may change in the future. Change-Id: If65bf690b12d4e6474557d7a48567941b18413bf Reviewed-by: Edward Welbourne Reviewed-by: Thiago Macieira --- src/corelib/io/qsettings.cpp | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/src/corelib/io/qsettings.cpp b/src/corelib/io/qsettings.cpp index 97e3bf884b1..d48bc6f3549 100644 --- a/src/corelib/io/qsettings.cpp +++ b/src/corelib/io/qsettings.cpp @@ -231,7 +231,7 @@ QSettingsPrivate::~QSettingsPrivate() QString QSettingsPrivate::actualKey(const QString &key) const { - QString n = normalizedKey(key); + auto n = normalizedKey(key); Q_ASSERT_X(!n.isEmpty(), "QSettings", "empty key"); return groupPrefix + n; } @@ -3148,8 +3148,7 @@ void QSettings::setValue(const QString &key, const QVariant &value) qWarning("QSettings::setValue: Empty key passed"); return; } - QString k = d->actualKey(key); - d->set(k, value); + d->set(d->actualKey(key), value); d->requestUpdate(); } @@ -3214,8 +3213,7 @@ void QSettings::remove(const QString &key) bool QSettings::contains(const QString &key) const { Q_D(const QSettings); - QString k = d->actualKey(key); - return d->get(k, nullptr); + return d->get(d->actualKey(key), nullptr); } /*! @@ -3285,8 +3283,7 @@ QVariant QSettings::value(const QString &key, const QVariant &defaultValue) cons return QVariant(); } QVariant result = defaultValue; - QString k = d->actualKey(key); - d->get(k, &result); + d->get(d->actualKey(key), &result); return result; }