From 2fdf354c66cb650605e0349ebf1228f3aa43dacc Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Thu, 21 Jan 2021 11:09:03 +0100 Subject: Silence warnings about deprecated QString::QString(const char*) Fix warnings like: src/qmllocalstorage/qqmllocalstorage.cpp:81:62: warning: QString::QString(const char*) is deprecated: Use fromUtf8, QStringLiteral, or QLatin1String [-Wdeprecated-declarations] src/src/labs/settings/qqmlsettings.cpp:335:87: warning: QString::QString(const char*) is deprecated: Use fromUtf8, QStringLiteral, or QLatin1String [-Wdeprecated-declarations] src/labs/settings/qqmlsettings.cpp:346:50: warning: QString::QString(const char*) is deprecated: Use fromUtf8, QStringLiteral, or n1String [-Wdeprecated-declarations] src/labs/settings/qqmlsettings.cpp:361:50: warning: QString::QString(const char*) is deprecated: Use fromUtf8, QStringLiteral, or n1String [-Wdeprecated-declarations] src/quicklayouts/qquicklayout.cpp:1241:61: warning: QString::QString(const char*) is deprecated: Use fromUtf8, QStringLiteral, or QLatin1String [-Wdeprecated-declarations] Change-Id: I87d7e28842a4f7f75b02c1e78eb3df400adcab94 Reviewed-by: Fabian Kosmale --- src/labs/settings/qqmlsettings.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'src/labs') diff --git a/src/labs/settings/qqmlsettings.cpp b/src/labs/settings/qqmlsettings.cpp index ff8ec5e065..bf1ad021a7 100644 --- a/src/labs/settings/qqmlsettings.cpp +++ b/src/labs/settings/qqmlsettings.cpp @@ -330,9 +330,11 @@ void QQmlSettingsPrivate::load() for (int i = offset; i < count; ++i) { QMetaProperty property = mo->property(i); + const QString propertyName = QString::fromUtf8(property.name()); const QVariant previousValue = readProperty(property); - const QVariant currentValue = instance()->value(property.name(), previousValue); + const QVariant currentValue = instance()->value(propertyName, + previousValue); if (!currentValue.isNull() && (!previousValue.isValid() || (currentValue.canConvert(previousValue.metaType()) @@ -343,7 +345,7 @@ void QQmlSettingsPrivate::load() // ensure that a non-existent setting gets written // even if the property wouldn't change later - if (!instance()->contains(property.name())) + if (!instance()->contains(propertyName)) _q_propertyChanged(); // setup change notifications on first load @@ -358,7 +360,7 @@ void QQmlSettingsPrivate::store() { QHash::const_iterator it = changedProperties.constBegin(); while (it != changedProperties.constEnd()) { - instance()->setValue(it.key(), it.value()); + instance()->setValue(QString::fromUtf8(it.key()), it.value()); qCDebug(lcSettings) << "QQmlSettings: store" << it.key() << ":" << it.value(); ++it; } -- cgit v1.2.3