From c73f93a7cf06df0526ed704895fc11e106cab669 Mon Sep 17 00:00:00 2001
From: Mahmoud Badri <mahmoud.badri@qt.io>
Date: Mon, 16 Nov 2020 17:04:53 +0200
Subject: [PATCH] QmlDesigner: replace qAsConst with as_const in the model
 class

Also revert few linebreaks from previous commit to satisfy the 100
character rule.

Change-Id: I92e85ae79338b3f1d9f9cb89d9c71f0d1f436198
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
---
 .../qmldesigner/designercore/model/model.cpp  | 25 +++++++++++++------
 1 file changed, 18 insertions(+), 7 deletions(-)

diff --git a/src/plugins/qmldesigner/designercore/model/model.cpp b/src/plugins/qmldesigner/designercore/model/model.cpp
index 2467d1bd6a0..e386bef4cc5 100644
--- a/src/plugins/qmldesigner/designercore/model/model.cpp
+++ b/src/plugins/qmldesigner/designercore/model/model.cpp
@@ -83,7 +83,14 @@ namespace Internal {
 ModelPrivate::ModelPrivate(Model *model)
     : m_model(model)
 {
-    m_rootInternalNode = createNode("QtQuick.Item", 1, 0, PropertyListType(), PropertyListType(), QString(), ModelNode::NodeWithoutSource, true);
+    m_rootInternalNode = createNode("QtQuick.Item",
+                                    1,
+                                    0,
+                                    PropertyListType(),
+                                    PropertyListType(),
+                                    QString(),
+                                    ModelNode::NodeWithoutSource,
+                                    true);
     m_currentStateNode = m_rootInternalNode;
     m_currentTimelineNode = m_rootInternalNode;
 }
@@ -95,7 +102,7 @@ ModelPrivate::~ModelPrivate()
 
 void ModelPrivate::detachAllViews()
 {
-    for (const QPointer<AbstractView> &view : qAsConst(m_viewList))
+    for (const QPointer<AbstractView> &view : std::as_const(m_viewList))
         detachView(view.data(), true);
 
     m_viewList.clear();
@@ -197,7 +204,7 @@ QUrl ModelPrivate::fileUrl() const
 void ModelPrivate::setDocumentMessages(const QList<DocumentMessage> &errors,
                                        const QList<DocumentMessage> &warnings)
 {
-    for (const QPointer<AbstractView> &view : qAsConst(m_viewList))
+    for (const QPointer<AbstractView> &view : std::as_const(m_viewList))
         view->documentMessagesChanged(errors, warnings);
 }
 
@@ -208,7 +215,7 @@ void ModelPrivate::setFileUrl(const QUrl &fileUrl)
     if (oldPath != fileUrl) {
         m_fileUrl = fileUrl;
 
-        for (const QPointer<AbstractView> &view : qAsConst(m_viewList))
+        for (const QPointer<AbstractView> &view : std::as_const(m_viewList))
             view->fileUrlChanged(oldPath, fileUrl);
     }
 }
@@ -945,7 +952,7 @@ void ModelPrivate::changeSelectedNodes(const QList<InternalNodePointer> &newSele
 
 QList<InternalNodePointer> ModelPrivate::selectedNodes() const
 {
-    for (const InternalNodePointer &node : qAsConst(m_selectedInternalNodeList)) {
+    for (const InternalNodePointer &node : std::as_const(m_selectedInternalNodeList)) {
         if (!node->isValid())
             throw new InvalidModelNodeException(__LINE__, __FUNCTION__, __FILE__);
     }
@@ -1387,8 +1394,10 @@ bool Model::hasImport(const Import &import, bool ignoreAlias, bool allowHigherVe
                 return true;
         }
         if (existingImport.isLibraryImport() && import.isLibraryImport()) {
-            if (existingImport.url() == import.url() && compareVersions(existingImport.version(), import.version(), allowHigherVersion))
+            if (existingImport.url() == import.url()
+                && compareVersions(existingImport.version(), import.version(), allowHigherVersion)) {
                 return true;
+            }
         }
     }
 
@@ -1410,8 +1419,10 @@ bool Model::isImportPossible(const Import &import, bool ignoreAlias, bool allowH
         }
 
         if (possibleImport.isLibraryImport() && import.isLibraryImport()) {
-            if (possibleImport.url() == import.url() && compareVersions(possibleImport.version(), import.version(), allowHigherVersion))
+            if (possibleImport.url() == import.url()
+                && compareVersions(possibleImport.version(), import.version(), allowHigherVersion)) {
                 return true;
+            }
         }
     }