1 files changed, 8 insertions, 8 deletions

diff --git a/src/lib/corelib/tools/settingsmodel.cpp b/src/lib/corelib/tools/settingsmodel.cpp
index 31aa0f5f1..4fa0e14da 100644
--- a/src/lib/corelib/tools/settingsmodel.cpp
+++ b/src/lib/corelib/tools/settingsmodel.cpp
@@ -78,7 +78,7 @@ QString Node::uniqueChildName() const
     bool unique;
     do {
         unique = true;
-        for (const Node *childNode : qAsConst(children)) {
+        for (const Node *childNode : std::as_const(children)) {
             if (childNode->name == newName) {
                 unique = false;
                 newName += QLatin1Char('_');
@@ -281,10 +281,10 @@ bool SettingsModel::setData(const QModelIndex &index, const QVariant &value, int
     const QString valueString = value.toString();
     QString *toChange = nullptr;
     if (index.column() == keyColumn() && !valueString.isEmpty()
-            && !node->parent->hasDirectChildWithName(valueString)
-            && !(node->parent->parent == &d->rootNode
-                 && node->parent->name == Internal::StringConstants::profilesSettingsKey()
-                 && valueString == Profile::fallbackName())) {
+        && !node->parent->hasDirectChildWithName(valueString)
+        && (node->parent->parent != &d->rootNode
+            || node->parent->name != Internal::StringConstants::profilesSettingsKey()
+            || valueString != Profile::fallbackName())) {
         toChange = &node->name;
     } else if (index.column() == valueColumn() && valueString != node->value) {
         toChange = &node->value;
@@ -329,7 +329,7 @@ void SettingsModel::SettingsModelPrivate::readSettings()
         addNodeFromSettings(&rootNode, topLevelKey);
     for (QVariantMap::ConstIterator it = additionalProperties.constBegin();
          it != additionalProperties.constEnd(); ++it) {
-        const QStringList nameAsList = it.key().split(QLatin1Char('.'), QBS_SKIP_EMPTY_PARTS);
+        const QStringList nameAsList = it.key().split(QLatin1Char('.'), Qt::SkipEmptyParts);
         addNode(&rootNode, nameAsList.front(), nameAsList.mid(1), it.value());
     }
     dirty = false;
@@ -361,7 +361,7 @@ void SettingsModel::SettingsModelPrivate::addNode(qbs::Internal::Node *parentNod
         const QString &currentNamePart, const QStringList &restOfName, const QVariant &value)
 {
     Node *currentNode = nullptr;
-    for (Node * const n : qAsConst(parentNode->children)) {
+    for (Node * const n : std::as_const(parentNode->children)) {
         if (n->name == currentNamePart) {
             currentNode = n;
             break;
@@ -385,7 +385,7 @@ void SettingsModel::SettingsModelPrivate::doSave(const Node *node, const QString
     }
 
     const QString newPrefix = prefix + node->name + QLatin1Char('.');
-    for (const Node * const child : qAsConst(node->children))
+    for (const Node * const child : std::as_const(node->children))
         doSave(child, newPrefix);
 }