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

21
src/plugins/qmljseditor/qmljseditor.cpp
View File

@@ -55,8 +55,9 @@
#include <texteditor/textmark.h>
#include <utils/algorithm.h>
#include <utils/delegates.h>
#include <utils/changeset.h>
#include <utils/delegates.h>
#include <utils/mimeconstants.h>
#include <utils/qtcassert.h>
#include <utils/uncommentselection.h>
@@ -66,7 +67,6 @@
#include <QComboBox>
#include <QCoreApplication>
#include <QFileInfo>
#include <QHeaderView>
#include <QMenu>
#include <QMetaMethod>
@@ -160,10 +160,8 @@ void QmlJSEditorWidget::finalizeInitialization()
void QmlJSEditorWidget::restoreState(const QByteArray &state)
{
QStringList qmlTypes { QmlJSTools::Constants::QML_MIMETYPE,
QmlJSTools::Constants::QBS_MIMETYPE,
QmlJSTools::Constants::QMLTYPES_MIMETYPE,
QmlJSTools::Constants::QMLUI_MIMETYPE };
using namespace Utils::Constants;
QStringList qmlTypes = {QML_MIMETYPE, QBS_MIMETYPE, QMLTYPES_MIMETYPE, QMLUI_MIMETYPE};
if (QmlJsEditingSettings::get().foldAuxData() && qmlTypes.contains(textDocument()->mimeType())) {
int version = 0;
@@ -1133,11 +1131,12 @@ QmlJSEditorFactory::QmlJSEditorFactory(Utils::Id _id)
setId(_id);
setDisplayName(::Core::Tr::tr("QMLJS Editor"));
addMimeType(QmlJSTools::Constants::QML_MIMETYPE);
addMimeType(QmlJSTools::Constants::QMLPROJECT_MIMETYPE);
addMimeType(QmlJSTools::Constants::QBS_MIMETYPE);
addMimeType(QmlJSTools::Constants::QMLTYPES_MIMETYPE);
addMimeType(QmlJSTools::Constants::JS_MIMETYPE);
using namespace Utils::Constants;
addMimeType(QML_MIMETYPE);
addMimeType(QMLPROJECT_MIMETYPE);
addMimeType(QBS_MIMETYPE);
addMimeType(QMLTYPES_MIMETYPE);
addMimeType(JS_MIMETYPE);
setDocumentCreator([this]() { return new QmlJSEditorDocument(id()); });
setEditorWidgetCreator([]() { return new QmlJSEditorWidget; });

10
src/plugins/qmljseditor/qmllsclient.cpp
View File

@@ -12,7 +12,8 @@
#include <texteditor/texteditor.h>
#include <qmljs/qmljsmodelmanagerinterface.h>
#include <qmljstools/qmljstoolsconstants.h>
#include <utils/mimeconstants.h>
#include <QLoggingCategory>
@@ -53,10 +54,9 @@ QmllsClient *QmllsClient::clientForQmlls(const FilePath &qmlls)
client->setName(Tr::tr("Qmlls (%1)").arg(qmlls.toUserOutput()));
client->setActivateDocumentAutomatically(true);
LanguageFilter filter;
using namespace QmlJSTools::Constants;
filter.mimeTypes = QStringList()
<< QML_MIMETYPE << QMLUI_MIMETYPE << QBS_MIMETYPE << QMLPROJECT_MIMETYPE
<< QMLTYPES_MIMETYPE << JS_MIMETYPE << JSON_MIMETYPE;
using namespace Utils::Constants;
filter.mimeTypes = {QML_MIMETYPE, QMLUI_MIMETYPE, QBS_MIMETYPE, QMLPROJECT_MIMETYPE,
QMLTYPES_MIMETYPE, JS_MIMETYPE, JSON_MIMETYPE};
client->setSupportedLanguage(filter);
client->start();
qmllsClients()[qmlls] = client;