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

Core: Move some helper template closer to it's only user

Browse Source 
The _p.h is also #included in several places.

Change-Id: I96c28ab0fada32e01e555d73ec619fe7fe992cf2
Reviewed-by: David Schulz <david.schulz@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
This commit is contained in:
hjk
2023-08-18 12:30:55 +02:00
parent fd0a1a1922
commit 30a7228c5f
2 changed files with 28 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/plugins/coreplugin/editormanager/ieditorfactory.cpp
View File

@@ -9,12 +9,35 @@
#include <utils/mimeutils.h>
#include <utils/qtcassert.h>
#include <QFileInfo>
using namespace Utils;
namespace Core {
/* Find the one best matching the mimetype passed in.
* Recurse over the parent classes of the mimetype to find them. */
template<class EditorTypeLike>
static void mimeTypeFactoryLookup(const Utils::MimeType &mimeType,
const QList<EditorTypeLike *> &allFactories,
QList<EditorTypeLike *> *list)
{
QSet<EditorTypeLike *> matches;
Utils::visitMimeParents(mimeType, [&](const Utils::MimeType &mt) -> bool {
// check for matching factories
for (EditorTypeLike *factory : allFactories) {
if (!matches.contains(factory)) {
const QStringList mimeTypes = factory->mimeTypes();
for (const QString &mimeName : mimeTypes) {
if (mt.matchesName(mimeName)) {
list->append(factory);
matches.insert(factory);
}
}
}
}
return true; // continue
});
}
/*!
\class Core::IEditorFactory
\inheaderfile coreplugin/editormanager/ieditorfactory.h
@@ -158,8 +181,8 @@ const EditorTypeList EditorType::defaultEditorTypes(const MimeType &mimeType)
const EditorTypeList allExternalEditors = Utils::filtered(allTypes, [](EditorType *e) {
return e->asExternalEditor() != nullptr;
});
Internal::mimeTypeFactoryLookup(mimeType, allEditorFactories, &result);
Internal::mimeTypeFactoryLookup(mimeType, allExternalEditors, &result);
mimeTypeFactoryLookup(mimeType, allEditorFactories, &result);
mimeTypeFactoryLookup(mimeType, allExternalEditors, &result);
return result;
}
@@ -349,7 +372,7 @@ const ExternalEditorList IExternalEditor::externalEditors(const Utils::MimeType
{
ExternalEditorList rc;
const ExternalEditorList allEditors = IExternalEditor::allExternalEditors();
Internal::mimeTypeFactoryLookup(mimeType, allEditors, &rc);
mimeTypeFactoryLookup(mimeType, allEditors, &rc);
return rc;
}

26
src/plugins/coreplugin/editormanager/ieditorfactory_p.h
View File

@@ -6,7 +6,6 @@
#include <utils/mimeutils.h>
#include <QHash>
#include <QSet>
namespace Core {
@@ -17,30 +16,5 @@ namespace Internal {
QHash<Utils::MimeType, EditorType *> userPreferredEditorTypes();
void setUserPreferredEditorTypes(const QHash<Utils::MimeType, EditorType *> &factories);
/* Find the one best matching the mimetype passed in.
* Recurse over the parent classes of the mimetype to find them. */
template<class EditorTypeLike>
static void mimeTypeFactoryLookup(const Utils::MimeType &mimeType,
const QList<EditorTypeLike *> &allFactories,
QList<EditorTypeLike *> *list)
{
QSet<EditorTypeLike *> matches;
Utils::visitMimeParents(mimeType, [&](const Utils::MimeType &mt) -> bool {
// check for matching factories
for (EditorTypeLike *factory : allFactories) {
if (!matches.contains(factory)) {
const QStringList mimeTypes = factory->mimeTypes();
for (const QString &mimeName : mimeTypes) {
if (mt.matchesName(mimeName)) {
list->append(factory);
matches.insert(factory);
}
}
}
}
return true; // continue
});
}
} // Internal
} // Core