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

Utils/all: Move mime constants into a central place

Browse Source 
They are reasonably standardized, and generally usable cross-plugin,
so this can help to avoid a few cross-plugin compiletime dependencies.

Change-Id: Icb2b010c3e12dee69df54ab16f6f8e90d9cffba6
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
hjk
2023-10-19 17:17:37 +02:00
parent fc7c11fb65
commit 6685f0255d
68 changed files with 396 additions and 355 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/plugins/cmakeprojectmanager/fileapidataextractor.cpp
View File

@@ -16,6 +16,7 @@
#include <utils/algorithm.h>
#include <utils/icon.h>
#include <utils/mimeconstants.h>
#include <utils/mimeutils.h>
#include <utils/process.h>
#include <utils/qtcassert.h>
@@ -68,8 +69,8 @@ static CMakeFileResult extractCMakeFilesData(const QFuture<void> &cancelFuture,
absolute.path = sfn;
const auto mimeType = Utils::mimeTypeForFile(info.path);
if (mimeType.matchesName(Constants::CMAKE_MIMETYPE)
|| mimeType.matchesName(Constants::CMAKE_PROJECT_MIMETYPE)) {
if (mimeType.matchesName(Utils::Constants::CMAKE_MIMETYPE)
|| mimeType.matchesName(Utils::Constants::CMAKE_PROJECT_MIMETYPE)) {
expected_str<QByteArray> fileContent = sfn.fileContents();
std::string errorString;
if (fileContent) {
@@ -445,9 +446,9 @@ static RawProjectParts generateRawProjectParts(const QFuture<void> &cancelFuture
const QString headerMimeType = [&]() -> QString {
if (ci.language == "C") {
return CppEditor::Constants::C_HEADER_MIMETYPE;
return Utils::Constants::C_HEADER_MIMETYPE;
} else if (ci.language == "CXX") {
return CppEditor::Constants::CPP_HEADER_MIMETYPE;
return Utils::Constants::CPP_HEADER_MIMETYPE;
}
return {};
}();