diff --git a/src/plugins/qmldesigner/components/edit3d/edit3dview.cpp b/src/plugins/qmldesigner/components/edit3d/edit3dview.cpp index 10d62a5dc21..0d30617396a 100644 --- a/src/plugins/qmldesigner/components/edit3d/edit3dview.cpp +++ b/src/plugins/qmldesigner/components/edit3d/edit3dview.cpp @@ -922,7 +922,7 @@ void Edit3DView::addQuick3DImport() { DesignDocument *document = QmlDesignerPlugin::instance()->currentDesignDocument(); if (document && !document->inFileComponentModelActive() && model() - && Utils::addImportWithCheck( + && ModelUtils::addImportWithCheck( "QtQuick3D", [](const Import &import) { return !import.hasVersion() || import.majorVersion() >= 6; }, model())) { diff --git a/src/plugins/qmldesigner/components/itemlibrary/itemlibraryassetimporter.cpp b/src/plugins/qmldesigner/components/itemlibrary/itemlibraryassetimporter.cpp index c535e78c129..99f07cb8a8a 100644 --- a/src/plugins/qmldesigner/components/itemlibrary/itemlibraryassetimporter.cpp +++ b/src/plugins/qmldesigner/components/itemlibrary/itemlibraryassetimporter.cpp @@ -709,7 +709,7 @@ void ItemLibraryAssetImporter::finalizeQuick3DImport() try { RewriterTransaction transaction = model->rewriterView()->beginRewriterTransaction( QByteArrayLiteral("ItemLibraryAssetImporter::finalizeQuick3DImport")); - bool success = Utils::addImportsWithCheck(m_requiredImports, model); + bool success = ModelUtils::addImportsWithCheck(m_requiredImports, model); if (!success) addError(tr("Failed to insert import statement into qml document.")); transaction.commit(); diff --git a/src/plugins/qmldesigner/components/itemlibrary/itemlibrarywidget.cpp b/src/plugins/qmldesigner/components/itemlibrary/itemlibrarywidget.cpp index 2fab06dea89..1cbde45ba0b 100644 --- a/src/plugins/qmldesigner/components/itemlibrary/itemlibrarywidget.cpp +++ b/src/plugins/qmldesigner/components/itemlibrary/itemlibrarywidget.cpp @@ -82,7 +82,7 @@ bool ItemLibraryWidget::eventFilter(QObject *obj, QEvent *event) // For drag to be handled correctly, we must have the component properly imported // beforehand, so we import the module immediately when the drag starts if (!entry.requiredImport().isEmpty() - && !Utils::addImportWithCheck(entry.requiredImport(), m_model)) { + && !ModelUtils::addImportWithCheck(entry.requiredImport(), m_model)) { qWarning() << __FUNCTION__ << "Required import adding failed:" << entry.requiredImport(); } diff --git a/src/plugins/qmldesigner/components/navigator/navigatortreemodel.cpp b/src/plugins/qmldesigner/components/navigator/navigatortreemodel.cpp index 1dd628c2952..e7d116c61cf 100644 --- a/src/plugins/qmldesigner/components/navigator/navigatortreemodel.cpp +++ b/src/plugins/qmldesigner/components/navigator/navigatortreemodel.cpp @@ -885,7 +885,7 @@ ModelNode NavigatorTreeModel::handleItemLibraryFontDrop(const QString &fontFamil void NavigatorTreeModel::addImport(const QString &importName) { - if (!Utils::addImportWithCheck(importName, m_view->model())) + if (!ModelUtils::addImportWithCheck(importName, m_view->model())) qWarning() << __FUNCTION__ << "Adding import failed:" << importName; } diff --git a/src/plugins/qmldesigner/designercore/model/modelutils.cpp b/src/plugins/qmldesigner/designercore/model/modelutils.cpp index 8c04c201797..70da6f98b9c 100644 --- a/src/plugins/qmldesigner/designercore/model/modelutils.cpp +++ b/src/plugins/qmldesigner/designercore/model/modelutils.cpp @@ -9,7 +9,7 @@ #include -namespace QmlDesigner::Utils { +namespace QmlDesigner::ModelUtils { namespace { @@ -102,4 +102,4 @@ PropertyMetaInfo metainfo(const ModelNode &node, const PropertyName &propertyNam return node.metaInfo().property(propertyName); } -} // namespace QmlDesigner::Utils +} // namespace QmlDesigner::ModelUtils diff --git a/src/plugins/qmldesigner/designercore/model/modelutils.h b/src/plugins/qmldesigner/designercore/model/modelutils.h index 5cbeb7e5ec0..578a7adb444 100644 --- a/src/plugins/qmldesigner/designercore/model/modelutils.h +++ b/src/plugins/qmldesigner/designercore/model/modelutils.h @@ -14,7 +14,7 @@ namespace QmlDesigner { class PropertyMetaInfo; } -namespace QmlDesigner::Utils { +namespace QmlDesigner::ModelUtils { QMLDESIGNERCORE_EXPORT bool addImportsWithCheck(const QStringList &importNames, const std::function &predicate, @@ -29,4 +29,4 @@ QMLDESIGNERCORE_EXPORT PropertyMetaInfo metainfo(const AbstractProperty &propert QMLDESIGNERCORE_EXPORT PropertyMetaInfo metainfo(const ModelNode &node, const PropertyName &propertyName); -} // namespace QmlDesigner::Utils +} // namespace QmlDesigner::ModelUtils