Utils: Proliferate use of <utils/mimeconstants.h>

This deduplicates several mime type strings.

Change-Id: Ib1746387e233ca5b7134e65859b5ec1c7832b8e4
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>

src/plugins/clangcodemodel/clangdcompletion.cpp

@@ -28,6 +28,7 @@
 #include <texteditor/codeassist/genericproposalmodel.h>
 #include <texteditor/texteditorsettings.h>
 
+#include <utils/mimeconstants.h>
 #include <utils/utilsicons.h>
 
 using namespace CppEditor;
@@ -485,7 +486,7 @@ QList<AssistProposalItemInterface *> CustomAssistProcessor::completeInclude(
     if (!allHeaderPaths.contains(currentFilePath))
         allHeaderPaths.append(currentFilePath);
 
-    const MimeType mimeType = mimeTypeForName("text/x-c++hdr");
+    const MimeType mimeType = mimeTypeForName(Utils::Constants::CPP_HEADER_MIMETYPE);
     const QStringList suffixes = mimeType.suffixes();
 
     QList<AssistProposalItemInterface *> completions;

src/plugins/cmakeprojectmanager/cmakeformatter.cpp

@@ -28,6 +28,7 @@
 #include <utils/algorithm.h>
 #include <utils/genericconstants.h>
 #include <utils/layoutbuilder.h>
+#include <utils/mimeconstants.h>
 #include <utils/mimeutils.h>
 
 #include <QMenu>
@@ -60,7 +61,7 @@ public:
         autoFormatOnlyCurrentProject.setLabelPlacement(BoolAspect::LabelPlacement::AtCheckBox);
 
         autoFormatMime.setSettingsKey("autoFormatMime");
-        autoFormatMime.setDefaultValue("text/x-cmake");
+        autoFormatMime.setDefaultValue(Utils::Constants::CMAKE_MIMETYPE);
         autoFormatMime.setLabelText(Tr::tr("Restrict to MIME types:"));
         autoFormatMime.setDisplayStyle(StringAspect::LineEditDisplay);
 

src/plugins/compilerexplorer/api/request.h

@@ -15,6 +15,7 @@
 #include <QString>
 
 #include <utils/appinfo.h>
+#include <utils/mimeconstants.h>
 
 static Q_LOGGING_CATEGORY(apiLog, "qtc.compilerexplorer.api", QtWarningMsg);
 
@@ -131,8 +132,8 @@ QFuture<Result> jsonRequest(QNetworkAccessManager *networkManager,
                             const QByteArray &payload = {})
 {
     QNetworkRequest req(url);
-    req.setHeader(QNetworkRequest::ContentTypeHeader, "application/json");
+    req.setHeader(QNetworkRequest::ContentTypeHeader, Utils::Constants::JSON_MIMETYPE);
-    req.setRawHeader("Accept", "application/json");
+    req.setRawHeader("Accept", Utils::Constants::JSON_MIMETYPE);
 
     return request<Result>(
         networkManager,

src/plugins/coreplugin/editormanager/ieditorfactory.cpp

@@ -6,6 +6,7 @@
 #include "editormanager.h"
 
 #include <utils/algorithm.h>
+#include <utils/mimeconstants.h>
 #include <utils/mimeutils.h>
 #include <utils/qtcassert.h>
 
@@ -197,7 +198,7 @@ const EditorFactories IEditorFactory::preferredEditorTypes(const FilePath &fileP
     }
     // make binary editor first internal editor for text files > 48 MB
     if (filePath.fileSize() > EditorManager::maxTextFileSize() && mimeType.inherits("text/plain")) {
-        const Utils::MimeType binary = Utils::mimeTypeForName("application/octet-stream");
+        const MimeType binary = mimeTypeForName(Utils::Constants::OCTET_STREAM_MIMETYPE);
         const EditorFactories binaryEditors = defaultEditorFactories(binary);
         if (!binaryEditors.isEmpty()) {
             IEditorFactory *binaryEditor = binaryEditors.first();
@@ -244,7 +245,7 @@ const EditorFactories IEditorFactory::preferredEditorFactories(const FilePath &f
     // open text files > 48 MB in binary editor
     if (filePath.fileSize() > EditorManager::maxTextFileSize()
             && mimeType.inherits("text/plain")) {
-        const Utils::MimeType binary = Utils::mimeTypeForName("application/octet-stream");
+        const MimeType binary = mimeTypeForName(Utils::Constants::OCTET_STREAM_MIMETYPE);
         const EditorFactories binaryEditors = defaultEditorFactories(binary);
         if (!binaryEditors.isEmpty())
             factories_moveToFront(binaryEditors.first());

src/plugins/coreplugin/editormanager/systemeditor.cpp

@@ -5,6 +5,7 @@
 
 #include "../coreplugintr.h"
 
+#include <utils/mimeconstants.h>
 #include <utils/filepath.h>
 
 #include <QUrl>
@@ -18,7 +19,7 @@ SystemEditor::SystemEditor()
 {
     setId("CorePlugin.OpenWithSystemEditor");
     setDisplayName(Tr::tr("System Editor"));
-    setMimeTypes({"application/octet-stream"});
+    setMimeTypes({Utils::Constants::OCTET_STREAM_MIMETYPE});
 
     setEditorStarter([](const FilePath &filePath, QString *errorMessage) {
         Q_UNUSED(errorMessage)

src/plugins/cppeditor/cppcompletionassist.cpp

@@ -1219,7 +1219,8 @@ bool InternalCppCompletionAssistProcessor::completeInclude(const QTextCursor &cu
     if (!headerPaths.contains(currentFilePath))
         headerPaths.append(currentFilePath);
 
-    const QStringList suffixes = Utils::mimeTypeForName(QLatin1String("text/x-c++hdr")).suffixes();
+    const QStringList suffixes =
+        Utils::mimeTypeForName(Utils::Constants::CPP_HEADER_MIMETYPE).suffixes();
 
     for (const ProjectExplorer::HeaderPath &headerPath : std::as_const(headerPaths)) {
         QString realPath = headerPath.path;

src/plugins/debugger/dap/cmakedapengine.cpp

@@ -9,6 +9,7 @@
 
 #include <debugger/debuggermainwindow.h>
 
+#include <utils/mimeconstants.h>
 #include <utils/mimeutils.h>
 #include <utils/temporarydirectory.h>
 
@@ -24,11 +25,6 @@
 using namespace Core;
 using namespace Utils;
 
-namespace {
-const char CMAKE_MIMETYPE[] = "text/x-cmake";
-const char CMAKE_PROJECT_MIMETYPE[] = "text/x-cmake-project";
-} // namespace
-
 namespace Debugger::Internal {
 
 class LocalSocketDataProvider : public IDataProvider
@@ -151,7 +147,8 @@ void CMakeDapEngine::setupEngine()
 bool CMakeDapEngine::acceptsBreakpoint(const BreakpointParameters &bp) const
 {
     const auto mimeType = Utils::mimeTypeForFile(bp.fileName);
-    return mimeType.matchesName(CMAKE_MIMETYPE) || mimeType.matchesName(CMAKE_PROJECT_MIMETYPE);
+    return mimeType.matchesName(Utils::Constants::CMAKE_MIMETYPE)
+           || mimeType.matchesName(Utils::Constants::CMAKE_PROJECT_MIMETYPE);
 }
 
 bool CMakeDapEngine::hasCapability(unsigned cap) const

src/plugins/debugger/dap/gdbdapengine.cpp

@@ -9,6 +9,7 @@
 
 #include <debugger/debuggermainwindow.h>
 
+#include <utils/mimeconstants.h>
 #include <utils/mimeutils.h>
 #include <utils/temporarydirectory.h>
 
@@ -23,13 +24,6 @@
 using namespace Core;
 using namespace Utils;
 
-namespace {
-const char C_HEADER_MIMETYPE[] = "text/x-chdr";
-const char C_SOURCE_MIMETYPE[] = "text/x-csrc";
-const char CPP_SOURCE_MIMETYPE[] = "text/x-c++src";
-const char CPP_HEADER_MIMETYPE[] = "text/x-c++hdr";
-} // namespace
-
 namespace Debugger::Internal {
 
 class ProcessDataProvider : public IDataProvider
@@ -174,8 +168,10 @@ void GdbDapEngine::setupEngine()
 bool GdbDapEngine::acceptsBreakpoint(const BreakpointParameters &bp) const
 {
     const auto mimeType = Utils::mimeTypeForFile(bp.fileName);
-    return mimeType.matchesName(C_HEADER_MIMETYPE) || mimeType.matchesName(C_SOURCE_MIMETYPE)
+    return mimeType.matchesName(Utils::Constants::C_HEADER_MIMETYPE)
-           || mimeType.matchesName(CPP_HEADER_MIMETYPE) || mimeType.matchesName(CPP_SOURCE_MIMETYPE)
+           || mimeType.matchesName(Utils::Constants::C_SOURCE_MIMETYPE)
+           || mimeType.matchesName(Utils::Constants::CPP_HEADER_MIMETYPE)
+           || mimeType.matchesName(Utils::Constants::CPP_SOURCE_MIMETYPE)
            || bp.type == BreakpointByFunction;
 }
 

src/plugins/glsleditor/glsleditor.cpp

@@ -317,19 +317,19 @@ int languageVariant(const QString &type)
         isVertex = true;
         isFragment = true;
     } else if (type == QLatin1String("text/x-glsl") ||
-               type == QLatin1String("application/x-glsl")) {
+               type == QLatin1String(Utils::Constants::GLSL_MIMETYPE)) {
         isVertex = true;
         isFragment = true;
         isDesktop = true;
-    } else if (type == QLatin1String("text/x-glsl-vert")) {
+    } else if (type == QLatin1String(Utils::Constants::GLSL_VERT_MIMETYPE)) {
         isVertex = true;
         isDesktop = true;
-    } else if (type == QLatin1String("text/x-glsl-frag")) {
+    } else if (type == QLatin1String(Utils::Constants::GLSL_FRAG_MIMETYPE)) {
         isFragment = true;
         isDesktop = true;
-    } else if (type == QLatin1String("text/x-glsl-es-vert")) {
+    } else if (type == QLatin1String(Utils::Constants::GLSL_ES_VERT_MIMETYPE)) {
         isVertex = true;
-    } else if (type == QLatin1String("text/x-glsl-es-frag")) {
+    } else if (type == QLatin1String(Utils::Constants::GLSL_ES_FRAG_MIMETYPE)) {
         isFragment = true;
     }
     if (isDesktop)

src/plugins/help/localhelpmanager.cpp

@@ -27,6 +27,7 @@
 #include <utils/appinfo.h>
 #include <utils/environment.h>
 #include <utils/hostosinfo.h>
+#include <utils/mimeconstants.h>
 #include <utils/qtcassert.h>
 #include <utils/stringutils.h>
 
@@ -492,7 +493,7 @@ LocalHelpManager::HelpData LocalHelpManager::helpData(const QUrl &url)
         data.data = engine.fileData(data.resolvedUrl);
         data.mimeType = HelpViewer::mimeFromUrl(data.resolvedUrl);
         if (data.mimeType.isEmpty())
-            data.mimeType = "application/octet-stream";
+            data.mimeType = Utils::Constants::OCTET_STREAM_MIMETYPE;
     } else {
         data.data = loadErrorMessage(url, Tr::tr("The page could not be found"));
         data.mimeType = "text/html";

src/plugins/languageclient/languageclientsettings.cpp

@@ -26,6 +26,7 @@
 #include <utils/fancylineedit.h>
 #include <utils/jsontreeitem.h>
 #include <utils/macroexpander.h>
+#include <utils/mimeconstants.h>
 #include <utils/stringutils.h>
 #include <utils/utilsicons.h>
 #include <utils/variablechooser.h>
@@ -1043,7 +1044,7 @@ TextEditor::BaseTextEditor *jsonEditor()
     QTC_ASSERT(textEditor, textEditor = PlainTextEditorFactory::createPlainTextEditor());
     TextDocument *document = textEditor->textDocument();
     TextEditorWidget *widget = textEditor->editorWidget();
-    widget->configureGenericHighlighter(Utils::mimeTypeForName("application/json"));
+    widget->configureGenericHighlighter(mimeTypeForName(Utils::Constants::JSON_MIMETYPE));
     widget->setLineNumbersVisible(false);
     widget->setRevisionsVisible(false);
     widget->setCodeFoldingSupported(false);

src/plugins/projectexplorer/simpleprojectwizard.cpp

@@ -19,6 +19,7 @@
 #include <utils/algorithm.h>
 #include <utils/fileutils.h>
 #include <utils/filewizardpage.h>
+#include <utils/mimeconstants.h>
 #include <utils/mimeutils.h>
 #include <utils/wizard.h>
 
@@ -183,7 +184,7 @@ GeneratedFiles generateQmakeFiles(const SimpleProjectWizardDialog *wizard,
     const FilePath proFileName = Utils::FilePath::fromString(QFileInfo(dir, projectName + ".pro").absoluteFilePath());
     const QStringList paths = Utils::transform(wizard->selectedPaths(), &FilePath::toString);
 
-    MimeType headerType = Utils::mimeTypeForName("text/x-chdr");
+    MimeType headerType = Utils::mimeTypeForName(Utils::Constants::C_HEADER_MIMETYPE);
 
     QStringList nameFilters = headerType.globPatterns();
 
@@ -204,7 +205,8 @@ GeneratedFiles generateQmakeFiles(const SimpleProjectWizardDialog *wizard,
     for (const FilePath &fileName : wizard->selectedFiles()) {
         QString source = dir.relativeFilePath(fileName.toString());
         MimeType mimeType = Utils::mimeTypeForFile(fileName);
-        if (mimeType.matchesName("text/x-chdr") || mimeType.matchesName("text/x-c++hdr"))
+        if (mimeType.matchesName(Utils::Constants::C_HEADER_MIMETYPE)
+            || mimeType.matchesName(Utils::Constants::CPP_HEADER_MIMETYPE))
             proHeaders += "   $$PWD/" + source + " \\\n";
         else
             proSources += "   $$PWD/" + source + " \\\n";
@@ -240,7 +242,7 @@ GeneratedFiles generateCmakeFiles(const SimpleProjectWizardDialog *wizard,
     const FilePath projectFileName = Utils::FilePath::fromString(QFileInfo(dir, "CMakeLists.txt").absoluteFilePath());
     const QStringList paths = Utils::transform(wizard->selectedPaths(), &FilePath::toString);
 
-    MimeType headerType = Utils::mimeTypeForName("text/x-chdr");
+    MimeType headerType = Utils::mimeTypeForName(Utils::Constants::C_HEADER_MIMETYPE);
 
     QStringList nameFilters = headerType.globPatterns();
 

src/plugins/qbsprojectmanager/qbsbuildconfiguration.cpp

@@ -25,6 +25,7 @@
 
 #include <qtsupport/qtkitaspect.h>
 
+#include <utils/mimeconstants.h>
 #include <utils/process.h>
 #include <utils/qtcassert.h>
 
@@ -290,7 +291,7 @@ QbsBuildConfigurationFactory::QbsBuildConfigurationFactory()
 {
     registerBuildConfiguration<QbsBuildConfiguration>(Constants::QBS_BC_ID);
     setSupportedProjectType(Constants::PROJECT_ID);
-    setSupportedProjectMimeTypeName(Constants::MIME_TYPE);
+    setSupportedProjectMimeTypeName(Utils::Constants::QBS_MIMETYPE);
     setIssueReporter([](Kit *k, const FilePath &projectPath, const FilePath &buildDir) -> Tasks {
         const QtSupport::QtVersion * const version = QtSupport::QtKitAspect::qtVersion(k);
         return version ? version->reportIssues(projectPath, buildDir) : Tasks();

src/plugins/qbsprojectmanager/qbsproject.cpp

@@ -98,7 +98,7 @@ private:
 // --------------------------------------------------------------------
 
 QbsProject::QbsProject(const FilePath &fileName)
-    : Project(Constants::MIME_TYPE, fileName)
+    : Project(Utils::Constants::QBS_MIMETYPE, fileName)
 {
     setId(Constants::PROJECT_ID);
     setProjectLanguages(Context(ProjectExplorer::Constants::CXX_LANGUAGE_ID));

src/plugins/qbsprojectmanager/qbsprojectmanagerconstants.h

@@ -11,9 +11,6 @@ namespace Constants {
 // Contexts
 const char PROJECT_ID[] = "Qbs.QbsProject";
 
-// MIME types:
-const char MIME_TYPE[] = "application/x-qt.qbs+qml";
-
 // Actions:
 const char ACTION_REPARSE_QBS[] = "Qbs.Reparse";
 const char ACTION_REPARSE_QBS_CONTEXT[] = "Qbs.ReparseCtx";

src/plugins/qmljseditor/qmljseditorplugin.cpp

@@ -42,6 +42,7 @@
 
 #include <utils/fsengine/fileiconprovider.h>
 #include <utils/macroexpander.h>
+#include <utils/mimeconstants.h>
 #include <utils/qtcassert.h>
 
 #include <QTextDocument>
@@ -205,7 +206,7 @@ QmlJSEditorPluginPrivate::QmlJSEditorPluginPrivate()
 void QmlJSEditorPlugin::extensionsInitialized()
 {
     FileIconProvider::registerIconOverlayForMimeType(ProjectExplorer::Constants::FILEOVERLAY_UI,
-                                                     "application/x-qt.ui+qml");
+                                                     Utils::Constants::QMLUI_MIMETYPE);
 
     TaskHub::addCategory({Constants::TASK_CATEGORY_QML,
                           Tr::tr("QML"),

src/plugins/texteditor/highlighter_test.cpp

@@ -12,6 +12,8 @@
 
 #include <coreplugin/coreconstants.h>
 #include <coreplugin/editormanager/editormanager.h>
+
+#include <utils/mimeconstants.h>
 #include <utils/mimeutils.h>
 
 #include <QtTest/QtTest>
@@ -40,7 +42,8 @@ void GenerigHighlighterTests::initTestCase()
         Core::Constants::K_DEFAULT_TEXT_EDITOR_ID, &title, json);
     QVERIFY(editor);
     m_editor = qobject_cast<BaseTextEditor *>(editor);
-    m_editor->editorWidget()->configureGenericHighlighter(Utils::mimeTypeForName("application/json"));
+    m_editor->editorWidget()->configureGenericHighlighter(
+        Utils::mimeTypeForName(Utils::Constants::JSON_MIMETYPE));
     QVERIFY(m_editor);
     m_editor->textDocument()->syntaxHighlighterRunner()->rehighlight();
 }

src/plugins/texteditor/jsoneditor.cpp

@@ -9,10 +9,11 @@
 #include "texteditortr.h"
 #include "textindenter.h"
 
+#include <utils/mimeconstants.h>
+
 namespace TextEditor::Internal {
 
 const char JSON_EDITOR_ID[] = "Editors.Json";
-const char JSON_MIME_TYPE[] = "application/json";
 
 static int startsWith(const QString &line, const QString &closingChars)
 {
@@ -152,7 +153,7 @@ JsonEditorFactory::JsonEditorFactory()
 {
     setId(JSON_EDITOR_ID);
     setDisplayName(Tr::tr("JSON Editor"));
-    addMimeType(JSON_MIME_TYPE);
+    addMimeType(Utils::Constants::JSON_MIMETYPE);
 
     setEditorCreator([] { return new BaseTextEditor; });
     setEditorWidgetCreator([] { return new TextEditorWidget; });