feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

QmlDesigner: replace qAsConst with as_const in the model class

Browse Source 
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>
This commit is contained in:
Mahmoud Badri
2020-11-16 17:04:53 +02:00
parent d7b19b929d
commit c73f93a7cf
1 changed files with 18 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/plugins/qmldesigner/designercore/model/model.cpp
View File

@@ -83,7 +83,14 @@ namespace Internal {
ModelPrivate::ModelPrivate(Model *model) ModelPrivate::ModelPrivate(Model *model)
: m_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_currentStateNode = m_rootInternalNode;
m_currentTimelineNode = m_rootInternalNode; m_currentTimelineNode = m_rootInternalNode;
} }
@@ -95,7 +102,7 @@ ModelPrivate::~ModelPrivate()
void ModelPrivate::detachAllViews() 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); detachView(view.data(), true);
m_viewList.clear(); m_viewList.clear();
@@ -197,7 +204,7 @@ QUrl ModelPrivate::fileUrl() const
void ModelPrivate::setDocumentMessages(const QList<DocumentMessage> &errors, void ModelPrivate::setDocumentMessages(const QList<DocumentMessage> &errors,
const QList<DocumentMessage> &warnings) 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); view->documentMessagesChanged(errors, warnings);
} }
@@ -208,7 +215,7 @@ void ModelPrivate::setFileUrl(const QUrl &fileUrl)
if (oldPath != fileUrl) { if (oldPath != fileUrl) {
m_fileUrl = 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); view->fileUrlChanged(oldPath, fileUrl);
} }
} }
@@ -945,7 +952,7 @@ void ModelPrivate::changeSelectedNodes(const QList<InternalNodePointer> &newSele
QList<InternalNodePointer> ModelPrivate::selectedNodes() const QList<InternalNodePointer> ModelPrivate::selectedNodes() const
{ {
for (const InternalNodePointer &node : qAsConst(m_selectedInternalNodeList)) { for (const InternalNodePointer &node : std::as_const(m_selectedInternalNodeList)) {
if (!node->isValid()) if (!node->isValid())
throw new InvalidModelNodeException(__LINE__, __FUNCTION__, __FILE__); throw new InvalidModelNodeException(__LINE__, __FUNCTION__, __FILE__);
} }
@@ -1387,10 +1394,12 @@ bool Model::hasImport(const Import &import, bool ignoreAlias, bool allowHigherVe
return true; return true;
} }
if (existingImport.isLibraryImport() && import.isLibraryImport()) { 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; return true;
} }
} }
}
return false; return false;
} }
@@ -1410,10 +1419,12 @@ bool Model::isImportPossible(const Import &import, bool ignoreAlias, bool allowH
} }
if (possibleImport.isLibraryImport() && import.isLibraryImport()) { 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; return true;
} }
} }
}
return false; return false;
} }