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

Move editor factory search function to recently created private header

Browse Source 
Change-Id: I74a9a58c679c265c6d723209705323e83901e040
Reviewed-by: David Schulz <david.schulz@qt.io>
This commit is contained in:
Eike Ziller
2018-06-26 14:58:51 +02:00
parent b2d844b22a
commit 25fb87f9e7
4 changed files with 48 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
src/plugins/coreplugin/editormanager/editormanager_p.h
View File

@@ -33,7 +33,6 @@
#include "ieditorfactory.h"
#include <coreplugin/idocument.h>
#include <utils/mimetypes/mimedatabase.h>
#include <QList>
#include <QObject>
@@ -278,50 +277,5 @@ private:
QList<std::function<bool(IEditor *)>> m_closeEditorListeners;
};
/* For something that has a 'QStringList mimeTypes' (IEditorFactory
* or IExternalEditor), find the one best matching the mimetype passed in.
* Recurse over the parent classes of the mimetype to find them. */
template <class EditorFactoryLike>
static void mimeTypeFactoryLookup(const Utils::MimeType &mimeType,
const QList<EditorFactoryLike*> &allFactories,
QList<EditorFactoryLike*> *list)
{
QSet<EditorFactoryLike *> matches;
// search breadth-first through parent hierarchy, e.g. for hierarchy
// * application/x-ruby
// * application/x-executable
// * application/octet-stream
// * text/plain
QList<Utils::MimeType> queue;
QSet<QString> seen;
queue.append(mimeType);
seen.insert(mimeType.name());
while (!queue.isEmpty()) {
Utils::MimeType mt = queue.takeFirst();
// check for matching factories
foreach (EditorFactoryLike *factory, allFactories) {
if (!matches.contains(factory)) {
foreach (const QString &mimeName, factory->mimeTypes()) {
if (mt.matchesName(mimeName)) {
list->append(factory);
matches.insert(factory);
}
}
}
}
// add parent mime types
QStringList parentNames = mt.parentMimeTypes();
foreach (const QString &parentName, parentNames) {
const Utils::MimeType parent = Utils::mimeTypeForName(parentName);
if (parent.isValid()) {
int seenSize = seen.size();
seen.insert(parent.name());
if (seen.size() != seenSize) // not seen before, so add
queue.append(parent);
}
}
}
}
} // Internal
} // Core

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

@@ -26,7 +26,6 @@
#include "ieditorfactory.h"
#include "ieditorfactory_p.h"
#include "editormanager.h"
#include "editormanager_p.h"
#include <utils/mimetypes/mimedatabase.h>
#include <utils/qtcassert.h>

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

@@ -26,8 +26,10 @@
#pragma once
#include <utils/mimetypes/mimetype.h>
#include <utils/mimetypes/mimedatabase.h>
#include <QHash>
#include <QSet>
namespace Core {
@@ -38,5 +40,50 @@ namespace Internal {
QHash<Utils::MimeType, IEditorFactory *> userPreferredEditorFactories();
void setUserPreferredEditorFactories(const QHash<Utils::MimeType, IEditorFactory *> &factories);
/* For something that has a 'QStringList mimeTypes' (IEditorFactory
* or IExternalEditor), find the one best matching the mimetype passed in.
* Recurse over the parent classes of the mimetype to find them. */
template <class EditorFactoryLike>
static void mimeTypeFactoryLookup(const Utils::MimeType &mimeType,
const QList<EditorFactoryLike*> &allFactories,
QList<EditorFactoryLike*> *list)
{
QSet<EditorFactoryLike *> matches;
// search breadth-first through parent hierarchy, e.g. for hierarchy
// * application/x-ruby
// * application/x-executable
// * application/octet-stream
// * text/plain
QList<Utils::MimeType> queue;
QSet<QString> seen;
queue.append(mimeType);
seen.insert(mimeType.name());
while (!queue.isEmpty()) {
Utils::MimeType mt = queue.takeFirst();
// check for matching factories
foreach (EditorFactoryLike *factory, allFactories) {
if (!matches.contains(factory)) {
foreach (const QString &mimeName, factory->mimeTypes()) {
if (mt.matchesName(mimeName)) {
list->append(factory);
matches.insert(factory);
}
}
}
}
// add parent mime types
QStringList parentNames = mt.parentMimeTypes();
foreach (const QString &parentName, parentNames) {
const Utils::MimeType parent = Utils::mimeTypeForName(parentName);
if (parent.isValid()) {
int seenSize = seen.size();
seen.insert(parent.name());
if (seen.size() != seenSize) // not seen before, so add
queue.append(parent);
}
}
}
}
} // Internal
} // Core

2
src/plugins/coreplugin/editormanager/iexternaleditor.cpp
View File

@@ -25,7 +25,7 @@
#include "iexternaleditor.h"
#include "editormanager_p.h"
#include "ieditorfactory_p.h"
namespace Core {