diff --git a/src/plugins/cmakeprojectmanager/cmakeformattersettings.cpp b/src/plugins/cmakeprojectmanager/cmakeformattersettings.cpp index defd70220b4..916cf354bf8 100644 --- a/src/plugins/cmakeprojectmanager/cmakeformattersettings.cpp +++ b/src/plugins/cmakeprojectmanager/cmakeformattersettings.cpp @@ -83,17 +83,17 @@ void CMakeFormatterSettings::setAutoFormatOnSave(bool autoFormatOnSave) m_autoFormatOnSave = autoFormatOnSave; } -QList CMakeFormatterSettings::autoFormatMime() const +QStringList CMakeFormatterSettings::autoFormatMime() const { return m_autoFormatMime; } QString CMakeFormatterSettings::autoFormatMimeAsString() const { - return Utils::transform(m_autoFormatMime, &Utils::MimeType::name).join("; "); + return m_autoFormatMime.join("; "); } -void CMakeFormatterSettings::setAutoFormatMime(const QList &autoFormatMime) +void CMakeFormatterSettings::setAutoFormatMime(const QStringList &autoFormatMime) { if (m_autoFormatMime == autoFormatMime) return; @@ -104,16 +104,7 @@ void CMakeFormatterSettings::setAutoFormatMime(const QList &aut void CMakeFormatterSettings::setAutoFormatMime(const QString &mimeList) { - const QStringList stringTypes = mimeList.split(';'); - QList types; - types.reserve(stringTypes.count()); - for (QString t : stringTypes) { - t = t.trimmed(); - const Utils::MimeType mime = Utils::mimeTypeForName(t); - if (mime.isValid()) - types << mime; - } - setAutoFormatMime(types); + setAutoFormatMime(mimeList.split(';')); } bool CMakeFormatterSettings::autoFormatOnlyCurrentProject() const @@ -135,8 +126,8 @@ bool CMakeFormatterSettings::isApplicable(const Core::IDocument *document) const return true; const Utils::MimeType documentMimeType = Utils::mimeTypeForName(document->mimeType()); - return Utils::anyOf(m_autoFormatMime, [&documentMimeType](const Utils::MimeType &mime) { - return documentMimeType.inherits(mime.name()); + return Utils::anyOf(m_autoFormatMime, [&documentMimeType](const QString &mime) { + return documentMimeType.inherits(mime); }); } diff --git a/src/plugins/cmakeprojectmanager/cmakeformattersettings.h b/src/plugins/cmakeprojectmanager/cmakeformattersettings.h index 8c25a1c4070..aa90a1ef79c 100644 --- a/src/plugins/cmakeprojectmanager/cmakeformattersettings.h +++ b/src/plugins/cmakeprojectmanager/cmakeformattersettings.h @@ -4,12 +4,12 @@ #pragma once -#include - #include +#include #include namespace Core { class IDocument; } +namespace Utils { class FilePath; } namespace CMakeProjectManager { namespace Internal { @@ -32,9 +32,9 @@ public: bool autoFormatOnSave() const; void setAutoFormatOnSave(bool autoFormatOnSave); - QList autoFormatMime() const; + QStringList autoFormatMime() const; QString autoFormatMimeAsString() const; - void setAutoFormatMime(const QList &autoFormatMime); + void setAutoFormatMime(const QStringList &autoFormatMime); void setAutoFormatMime(const QString &mimeList); bool autoFormatOnlyCurrentProject() const; @@ -51,7 +51,7 @@ private: bool m_autoFormatOnSave = false; bool m_autoFormatOnlyCurrentProject = true; QString m_autoFormatTool; - QList m_autoFormatMime; + QStringList m_autoFormatMime; }; } // namespace Internal diff --git a/src/plugins/cmakeprojectmanager/cmakeprojectplugin.cpp b/src/plugins/cmakeprojectmanager/cmakeprojectplugin.cpp index 439b8f31f3c..1f1b5c7a139 100644 --- a/src/plugins/cmakeprojectmanager/cmakeprojectplugin.cpp +++ b/src/plugins/cmakeprojectmanager/cmakeprojectplugin.cpp @@ -43,8 +43,7 @@ using namespace Utils; namespace CMakeProjectManager::Internal { -bool isAutoFormatApplicable(const Core::IDocument *document, - const QList &allowedMimeTypes) +bool isAutoFormatApplicable(const Core::IDocument *document, const QStringList &allowedMimeTypes) { if (!document) return false; @@ -53,8 +52,8 @@ bool isAutoFormatApplicable(const Core::IDocument *document, return true; const Utils::MimeType documentMimeType = Utils::mimeTypeForName(document->mimeType()); - return Utils::anyOf(allowedMimeTypes, [&documentMimeType](const Utils::MimeType &mime) { - return documentMimeType.inherits(mime.name()); + return Utils::anyOf(allowedMimeTypes, [&documentMimeType](const QString &mime) { + return documentMimeType.inherits(mime); }); }