From 5304042d2b21899426902ae8a059ba6fc359bbff Mon Sep 17 00:00:00 2001 From: hjk Date: Tue, 14 Jun 2022 16:28:46 +0200 Subject: [PATCH] QmlProjectMananger: Remove a use of mimeType via QFileInfo And a bit cosmetics. Change-Id: I3e64b661d86cadad22422c2bffad0ed1262283b4 Reviewed-by: Eike Ziller Reviewed-by: Qt CI Bot Reviewed-by: --- src/plugins/qmlprojectmanager/qmlmainfileaspect.cpp | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/src/plugins/qmlprojectmanager/qmlmainfileaspect.cpp b/src/plugins/qmlprojectmanager/qmlmainfileaspect.cpp index d16f79ed64f..404b43bb772 100644 --- a/src/plugins/qmlprojectmanager/qmlmainfileaspect.cpp +++ b/src/plugins/qmlprojectmanager/qmlmainfileaspect.cpp @@ -27,7 +27,6 @@ #include "qmlproject.h" #include "qmlprojectmanagerconstants.h" -#include "qmlprojectrunconfiguration.h" #include @@ -75,7 +74,7 @@ QmlMainFileAspect::~QmlMainFileAspect() delete m_fileListCombo; } -void QmlMainFileAspect::addToLayout(Utils::LayoutBuilder &builder) +void QmlMainFileAspect::addToLayout(LayoutBuilder &builder) { QTC_ASSERT(!m_fileListCombo, delete m_fileListCombo); m_fileListCombo = new QComboBox; @@ -238,7 +237,7 @@ bool QmlMainFileAspect::isQmlFilePresent() bool qmlFileFound = false; if (mainScriptSource() == FileInEditor) { IDocument *document = EditorManager::currentDocument(); - Utils::MimeType mainScriptMimeType = Utils::mimeTypeForFile(mainScript()); + const MimeType mainScriptMimeType = mimeTypeForFile(mainScript()); if (document) { m_currentFileFilename = document->filePath().toString(); if (mainScriptMimeType.matchesName(ProjectExplorer::Constants::QML_MIMETYPE) @@ -251,11 +250,9 @@ bool QmlMainFileAspect::isQmlFilePresent() // find a qml file with lowercase filename. This is slow, but only done // in initialization/other border cases. const auto files = m_target->project()->files(Project::SourceFiles); - for (const Utils::FilePath &filename : files) { - const QFileInfo fi = filename.toFileInfo(); - - if (!filename.isEmpty() && fi.baseName().at(0).isLower()) { - Utils::MimeType type = Utils::mimeTypeForFile(fi); + for (const FilePath &filename : files) { + if (!filename.isEmpty() && filename.baseName().at(0).isLower()) { + const MimeType type = mimeTypeForFile(filename); if (type.matchesName(ProjectExplorer::Constants::QML_MIMETYPE) || type.matchesName(ProjectExplorer::Constants::QMLUI_MIMETYPE)) { m_currentFileFilename = filename.toString();