From 2ecbea3d24529b9776acb620c82af04a076b817f Mon Sep 17 00:00:00 2001 From: Dirk Hohndel Date: Fri, 7 Sep 2018 09:06:00 -0700 Subject: qPref: use helper function to ensure key/name grouping We had a couple of instances of names being incorrectly merged with their group, this should handle that better. It's a bit of a big hammer to use, but it seems to work (and it makes it easy to then git grep for cases that don't use the new helper function. Signed-off-by: Dirk Hohndel --- core/settings/qPrefPrivate.cpp | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'core/settings/qPrefPrivate.cpp') diff --git a/core/settings/qPrefPrivate.cpp b/core/settings/qPrefPrivate.cpp index 6e835b92f..8cbbe932e 100644 --- a/core/settings/qPrefPrivate.cpp +++ b/core/settings/qPrefPrivate.cpp @@ -9,6 +9,12 @@ void qPrefPrivate::copy_txt(const char **name, const QString &string) *name = copy_qstring(string); } +QString keyFromGroupAndName(QString group, QString name) +{ + QString slash = (group.endsWith('/') || name.startsWith('/')) ? "" : "/"; + return group + slash + name; +} + void qPrefPrivate::propSetValue(const QString &key, const QVariant &value, const QVariant &defaultValue) { // REMARK: making s static (which would be logical) does NOT work -- cgit v1.2.3-70-g09d2