aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorhjk <hjk@qt.io>2017-03-02 12:07:11 +0100
committerhjk <hjk@qt.io>2017-03-03 07:57:54 +0000
commit3f5caf4cdcb66e5187a9d33bbd2fa67d3bddd50d (patch)
tree1ad8ac1679aedae5cb84d499966819c6265b5af8
parent2cd8378148362b53a29d2166136f248281293f30 (diff)
Utils: Wrap MimeDatabase into static functions
To avoid repeating the 'MimeDatabase mdb; mdb.something(); ' mantra all over the place. Change-Id: I4bfef62e73275a991455141671d6071162788e9d Reviewed-by: Eike Ziller <eike.ziller@qt.io>
-rw-r--r--src/libs/extensionsystem/pluginmanager.cpp8
-rw-r--r--src/libs/utils/mimetypes/mimedatabase.cpp58
-rw-r--r--src/libs/utils/mimetypes/mimedatabase.h89
-rw-r--r--src/libs/utils/mimetypes/mimedatabase_p.h59
-rw-r--r--src/plugins/autotoolsprojectmanager/autotoolsbuildconfiguration.cpp3
-rw-r--r--src/plugins/beautifier/abstractsettings.cpp6
-rw-r--r--src/plugins/beautifier/beautifierplugin.cpp3
-rw-r--r--src/plugins/beautifier/generalsettings.cpp3
-rw-r--r--src/plugins/clangcodemodel/clangcompletionassistprocessor.cpp3
-rw-r--r--src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp3
-rw-r--r--src/plugins/cmakeprojectmanager/treescanner.cpp8
-rw-r--r--src/plugins/coreplugin/basefilewizardfactory.cpp3
-rw-r--r--src/plugins/coreplugin/corejsextensions.cpp3
-rw-r--r--src/plugins/coreplugin/coreplugin.cpp3
-rw-r--r--src/plugins/coreplugin/documentmanager.cpp11
-rw-r--r--src/plugins/coreplugin/editormanager/editormanager.cpp26
-rw-r--r--src/plugins/coreplugin/fileiconprovider.cpp6
-rw-r--r--src/plugins/coreplugin/mainwindow.cpp3
-rw-r--r--src/plugins/coreplugin/mimetypesettings.cpp14
-rw-r--r--src/plugins/cpaster/cpasterplugin.cpp3
-rw-r--r--src/plugins/cppeditor/cppeditordocument.cpp3
-rw-r--r--src/plugins/cppeditor/resourcepreviewhoverhandler.cpp3
-rw-r--r--src/plugins/cpptools/cppcompletionassist.cpp6
-rw-r--r--src/plugins/cpptools/cppfilesettingspage.cpp10
-rw-r--r--src/plugins/cpptools/cppprojectfile.cpp3
-rw-r--r--src/plugins/cpptools/cpptoolsplugin.cpp13
-rw-r--r--src/plugins/debugger/disassembleragent.cpp3
-rw-r--r--src/plugins/designer/cpp/formclasswizardpage.cpp7
-rw-r--r--src/plugins/designer/formeditorplugin.cpp8
-rw-r--r--src/plugins/designer/qtcreatorintegration.cpp3
-rw-r--r--src/plugins/genericprojectmanager/genericbuildconfiguration.cpp3
-rw-r--r--src/plugins/genericprojectmanager/genericprojectwizard.cpp3
-rw-r--r--src/plugins/imageviewer/imageviewerfile.cpp3
-rw-r--r--src/plugins/modeleditor/modelindexer.cpp5
-rw-r--r--src/plugins/nim/project/nimbuildconfigurationfactory.cpp3
-rw-r--r--src/plugins/projectexplorer/customwizard/customwizardparameters.cpp5
-rw-r--r--src/plugins/projectexplorer/jsonwizard/jsonkitspage.cpp3
-rw-r--r--src/plugins/projectexplorer/jsonwizard/jsonwizardgeneratorfactory.cpp3
-rw-r--r--src/plugins/projectexplorer/jsonwizard/jsonwizardscannergenerator.cpp3
-rw-r--r--src/plugins/projectexplorer/projectexplorer.cpp12
-rw-r--r--src/plugins/projectexplorer/projectfilewizardextension.cpp3
-rw-r--r--src/plugins/qbsprojectmanager/qbsbuildconfiguration.cpp3
-rw-r--r--src/plugins/qmakeprojectmanager/qmakebuildconfiguration.cpp3
-rw-r--r--src/plugins/qmakeprojectmanager/qmakeparsernodes.cpp12
-rw-r--r--src/plugins/qmakeprojectmanager/wizards/simpleprojectwizard.cpp5
-rw-r--r--src/plugins/qmljstools/qmljsmodelmanager.cpp18
-rw-r--r--src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp5
-rw-r--r--src/plugins/resourceeditor/resourcenode.cpp3
-rw-r--r--src/plugins/texteditor/generichighlighter/manager.cpp3
-rw-r--r--src/plugins/texteditor/textdocument.cpp3
-rw-r--r--src/plugins/texteditor/texteditor.cpp6
51 files changed, 237 insertions, 244 deletions
diff --git a/src/libs/extensionsystem/pluginmanager.cpp b/src/libs/extensionsystem/pluginmanager.cpp
index f458cb39d8..6998e7bbc4 100644
--- a/src/libs/extensionsystem/pluginmanager.cpp
+++ b/src/libs/extensionsystem/pluginmanager.cpp
@@ -1234,15 +1234,15 @@ void PluginManagerPrivate::removeObject(QObject *obj)
void PluginManagerPrivate::loadPlugins()
{
QList<PluginSpec *> queue = loadQueue();
- MimeDatabase::setStartupPhase(MimeDatabase::PluginsLoading);
+ Utils::setMimeStartupPhase(MimeStartupPhase::PluginsLoading);
foreach (PluginSpec *spec, queue) {
loadPlugin(spec, PluginSpec::Loaded);
}
- MimeDatabase::setStartupPhase(MimeDatabase::PluginsInitializing);
+ Utils::setMimeStartupPhase(MimeStartupPhase::PluginsInitializing);
foreach (PluginSpec *spec, queue) {
loadPlugin(spec, PluginSpec::Initialized);
}
- MimeDatabase::setStartupPhase(MimeDatabase::PluginsDelayedInitializing);
+ Utils::setMimeStartupPhase(MimeStartupPhase::PluginsDelayedInitializing);
Utils::reverseForeach(queue, [this](PluginSpec *spec) {
loadPlugin(spec, PluginSpec::Running);
if (spec->state() == PluginSpec::Running) {
@@ -1253,7 +1253,7 @@ void PluginManagerPrivate::loadPlugins()
}
});
emit q->pluginsChanged();
- MimeDatabase::setStartupPhase(MimeDatabase::UpAndRunning);
+ Utils::setMimeStartupPhase(MimeStartupPhase::UpAndRunning);
delayedInitializeTimer = new QTimer;
delayedInitializeTimer->setInterval(DELAYED_INITIALIZE_INTERVAL);
diff --git a/src/libs/utils/mimetypes/mimedatabase.cpp b/src/libs/utils/mimetypes/mimedatabase.cpp
index 2e2db7db9b..b1ba7db8df 100644
--- a/src/libs/utils/mimetypes/mimedatabase.cpp
+++ b/src/libs/utils/mimetypes/mimedatabase.cpp
@@ -331,7 +331,7 @@ MimeDatabase::~MimeDatabase()
d = 0;
}
-void MimeDatabase::addMimeTypes(const QString &fileName, const QByteArray &data)
+void Utils::addMimeTypes(const QString &fileName, const QByteArray &data)
{
auto d = MimeDatabasePrivate::instance();
QMutexLocker locker(&d->mutex);
@@ -344,7 +344,7 @@ void MimeDatabase::addMimeTypes(const QString &fileName, const QByteArray &data)
xmlProvider->addData(fileName, data);
}
-QString MimeDatabase::allFiltersString(QString *allFilesFilter)
+QString Utils::allFiltersString(QString *allFilesFilter)
{
MimeDatabase mdb;
QSet<QString> uniqueFilters;
@@ -367,7 +367,7 @@ QString MimeDatabase::allFiltersString(QString *allFilesFilter)
return filters.join(QLatin1String(";;"));
}
-QString MimeDatabase::allFilesFilterString()
+QString Utils::allFilesFilterString()
{
auto d = MimeDatabasePrivate::instance();
if (d->m_startupPhase <= MimeDatabase::PluginsInitializing)
@@ -376,7 +376,7 @@ QString MimeDatabase::allFilesFilterString()
return QCoreApplication::translate("Core", ALL_FILES_FILTER.source, ALL_FILES_FILTER.comment);
}
-QStringList MimeDatabase::allGlobPatterns()
+QStringList Utils::allGlobPatterns()
{
auto d = MimeDatabasePrivate::instance();
if (d->m_startupPhase <= MimeDatabase::PluginsInitializing)
@@ -682,32 +682,68 @@ QList<MimeType> MimeDatabase::allMimeTypes() const
\value MatchContent The file content is used to look for a match
*/
-QMap<int, QList<MimeMagicRule> > MimeDatabase::magicRulesForMimeType(const MimeType &mimeType)
+QMap<int, QList<MimeMagicRule> > Utils::magicRulesForMimeType(const MimeType &mimeType)
{
auto d = MimeDatabasePrivate::instance();
QMutexLocker locker(&d->mutex);
return d->provider()->magicRulesForMimeType(mimeType);
}
-void MimeDatabase::setGlobPatternsForMimeType(const MimeType &mimeType, const QStringList &patterns)
+void Utils::setGlobPatternsForMimeType(const MimeType &mimeType, const QStringList &patterns)
{
auto d = MimeDatabasePrivate::instance();
QMutexLocker locker(&d->mutex);
return d->provider()->setGlobPatternsForMimeType(mimeType, patterns);
}
-void MimeDatabase::setMagicRulesForMimeType(const MimeType &mimeType, const QMap<int, QList<MimeMagicRule> > &rules)
+void Utils::setMagicRulesForMimeType(const MimeType &mimeType, const QMap<int, QList<MimeMagicRule> > &rules)
{
auto d = MimeDatabasePrivate::instance();
QMutexLocker locker(&d->mutex);
return d->provider()->setMagicRulesForMimeType(mimeType, rules);
}
-void MimeDatabase::setStartupPhase(MimeDatabase::StartupPhase phase)
+void Utils::setMimeStartupPhase(MimeStartupPhase phase)
{
auto d = MimeDatabasePrivate::instance();
QMutexLocker locker(&d->mutex);
- if (phase != d->m_startupPhase + 1)
- qWarning("Unexpected jump in MimedDatabase lifetime from %d to %d", d->m_startupPhase, phase);
- d->m_startupPhase = phase;
+ if (int(phase) != d->m_startupPhase + 1)
+ qWarning("Unexpected jump in MimedDatabase lifetime from %d to %d", d->m_startupPhase, int(phase));
+ d->m_startupPhase = int(phase);
+}
+
+MimeType Utils::mimeTypeForName(const QString &nameOrAlias)
+{
+ MimeDatabase mdb;
+ return mdb.mimeTypeForName(nameOrAlias);
+}
+
+MimeType Utils::mimeTypeForFile(const QString &fileName, MimeMatchMode mode)
+{
+ MimeDatabase mdb;
+ return mdb.mimeTypeForFile(fileName, MimeDatabase::MatchMode(mode));
+}
+
+MimeType Utils::mimeTypeForFile(const QFileInfo &fileInfo, MimeMatchMode mode)
+{
+ MimeDatabase mdb;
+ return mdb.mimeTypeForFile(fileInfo, MimeDatabase::MatchMode(mode));
+}
+
+QList<MimeType> Utils::mimeTypesForFileName(const QString &fileName)
+{
+ MimeDatabase mdb;
+ return mdb.mimeTypesForFileName(fileName);
+}
+
+MimeType Utils::mimeTypeForData(const QByteArray &data)
+{
+ MimeDatabase mdb;
+ return mdb.mimeTypeForData(data);
+}
+
+QList<MimeType> Utils::allMimeTypes()
+{
+ MimeDatabase mdb;
+ return mdb.allMimeTypes();
}
diff --git a/src/libs/utils/mimetypes/mimedatabase.h b/src/libs/utils/mimetypes/mimedatabase.h
index f962c35eb3..021accf78d 100644
--- a/src/libs/utils/mimetypes/mimedatabase.h
+++ b/src/libs/utils/mimetypes/mimedatabase.h
@@ -44,72 +44,45 @@
#include <utils/utils_global.h>
-#include <QtCore/qstringlist.h>
-
QT_BEGIN_NAMESPACE
-class QByteArray;
class QFileInfo;
-class QIODevice;
-class QUrl;
QT_END_NAMESPACE
namespace Utils {
-namespace Internal { class MimeDatabasePrivate; }
-
-class QTCREATOR_UTILS_EXPORT MimeDatabase
-{
- Q_DISABLE_COPY(MimeDatabase)
-
-public:
- MimeDatabase();
- ~MimeDatabase();
-
- MimeType mimeTypeForName(const QString &nameOrAlias) const;
-
- enum MatchMode {
- MatchDefault = 0x0,
- MatchExtension = 0x1,
- MatchContent = 0x2
- };
-
- MimeType mimeTypeForFile(const QString &fileName, MatchMode mode = MatchDefault) const;
- MimeType mimeTypeForFile(const QFileInfo &fileInfo, MatchMode mode = MatchDefault) const;
- QList<MimeType> mimeTypesForFileName(const QString &fileName) const;
-
- MimeType mimeTypeForData(const QByteArray &data) const;
- MimeType mimeTypeForData(QIODevice *device) const;
+// Wrapped QMimeDataBase functions
+QTCREATOR_UTILS_EXPORT MimeType mimeTypeForName(const QString &nameOrAlias);
- MimeType mimeTypeForUrl(const QUrl &url) const;
- MimeType mimeTypeForFileNameAndData(const QString &fileName, QIODevice *device) const;
- MimeType mimeTypeForFileNameAndData(const QString &fileName, const QByteArray &data) const;
-
- QString suffixForFileName(const QString &fileName) const;
-
- QList<MimeType> allMimeTypes() const;
-
- // Qt Creator additions
- static void addMimeTypes(const QString &id, const QByteArray &data);
- static QString allFiltersString(QString *allFilesFilter = 0);
- static QString allFilesFilterString();
- static QStringList allGlobPatterns();
- static QMap<int, QList<Internal::MimeMagicRule> > magicRulesForMimeType(const MimeType &mimeType); // priority -> rules
- static void setGlobPatternsForMimeType(const MimeType &mimeType, const QStringList &patterns);
- static void setMagicRulesForMimeType(const MimeType &mimeType,
- const QMap<int, QList<Internal::MimeMagicRule> > &rules); // priority -> rules
-
- // For debugging purposes.
- enum StartupPhase {
- BeforeInitialize,
- PluginsLoading,
- PluginsInitializing, // Register up to here.
- PluginsDelayedInitializing, // Use from here on.
- UpAndRunning
- };
- static void setStartupPhase(StartupPhase);
+enum class MimeMatchMode {
+ MatchDefault = 0x0,
+ MatchExtension = 0x1,
+ MatchContent = 0x2
+};
-private:
- Internal::MimeDatabasePrivate *d;
+QTCREATOR_UTILS_EXPORT MimeType mimeTypeForFile(const QString &fileName, MimeMatchMode mode = MimeMatchMode::MatchDefault);
+QTCREATOR_UTILS_EXPORT MimeType mimeTypeForFile(const QFileInfo &fileInfo, MimeMatchMode mode = MimeMatchMode::MatchDefault);
+QTCREATOR_UTILS_EXPORT QList<MimeType> mimeTypesForFileName(const QString &fileName);
+QTCREATOR_UTILS_EXPORT MimeType mimeTypeForData(const QByteArray &data);
+QTCREATOR_UTILS_EXPORT QList<MimeType> allMimeTypes();
+
+// Qt Creator additions
+// For debugging purposes.
+enum class MimeStartupPhase {
+ BeforeInitialize,
+ PluginsLoading,
+ PluginsInitializing, // Register up to here.
+ PluginsDelayedInitializing, // Use from here on.
+ UpAndRunning
};
+QTCREATOR_UTILS_EXPORT void setMimeStartupPhase(MimeStartupPhase);
+QTCREATOR_UTILS_EXPORT void addMimeTypes(const QString &id, const QByteArray &data);
+QTCREATOR_UTILS_EXPORT QString allFiltersString(QString *allFilesFilter = 0);
+QTCREATOR_UTILS_EXPORT QString allFilesFilterString();
+QTCREATOR_UTILS_EXPORT QStringList allGlobPatterns();
+QTCREATOR_UTILS_EXPORT QMap<int, QList<Internal::MimeMagicRule> > magicRulesForMimeType(const MimeType &mimeType); // priority -> rules
+QTCREATOR_UTILS_EXPORT void setGlobPatternsForMimeType(const MimeType &mimeType, const QStringList &patterns);
+QTCREATOR_UTILS_EXPORT void setMagicRulesForMimeType(const MimeType &mimeType,
+ const QMap<int, QList<Internal::MimeMagicRule> > &rules); // priority -> rules
+
} // Utils
diff --git a/src/libs/utils/mimetypes/mimedatabase_p.h b/src/libs/utils/mimetypes/mimedatabase_p.h
index 41a1439409..1a464fb007 100644
--- a/src/libs/utils/mimetypes/mimedatabase_p.h
+++ b/src/libs/utils/mimetypes/mimedatabase_p.h
@@ -43,6 +43,15 @@
// W A R N I N G
// -------------
//
+// This file is mostly copied from Qt code and should not be touched
+// unless really needed.
+//
+
+
+//
+// W A R N I N G
+// -------------
+//
// This file is not part of the Qt API. It exists purely as an
// implementation detail. This header file may change from version to
// version without notice, or even be removed.
@@ -53,7 +62,9 @@
#include <QtCore/qhash.h>
#include <QtCore/qmutex.h>
QT_BEGIN_NAMESPACE
+class QFileInfo;
class QIODevice;
+class QUrl;
QT_END_NAMESPACE
#include "mimetype.h"
@@ -61,9 +72,6 @@ QT_END_NAMESPACE
#include "mimeglobpattern_p.h"
namespace Utils {
-
-class MimeDatabase;
-
namespace Internal {
class MimeProviderBase;
@@ -100,5 +108,50 @@ public:
int m_startupPhase = 0;
};
+class MimeDatabase
+{
+ Q_DISABLE_COPY(MimeDatabase)
+
+public:
+ MimeDatabase();
+ ~MimeDatabase();
+
+ MimeType mimeTypeForName(const QString &nameOrAlias) const;
+
+ enum MatchMode {
+ MatchDefault = 0x0,
+ MatchExtension = 0x1,
+ MatchContent = 0x2
+ };
+
+ MimeType mimeTypeForFile(const QString &fileName, MatchMode mode = MatchDefault) const;
+ MimeType mimeTypeForFile(const QFileInfo &fileInfo, MatchMode mode = MatchDefault) const;
+ QList<MimeType> mimeTypesForFileName(const QString &fileName) const;
+
+ MimeType mimeTypeForData(const QByteArray &data) const;
+ MimeType mimeTypeForData(QIODevice *device) const;
+
+ MimeType mimeTypeForUrl(const QUrl &url) const;
+ MimeType mimeTypeForFileNameAndData(const QString &fileName, QIODevice *device) const;
+ MimeType mimeTypeForFileNameAndData(const QString &fileName, const QByteArray &data) const;
+
+ QString suffixForFileName(const QString &fileName) const;
+
+ QList<MimeType> allMimeTypes() const;
+
+ // For debugging purposes.
+ enum StartupPhase {
+ BeforeInitialize,
+ PluginsLoading,
+ PluginsInitializing, // Register up to here.
+ PluginsDelayedInitializing, // Use from here on.
+ UpAndRunning
+ };
+ static void setStartupPhase(StartupPhase);
+
+private:
+ Internal::MimeDatabasePrivate *d;
+};
+
} // Internal
} // Utils
diff --git a/src/plugins/autotoolsprojectmanager/autotoolsbuildconfiguration.cpp b/src/plugins/autotoolsprojectmanager/autotoolsbuildconfiguration.cpp
index 5095c0e57a..82db5188d1 100644
--- a/src/plugins/autotoolsprojectmanager/autotoolsbuildconfiguration.cpp
+++ b/src/plugins/autotoolsprojectmanager/autotoolsbuildconfiguration.cpp
@@ -106,8 +106,7 @@ QList<BuildInfo *> AutotoolsBuildConfigurationFactory::availableBuilds(const Tar
int AutotoolsBuildConfigurationFactory::priority(const Kit *k, const QString &projectPath) const
{
- Utils::MimeDatabase mdb;
- if (k && mdb.mimeTypeForFile(projectPath).matchesName(QLatin1String(Constants::MAKEFILE_MIMETYPE)))
+ if (k && Utils::mimeTypeForFile(projectPath).matchesName(QLatin1String(Constants::MAKEFILE_MIMETYPE)))
return 0;
return -1;
}
diff --git a/src/plugins/beautifier/abstractsettings.cpp b/src/plugins/beautifier/abstractsettings.cpp
index 31b9d98641..acd5ba41f7 100644
--- a/src/plugins/beautifier/abstractsettings.cpp
+++ b/src/plugins/beautifier/abstractsettings.cpp
@@ -155,10 +155,9 @@ QString AbstractSettings::supportedMimeTypesAsString() const
void AbstractSettings::setSupportedMimeTypes(const QString &mimes)
{
const QStringList stringTypes = mimes.split(';');
- const Utils::MimeDatabase mdb;
QStringList types;
for (const QString &type : stringTypes) {
- const Utils::MimeType mime = mdb.mimeTypeForName(type.trimmed());
+ const Utils::MimeType mime = Utils::mimeTypeForName(type.trimmed());
if (!mime.isValid())
continue;
const QString canonicalName = mime.name();
@@ -180,8 +179,7 @@ bool AbstractSettings::isApplicable(const Core::IDocument *document) const
if (m_supportedMimeTypes.isEmpty())
return true;
- const Utils::MimeDatabase mdb;
- const Utils::MimeType documentMimeType = mdb.mimeTypeForName(document->mimeType());
+ const Utils::MimeType documentMimeType = Utils::mimeTypeForName(document->mimeType());
return Utils::anyOf(m_supportedMimeTypes, [&documentMimeType](const QString &mime) {
return documentMimeType.inherits(mime);
});
diff --git a/src/plugins/beautifier/beautifierplugin.cpp b/src/plugins/beautifier/beautifierplugin.cpp
index ad052020f5..ad2598152c 100644
--- a/src/plugins/beautifier/beautifierplugin.cpp
+++ b/src/plugins/beautifier/beautifierplugin.cpp
@@ -181,8 +181,7 @@ bool isAutoFormatApplicable(const Core::IDocument *document,
if (allowedMimeTypes.isEmpty())
return true;
- const Utils::MimeDatabase mdb;
- const Utils::MimeType documentMimeType = mdb.mimeTypeForName(document->mimeType());
+ const Utils::MimeType documentMimeType = Utils::mimeTypeForName(document->mimeType());
return Utils::anyOf(allowedMimeTypes, [&documentMimeType](const Utils::MimeType &mime) {
return documentMimeType.inherits(mime.name());
});
diff --git a/src/plugins/beautifier/generalsettings.cpp b/src/plugins/beautifier/generalsettings.cpp
index 7afcca56e0..f92d120503 100644
--- a/src/plugins/beautifier/generalsettings.cpp
+++ b/src/plugins/beautifier/generalsettings.cpp
@@ -116,10 +116,9 @@ void GeneralSettings::setAutoFormatMime(const QString &mimeList)
const QStringList stringTypes = mimeList.split(';');
QList<Utils::MimeType> types;
types.reserve(stringTypes.count());
- const Utils::MimeDatabase mdb;
for (QString t : stringTypes) {
t = t.trimmed();
- const Utils::MimeType mime = mdb.mimeTypeForName(t);
+ const Utils::MimeType mime = Utils::mimeTypeForName(t);
if (mime.isValid())
types << mime;
}
diff --git a/src/plugins/clangcodemodel/clangcompletionassistprocessor.cpp b/src/plugins/clangcodemodel/clangcompletionassistprocessor.cpp
index 54ca38d3b2..f71f586855 100644
--- a/src/plugins/clangcodemodel/clangcompletionassistprocessor.cpp
+++ b/src/plugins/clangcodemodel/clangcompletionassistprocessor.cpp
@@ -406,8 +406,7 @@ bool ClangCompletionAssistProcessor::completeInclude(const QTextCursor &cursor)
if (!headerPaths.contains(currentFilePath))
headerPaths.append(currentFilePath);
- ::Utils::MimeDatabase mdb;
- const ::Utils::MimeType mimeType = mdb.mimeTypeForName(QLatin1String("text/x-c++hdr"));
+ const ::Utils::MimeType mimeType = ::Utils::mimeTypeForName("text/x-c++hdr");
const QStringList suffixes = mimeType.suffixes();
foreach (const CppTools::ProjectPartHeaderPath &headerPath, headerPaths) {
diff --git a/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp b/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp
index beb1c4ed58..de83912294 100644
--- a/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp
+++ b/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp
@@ -486,8 +486,7 @@ QList<ProjectExplorer::BuildInfo *> CMakeBuildConfigurationFactory::availableBui
int CMakeBuildConfigurationFactory::priority(const ProjectExplorer::Kit *k, const QString &projectPath) const
{
- Utils::MimeDatabase mdb;
- if (k && mdb.mimeTypeForFile(projectPath).matchesName(QLatin1String(Constants::CMAKEPROJECTMIMETYPE)))
+ if (k && Utils::mimeTypeForFile(projectPath).matchesName(Constants::CMAKEPROJECTMIMETYPE))
return 0;
return -1;
}
diff --git a/src/plugins/cmakeprojectmanager/treescanner.cpp b/src/plugins/cmakeprojectmanager/treescanner.cpp
index aaee7fa921..9e8c9d66b3 100644
--- a/src/plugins/cmakeprojectmanager/treescanner.cpp
+++ b/src/plugins/cmakeprojectmanager/treescanner.cpp
@@ -170,14 +170,12 @@ void TreeScanner::scanForFiles(FutureInterface *fi, const Utils::FileName& direc
{
std::unique_ptr<FutureInterface> fip(fi);
fip->reportStarted();
- Utils::MimeDatabase mdb;
- Result nodes
- = FileNode::scanForFiles(directory,
- [&mdb,&filter,&factory](const Utils::FileName &fn) -> FileNode * {
+ Result nodes = FileNode::scanForFiles(directory,
+ [&filter, &factory](const Utils::FileName &fn) -> FileNode * {
QTC_ASSERT(!fn.isEmpty(), return nullptr);
- const Utils::MimeType mimeType = mdb.mimeTypeForFile(fn.toString());
+ const Utils::MimeType mimeType = Utils::mimeTypeForFile(fn.toString());
// Skip some files during scan.
// Filter out nullptr records after.
diff --git a/src/plugins/coreplugin/basefilewizardfactory.cpp b/src/plugins/coreplugin/basefilewizardfactory.cpp
index fee36be5b4..3e90da89d4 100644
--- a/src/plugins/coreplugin/basefilewizardfactory.cpp
+++ b/src/plugins/coreplugin/basefilewizardfactory.cpp
@@ -275,8 +275,7 @@ QString BaseFileWizardFactory::buildFileName(const QString &path,
QString BaseFileWizardFactory::preferredSuffix(const QString &mimeType)
{
QString rc;
- Utils::MimeDatabase mdb;
- Utils::MimeType mt = mdb.mimeTypeForName(mimeType);
+ Utils::MimeType mt = Utils::mimeTypeForName(mimeType);
if (mt.isValid())
rc = mt.preferredSuffix();
if (rc.isEmpty())
diff --git a/src/plugins/coreplugin/corejsextensions.cpp b/src/plugins/coreplugin/corejsextensions.cpp
index f09a06b949..21017f8aac 100644
--- a/src/plugins/coreplugin/corejsextensions.cpp
+++ b/src/plugins/coreplugin/corejsextensions.cpp
@@ -110,8 +110,7 @@ bool UtilsJsExtension::isFile(const QString &in) const
QString UtilsJsExtension::preferredSuffix(const QString &mimetype) const
{
- Utils::MimeDatabase mdb;
- Utils::MimeType mt = mdb.mimeTypeForName(mimetype);
+ Utils::MimeType mt = Utils::mimeTypeForName(mimetype);
if (mt.isValid())
return mt.preferredSuffix();
return QString();
diff --git a/src/plugins/coreplugin/coreplugin.cpp b/src/plugins/coreplugin/coreplugin.cpp
index 5e21d8c134..ff2ad7443b 100644
--- a/src/plugins/coreplugin/coreplugin.cpp
+++ b/src/plugins/coreplugin/coreplugin.cpp
@@ -126,14 +126,13 @@ CoreArguments parseArguments(const QStringList &arguments)
bool CorePlugin::initialize(const QStringList &arguments, QString *errorMessage)
{
// register all mime types from all plugins
- Utils::MimeDatabase mdb;
for (ExtensionSystem::PluginSpec *plugin : ExtensionSystem::PluginManager::plugins()) {
if (!plugin->isEffectivelyEnabled())
continue;
const QJsonObject metaData = plugin->metaData();
const QJsonValue mimetypes = metaData.value("Mimetypes");
if (mimetypes.isString())
- mdb.addMimeTypes(plugin->name() + ".mimetypes", mimetypes.toString().trimmed().toUtf8());
+ Utils::addMimeTypes(plugin->name() + ".mimetypes", mimetypes.toString().trimmed().toUtf8());
}
if (ThemeEntry::availableThemes().isEmpty()) {
diff --git a/src/plugins/coreplugin/documentmanager.cpp b/src/plugins/coreplugin/documentmanager.cpp
index bf65d4620b..30da372eaf 100644
--- a/src/plugins/coreplugin/documentmanager.cpp
+++ b/src/plugins/coreplugin/documentmanager.cpp
@@ -696,7 +696,7 @@ QString DocumentManager::getSaveFileName(const QString &title, const QString &pa
// specified. Otherwise the suffix must be one available in the selected filter. If
// the name already ends with such suffix nothing needs to be done. But if not, the
// first one from the filter is appended.
- if (selectedFilter && *selectedFilter != MimeDatabase::allFilesFilterString()) {
+ if (selectedFilter && *selectedFilter != Utils::allFilesFilterString()) {
// Mime database creates filter strings like this: Anything here (*.foo *.bar)
QRegExp regExp(QLatin1String(".*\\s+\\((.*)\\)$"));
const int index = regExp.lastIndexIn(*selectedFilter);
@@ -742,17 +742,16 @@ QString DocumentManager::getSaveFileNameWithExtension(const QString &title, cons
QString DocumentManager::getSaveAsFileName(const IDocument *document)
{
QTC_ASSERT(document, return QString());
- Utils::MimeDatabase mdb;
- const QString filter = Utils::MimeDatabase::allFiltersString();
+ const QString filter = Utils::allFiltersString();
const QString filePath = document->filePath().toString();
QString selectedFilter;
QString fileDialogPath = filePath;
if (!filePath.isEmpty()) {
- selectedFilter = mdb.mimeTypeForFile(filePath).filterString();
+ selectedFilter = Utils::mimeTypeForFile(filePath).filterString();
} else {
const QString suggestedName = document->fallbackSaveAsFileName();
if (!suggestedName.isEmpty()) {
- const QList<MimeType> types = mdb.mimeTypesForFileName(suggestedName);
+ const QList<MimeType> types = Utils::mimeTypesForFileName(suggestedName);
if (!types.isEmpty())
selectedFilter = types.first().filterString();
}
@@ -763,7 +762,7 @@ QString DocumentManager::getSaveAsFileName(const IDocument *document)
: '/' + suggestedName);
}
if (selectedFilter.isEmpty())
- selectedFilter = mdb.mimeTypeForName(document->mimeType()).filterString();
+ selectedFilter = Utils::mimeTypeForName(document->mimeType()).filterString();
return getSaveFileName(tr("Save File As"),
fileDialogPath,
diff --git a/src/plugins/coreplugin/editormanager/editormanager.cpp b/src/plugins/coreplugin/editormanager/editormanager.cpp
index 0af35eeb14..9c28b7045d 100644
--- a/src/plugins/coreplugin/editormanager/editormanager.cpp
+++ b/src/plugins/coreplugin/editormanager/editormanager.cpp
@@ -513,8 +513,7 @@ bool EditorManagerPrivate::skipOpeningBigTextFile(const QString &filePath)
if (!fileInfo.exists(filePath))
return false;
- Utils::MimeDatabase mdb;
- Utils::MimeType mimeType = mdb.mimeTypeForFile(filePath);
+ Utils::MimeType mimeType = Utils::mimeTypeForFile(filePath);
if (!mimeType.inherits("text/plain"))
return false;
@@ -590,8 +589,7 @@ IEditor *EditorManagerPrivate::openEditor(EditorView *view, const QString &fileN
EditorManager::EditorFactoryList factories = EditorManagerPrivate::findFactories(Id(), fn);
if (factories.isEmpty()) {
- Utils::MimeDatabase mdb;
- Utils::MimeType mimeType = mdb.mimeTypeForFile(fn);
+ Utils::MimeType mimeType = Utils::mimeTypeForFile(fn);
QMessageBox msgbox(QMessageBox::Critical, EditorManager::tr("File Error"),
tr("Could not open \"%1\": Cannot open files of type \"%2\".")
.arg(FileName::fromString(realFn).toUserOutput()).arg(mimeType.name()),
@@ -920,11 +918,10 @@ void EditorManagerPrivate::showPopupOrSelectDocument()
Id EditorManagerPrivate::getOpenWithEditorId(const QString &fileName, bool *isExternalEditor)
{
// Collect editors that can open the file
- Utils::MimeDatabase mdb;
- Utils::MimeType mt = mdb.mimeTypeForFile(fileName);
+ Utils::MimeType mt = Utils::mimeTypeForFile(fileName);
//Unable to determine mime type of fileName. Falling back to text/plain",
if (!mt.isValid())
- mt = mdb.mimeTypeForName("text/plain");
+ mt = Utils::mimeTypeForName("text/plain");
QList<Id> allEditorIds;
QStringList allEditorDisplayNames;
QList<Id> externalEditorIds;
@@ -1110,17 +1107,16 @@ EditorManager::EditorFactoryList EditorManagerPrivate::findFactories(Id editorId
if (!editorId.isValid()) {
const QFileInfo fileInfo(fileName);
// Find by mime type
- Utils::MimeDatabase mdb;
- Utils::MimeType mimeType = mdb.mimeTypeForFile(fileInfo);
+ Utils::MimeType mimeType = Utils::mimeTypeForFile(fileInfo);
if (!mimeType.isValid()) {
qWarning("%s unable to determine mime type of %s/%s. Falling back to text/plain",
Q_FUNC_INFO, fileName.toUtf8().constData(), editorId.name().constData());
- mimeType = mdb.mimeTypeForName("text/plain");
+ mimeType = Utils::mimeTypeForName("text/plain");
}
// open text files > 48 MB in binary editor
if (fileInfo.size() > EditorManager::maxTextFileSize()
&& mimeType.name().startsWith("text")) {
- mimeType = mdb.mimeTypeForName("application/octet-stream");
+ mimeType = Utils::mimeTypeForName("application/octet-stream");
}
factories = EditorManager::editorFactories(mimeType, false);
} else {
@@ -2439,8 +2435,7 @@ void EditorManager::populateOpenWithMenu(QMenu *menu, const QString &fileName)
bool anyMatches = false;
- Utils::MimeDatabase mdb;
- const Utils::MimeType mt = mdb.mimeTypeForFile(fileName);
+ const Utils::MimeType mt = Utils::mimeTypeForFile(fileName);
if (mt.isValid()) {
const EditorFactoryList factories = editorFactories(mt, false);
const ExternalEditorList extEditors = externalEditors(mt, false);
@@ -2553,7 +2548,6 @@ static void mimeTypeFactoryLookup(const Utils::MimeType &mimeType,
bool firstMatchOnly,
QList<EditorFactoryLike*> *list)
{
- Utils::MimeDatabase mdb;
QSet<EditorFactoryLike *> matches;
// search breadth-first through parent hierarchy, e.g. for hierarchy
// * application/x-ruby
@@ -2582,7 +2576,7 @@ static void mimeTypeFactoryLookup(const Utils::MimeType &mimeType,
// add parent mime types
QStringList parentNames = mt.parentMimeTypes();
foreach (const QString &parentName, parentNames) {
- const Utils::MimeType parent = mdb.mimeTypeForName(parentName);
+ const Utils::MimeType parent = Utils::mimeTypeForName(parentName);
if (parent.isValid()) {
int seenSize = seen.size();
seen.insert(parent.name());
@@ -2709,7 +2703,7 @@ void EditorManager::addCloseEditorListener(const std::function<bool (IEditor *)>
QStringList EditorManager::getOpenFileNames()
{
QString selectedFilter;
- const QString &fileFilters = Utils::MimeDatabase::allFiltersString(&selectedFilter);
+ const QString &fileFilters = Utils::allFiltersString(&selectedFilter);
return DocumentManager::getOpenFileNames(fileFilters, QString(), &selectedFilter);
}
diff --git a/src/plugins/coreplugin/fileiconprovider.cpp b/src/plugins/coreplugin/fileiconprovider.cpp
index 18df745f0c..0c6af1a4d2 100644
--- a/src/plugins/coreplugin/fileiconprovider.cpp
+++ b/src/plugins/coreplugin/fileiconprovider.cpp
@@ -201,8 +201,7 @@ void registerIconOverlayForSuffix(const QString &path, const QString &suffix)
*/
void registerIconOverlayForMimeType(const QIcon &icon, const QString &mimeType)
{
- Utils::MimeDatabase mdb;
- instance()->registerIconOverlayForMimeType(icon, mdb.mimeTypeForName(mimeType));
+ instance()->registerIconOverlayForMimeType(icon, Utils::mimeTypeForName(mimeType));
}
/*!
@@ -210,8 +209,7 @@ void registerIconOverlayForMimeType(const QIcon &icon, const QString &mimeType)
*/
void registerIconOverlayForMimeType(const QString &path, const QString &mimeType)
{
- Utils::MimeDatabase mdb;
- instance()->registerIconOverlayForMimeType(QIcon(path), mdb.mimeTypeForName(mimeType));
+ instance()->registerIconOverlayForMimeType(QIcon(path), Utils::mimeTypeForName(mimeType));
}
void registerIconOverlayForFilename(const QString &path, const QString &filename)
diff --git a/src/plugins/coreplugin/mainwindow.cpp b/src/plugins/coreplugin/mainwindow.cpp
index ec9a4cf12c..d904037334 100644
--- a/src/plugins/coreplugin/mainwindow.cpp
+++ b/src/plugins/coreplugin/mainwindow.cpp
@@ -754,8 +754,7 @@ void MainWindow::openFile()
static IDocumentFactory *findDocumentFactory(const QList<IDocumentFactory*> &fileFactories,
const QFileInfo &fi)
{
- MimeDatabase mdb;
- const MimeType mt = mdb.mimeTypeForFile(fi);
+ const MimeType mt = Utils::mimeTypeForFile(fi);
if (mt.isValid()) {
const QString typeName = mt.name();
foreach (IDocumentFactory *factory, fileFactories) {
diff --git a/src/plugins/coreplugin/mimetypesettings.cpp b/src/plugins/coreplugin/mimetypesettings.cpp
index afd7fb4951..8573ae5f87 100644
--- a/src/plugins/coreplugin/mimetypesettings.cpp
+++ b/src/plugins/coreplugin/mimetypesettings.cpp
@@ -136,8 +136,7 @@ QVariant MimeTypeSettingsModel::data(const QModelIndex &modelIndex, int role) co
void MimeTypeSettingsModel::load()
{
beginResetModel();
- Utils::MimeDatabase mdb;
- m_mimeTypes = mdb.allMimeTypes();
+ m_mimeTypes = Utils::allMimeTypes();
Utils::sort(m_mimeTypes, [](const Utils::MimeType &a, const Utils::MimeType &b) {
return a.name().compare(b.name(), Qt::CaseInsensitive) < 0;
});
@@ -271,7 +270,7 @@ void MimeTypeSettingsPrivate::syncData(const QModelIndex &current,
QMap<int, QList<Utils::Internal::MimeMagicRule> > rules =
modifiedType.isValid() ? modifiedType.rules
- : Utils::MimeDatabase::magicRulesForMimeType(currentMimeType);
+ : Utils::magicRulesForMimeType(currentMimeType);
for (auto it = rules.constBegin(); it != rules.constEnd(); ++it) {
int priority = it.key();
foreach (const Utils::Internal::MimeMagicRule &rule, it.value()) {
@@ -417,7 +416,7 @@ void MimeTypeSettingsPrivate::ensurePendingMimeType(const Utils::MimeType &mimeT
UserMimeType userMt;
userMt.name = mimeType.name();
userMt.globPatterns = mimeType.globPatterns();
- userMt.rules = Utils::MimeDatabase::magicRulesForMimeType(mimeType);
+ userMt.rules = Utils::magicRulesForMimeType(mimeType);
m_pendingModifiedMimeTypes.insert(userMt.name, userMt);
}
}
@@ -544,14 +543,13 @@ MimeTypeSettingsPrivate::UserMimeTypeHash MimeTypeSettingsPrivate::readUserModif
void MimeTypeSettingsPrivate::applyUserModifiedMimeTypes(const UserMimeTypeHash &mimeTypes)
{
// register in mime data base, and remember for later
- Utils::MimeDatabase mdb;
for (auto it = mimeTypes.constBegin(); it != mimeTypes.constEnd(); ++it) {
- Utils::MimeType mt = mdb.mimeTypeForName(it.key());
+ Utils::MimeType mt = Utils::mimeTypeForName(it.key());
if (!mt.isValid()) // loaded from settings
continue;
m_userModifiedMimeTypes.insert(it.key(), it.value());
- Utils::MimeDatabase::setGlobPatternsForMimeType(mt, it.value().globPatterns);
- Utils::MimeDatabase::setMagicRulesForMimeType(mt, it.value().rules);
+ Utils::setGlobPatternsForMimeType(mt, it.value().globPatterns);
+ Utils::setMagicRulesForMimeType(mt, it.value().rules);
}
}
diff --git a/src/plugins/cpaster/cpasterplugin.cpp b/src/plugins/cpaster/cpasterplugin.cpp
index 8045826e29..c30be1c95b 100644
--- a/src/plugins/cpaster/cpasterplugin.cpp
+++ b/src/plugins/cpaster/cpasterplugin.cpp
@@ -366,8 +366,7 @@ void CodepasterPlugin::finishFetch(const QString &titleDescription,
// Default to "txt".
QByteArray byteContent = content.toUtf8();
QString suffix;
- Utils::MimeDatabase mdb;
- const Utils::MimeType mimeType = mdb.mimeTypeForData(byteContent);
+ const Utils::MimeType mimeType = Utils::mimeTypeForData(byteContent);
if (mimeType.isValid())
suffix = mimeType.preferredSuffix();
if (suffix.isEmpty())
diff --git a/src/plugins/cppeditor/cppeditordocument.cpp b/src/plugins/cppeditor/cppeditordocument.cpp
index 6066e8da58..3ae653dd95 100644
--- a/src/plugins/cppeditor/cppeditordocument.cpp
+++ b/src/plugins/cppeditor/cppeditordocument.cpp
@@ -230,8 +230,7 @@ void CppEditorDocument::onFilePathChanged(const Utils::FileName &oldPath,
Q_UNUSED(oldPath);
if (!newPath.isEmpty()) {
- Utils::MimeDatabase mdb;
- setMimeType(mdb.mimeTypeForFile(newPath.toFileInfo()).name());
+ setMimeType(Utils::mimeTypeForFile(newPath.toFileInfo()).name());
connect(this, &Core::IDocument::contentsChanged,
this, &CppEditorDocument::scheduleProcessDocument,
diff --git a/src/plugins/cppeditor/resourcepreviewhoverhandler.cpp b/src/plugins/cppeditor/resourcepreviewhoverhandler.cpp
index 7ef01db752..01cee87e92 100644
--- a/src/plugins/cppeditor/resourcepreviewhoverhandler.cpp
+++ b/src/plugins/cppeditor/resourcepreviewhoverhandler.cpp
@@ -194,8 +194,7 @@ QString ResourcePreviewHoverHandler::makeTooltip() const
QString ret;
- Utils::MimeDatabase mdb;
- const Utils::MimeType mimeType = mdb.mimeTypeForFile(m_resPath);
+ const Utils::MimeType mimeType = Utils::mimeTypeForFile(m_resPath);
if (mimeType.isValid()) {
if (mimeType.name().startsWith("image", Qt::CaseInsensitive))
ret += QString("<img src=\"file:///%1\" /><br/>").arg(m_resPath);
diff --git a/src/plugins/cpptools/cppcompletionassist.cpp b/src/plugins/cpptools/cppcompletionassist.cpp
index 30b1a0d9dc..9c273190f2 100644
--- a/src/plugins/cpptools/cppcompletionassist.cpp
+++ b/src/plugins/cpptools/cppcompletionassist.cpp
@@ -1274,8 +1274,7 @@ bool InternalCppCompletionAssistProcessor::completeInclude(const QTextCursor &cu
if (!headerPaths.contains(currentFilePath))
headerPaths.append(currentFilePath);
- Utils::MimeDatabase mdb;
- const QStringList suffixes = mdb.mimeTypeForName(QLatin1String("text/x-c++hdr")).suffixes();
+ const QStringList suffixes = Utils::mimeTypeForName(QLatin1String("text/x-c++hdr")).suffixes();
foreach (const ProjectPartHeaderPath &headerPath, headerPaths) {
QString realPath = headerPath.path;
@@ -1324,8 +1323,7 @@ bool InternalCppCompletionAssistProcessor::objcKeywordsWanted() const
const QString fileName = m_interface->fileName();
- Utils::MimeDatabase mdb;
- const Utils::MimeType mt = mdb.mimeTypeForFile(fileName);
+ const Utils::MimeType mt = Utils::mimeTypeForFile(fileName);
return mt.matchesName(QLatin1String(CppTools::Constants::OBJECTIVE_C_SOURCE_MIMETYPE))
|| mt.matchesName(QLatin1String(CppTools::Constants::OBJECTIVE_CPP_SOURCE_MIMETYPE));
}
diff --git a/src/plugins/cpptools/cppfilesettingspage.cpp b/src/plugins/cpptools/cppfilesettingspage.cpp
index 7560451924..b6b10ce50e 100644
--- a/src/plugins/cpptools/cppfilesettingspage.cpp
+++ b/src/plugins/cpptools/cppfilesettingspage.cpp
@@ -110,13 +110,12 @@ void CppFileSettings::fromSettings(QSettings *s)
bool CppFileSettings::applySuffixesToMimeDB()
{
- Utils::MimeDatabase mdb;
Utils::MimeType mt;
- mt = mdb.mimeTypeForName(QLatin1String(CppTools::Constants::CPP_SOURCE_MIMETYPE));
+ mt = Utils::mimeTypeForName(QLatin1String(CppTools::Constants::CPP_SOURCE_MIMETYPE));
if (!mt.isValid())
return false;
mt.setPreferredSuffix(sourceSuffix);
- mt = mdb.mimeTypeForName(QLatin1String(CppTools::Constants::CPP_HEADER_MIMETYPE));
+ mt = Utils::mimeTypeForName(QLatin1String(CppTools::Constants::CPP_HEADER_MIMETYPE));
if (!mt.isValid())
return false;
mt.setPreferredSuffix(headerSuffix);
@@ -259,14 +258,13 @@ CppFileSettingsWidget::CppFileSettingsWidget(QWidget *parent) :
{
m_ui->setupUi(this);
// populate suffix combos
- Utils::MimeDatabase mdb;
- const Utils::MimeType sourceMt = mdb.mimeTypeForName(QLatin1String(CppTools::Constants::CPP_SOURCE_MIMETYPE));
+ const Utils::MimeType sourceMt = Utils::mimeTypeForName(QLatin1String(CppTools::Constants::CPP_SOURCE_MIMETYPE));
if (sourceMt.isValid()) {
foreach (const QString &suffix, sourceMt.suffixes())
m_ui->sourceSuffixComboBox->addItem(suffix);
}
- const Utils::MimeType headerMt = mdb.mimeTypeForName(QLatin1String(CppTools::Constants::CPP_HEADER_MIMETYPE));
+ const Utils::MimeType headerMt = Utils::mimeTypeForName(QLatin1String(CppTools::Constants::CPP_HEADER_MIMETYPE));
if (headerMt.isValid()) {
foreach (const QString &suffix, headerMt.suffixes())
m_ui->headerSuffixComboBox->addItem(suffix);
diff --git a/src/plugins/cpptools/cppprojectfile.cpp b/src/plugins/cpptools/cppprojectfile.cpp
index 4fa801606c..2df1a287c7 100644
--- a/src/plugins/cpptools/cppprojectfile.cpp
+++ b/src/plugins/cpptools/cppprojectfile.cpp
@@ -50,8 +50,7 @@ ProjectFile::Kind ProjectFile::classify(const QString &filePath)
if (isAmbiguousHeader(filePath))
return AmbiguousHeader;
- Utils::MimeDatabase mdb;
- const Utils::MimeType mimeType = mdb.mimeTypeForFile(filePath);
+ const Utils::MimeType mimeType = Utils::mimeTypeForFile(filePath);
if (!mimeType.isValid())
return Unsupported;
const QString mt = mimeType.name();
diff --git a/src/plugins/cpptools/cpptoolsplugin.cpp b/src/plugins/cpptools/cpptoolsplugin.cpp
index 84cdfff442..e8fe2145f2 100644
--- a/src/plugins/cpptools/cpptoolsplugin.cpp
+++ b/src/plugins/cpptools/cpptoolsplugin.cpp
@@ -275,25 +275,24 @@ static QStringList findFilesInProject(const QString &name,
// source belonging to a header and vice versa
static QStringList matchingCandidateSuffixes(ProjectFile::Kind kind)
{
- Utils::MimeDatabase mdb;
switch (kind) {
case ProjectFile::AmbiguousHeader:
case ProjectFile::CHeader:
case ProjectFile::CXXHeader:
case ProjectFile::ObjCHeader:
case ProjectFile::ObjCXXHeader:
- return mdb.mimeTypeForName(QLatin1String(Constants::C_SOURCE_MIMETYPE)).suffixes()
- + mdb.mimeTypeForName(QLatin1String(Constants::CPP_SOURCE_MIMETYPE)).suffixes()
- + mdb.mimeTypeForName(QLatin1String(Constants::OBJECTIVE_C_SOURCE_MIMETYPE)).suffixes()
- + mdb.mimeTypeForName(QLatin1String(Constants::OBJECTIVE_CPP_SOURCE_MIMETYPE)).suffixes();
+ return Utils::mimeTypeForName(QLatin1String(Constants::C_SOURCE_MIMETYPE)).suffixes()
+ + Utils::mimeTypeForName(QLatin1String(Constants::CPP_SOURCE_MIMETYPE)).suffixes()
+ + Utils::mimeTypeForName(QLatin1String(Constants::OBJECTIVE_C_SOURCE_MIMETYPE)).suffixes()
+ + Utils::mimeTypeForName(QLatin1String(Constants::OBJECTIVE_CPP_SOURCE_MIMETYPE)).suffixes();
case ProjectFile::CSource:
case ProjectFile::ObjCSource:
- return mdb.mimeTypeForName(QLatin1String(Constants::C_HEADER_MIMETYPE)).suffixes();
+ return Utils::mimeTypeForName(QLatin1String(Constants::C_HEADER_MIMETYPE)).suffixes();
case ProjectFile::CXXSource:
case ProjectFile::ObjCXXSource:
case ProjectFile::CudaSource:
case ProjectFile::OpenCLSource:
- return mdb.mimeTypeForName(QLatin1String(Constants::CPP_HEADER_MIMETYPE)).suffixes();
+ return Utils::mimeTypeForName(QLatin1String(Constants::CPP_HEADER_MIMETYPE)).suffixes();
default:
return QStringList();
}
diff --git a/src/plugins/debugger/disassembleragent.cpp b/src/plugins/debugger/disassembleragent.cpp
index b1d43ede8a..7e2b01b7bd 100644
--- a/src/plugins/debugger/disassembleragent.cpp
+++ b/src/plugins/debugger/disassembleragent.cpp
@@ -255,8 +255,7 @@ void DisassemblerAgentPrivate::configureMimeType()
document->setMimeType(mimeType);
- Utils::MimeDatabase mdb;
- Utils::MimeType mtype = mdb.mimeTypeForName(mimeType);
+ Utils::MimeType mtype = Utils::mimeTypeForName(mimeType);
if (mtype.isValid()) {
foreach (IEditor *editor, DocumentModel::editorsForDocument(document))
if (TextEditorWidget *widget = qobject_cast<TextEditorWidget *>(editor->widget()))
diff --git a/src/plugins/designer/cpp/formclasswizardpage.cpp b/src/plugins/designer/cpp/formclasswizardpage.cpp
index 1e27d7c98e..5a2d905b75 100644
--- a/src/plugins/designer/cpp/formclasswizardpage.cpp
+++ b/src/plugins/designer/cpp/formclasswizardpage.cpp
@@ -79,13 +79,10 @@ bool FormClassWizardPage::lowercaseHeaderFiles()
// Set up new class widget from settings
void FormClassWizardPage::initFileGenerationSettings()
{
- Utils::MimeDatabase mdb;
m_ui->newClassWidget->setHeaderExtension(
- mdb.mimeTypeForName(QLatin1String(CppTools::Constants::CPP_HEADER_MIMETYPE))
- .preferredSuffix());
+ Utils::mimeTypeForName(CppTools::Constants::CPP_HEADER_MIMETYPE).preferredSuffix());
m_ui->newClassWidget->setSourceExtension(
- mdb.mimeTypeForName(QLatin1String(CppTools::Constants::CPP_SOURCE_MIMETYPE))
- .preferredSuffix());
+ Utils::mimeTypeForName(CppTools::Constants::CPP_SOURCE_MIMETYPE).preferredSuffix());
m_ui->newClassWidget->setLowerCaseFiles(lowercaseHeaderFiles());
}
diff --git a/src/plugins/designer/formeditorplugin.cpp b/src/plugins/designer/formeditorplugin.cpp
index 4d0b66098d..4fe5fa0d30 100644
--- a/src/plugins/designer/formeditorplugin.cpp
+++ b/src/plugins/designer/formeditorplugin.cpp
@@ -157,19 +157,17 @@ static QString otherFile()
const QString current = currentFile();
if (current.isEmpty())
return QString();
- Utils::MimeDatabase mdb;
- const Utils::MimeType currentMimeType = mdb.mimeTypeForFile(current);
+ const Utils::MimeType currentMimeType = Utils::mimeTypeForFile(current);
if (!currentMimeType.isValid())
return QString();
// Determine potential suffixes of candidate files
// 'ui' -> 'cpp', 'cpp/h' -> 'ui'.
QStringList candidateSuffixes;
if (currentMimeType.matchesName(QLatin1String(FORM_MIMETYPE))) {
- candidateSuffixes += mdb.mimeTypeForName(
- QLatin1String(CppTools::Constants::CPP_SOURCE_MIMETYPE)).suffixes();
+ candidateSuffixes += Utils::mimeTypeForName(CppTools::Constants::CPP_SOURCE_MIMETYPE).suffixes();
} else if (currentMimeType.matchesName(QLatin1String(CppTools::Constants::CPP_SOURCE_MIMETYPE))
|| currentMimeType.matchesName(QLatin1String(CppTools::Constants::CPP_HEADER_MIMETYPE))) {
- candidateSuffixes += mdb.mimeTypeForName(QLatin1String(FORM_MIMETYPE)).suffixes();
+ candidateSuffixes += Utils::mimeTypeForName(FORM_MIMETYPE).suffixes();
} else {
return QString();
}
diff --git a/src/plugins/designer/qtcreatorintegration.cpp b/src/plugins/designer/qtcreatorintegration.cpp
index bcfa661ef3..5fb47eec52 100644
--- a/src/plugins/designer/qtcreatorintegration.cpp
+++ b/src/plugins/designer/qtcreatorintegration.cpp
@@ -624,7 +624,6 @@ bool QtCreatorIntegration::navigateToSlot(const QString &objectName,
void QtCreatorIntegration::slotSyncSettingsToDesigner()
{
// Set promotion-relevant parameters on integration.
- Utils::MimeDatabase mdb;
- setHeaderSuffix(mdb.mimeTypeForName(QLatin1String(CppTools::Constants::CPP_HEADER_MIMETYPE)).preferredSuffix());
+ setHeaderSuffix(Utils::mimeTypeForName(CppTools::Constants::CPP_HEADER_MIMETYPE).preferredSuffix());
setHeaderLowercase(FormClassWizardPage::lowercaseHeaderFiles());
}
diff --git a/src/plugins/genericprojectmanager/genericbuildconfiguration.cpp b/src/plugins/genericprojectmanager/genericbuildconfiguration.cpp
index 7c3e37e9db..1e2f38ea62 100644
--- a/src/plugins/genericprojectmanager/genericbuildconfiguration.cpp
+++ b/src/plugins/genericprojectmanager/genericbuildconfiguration.cpp
@@ -96,8 +96,7 @@ QList<BuildInfo *> GenericBuildConfigurationFactory::availableBuilds(const Targe
int GenericBuildConfigurationFactory::priority(const Kit *k, const QString &projectPath) const
{
- Utils::MimeDatabase mdb;
- if (k && mdb.mimeTypeForFile(projectPath).matchesName(QLatin1String(Constants::GENERICMIMETYPE)))
+ if (k && Utils::mimeTypeForFile(projectPath).matchesName(Constants::GENERICMIMETYPE))
return 0;
return -1;
}
diff --git a/src/plugins/genericprojectmanager/genericprojectwizard.cpp b/src/plugins/genericprojectmanager/genericprojectwizard.cpp
index 6db3ecce9f..f35eda0a9c 100644
--- a/src/plugins/genericprojectmanager/genericprojectwizard.cpp
+++ b/src/plugins/genericprojectmanager/genericprojectwizard.cpp
@@ -156,8 +156,7 @@ Core::GeneratedFiles GenericProjectWizard::generateFiles(const QWizard *w,
const QString configFileName = QFileInfo(dir, projectName + QLatin1String(".config")).absoluteFilePath();
const QStringList paths = Utils::transform(wizard->selectedPaths(), &Utils::FileName::toString);
- Utils::MimeDatabase mdb;
- Utils::MimeType headerTy = mdb.mimeTypeForName(QLatin1String("text/x-chdr"));
+ Utils::MimeType headerTy = Utils::mimeTypeForName(QLatin1String("text/x-chdr"));
QStringList nameFilters = headerTy.globPatterns();
diff --git a/src/plugins/imageviewer/imageviewerfile.cpp b/src/plugins/imageviewer/imageviewerfile.cpp
index 031ca999d4..bd0e1fa9eb 100644
--- a/src/plugins/imageviewer/imageviewerfile.cpp
+++ b/src/plugins/imageviewer/imageviewerfile.cpp
@@ -142,8 +142,7 @@ Core::IDocument::OpenResult ImageViewerFile::openImpl(QString *errorString, cons
}
setFilePath(Utils::FileName::fromString(fileName));
- Utils::MimeDatabase mdb;
- setMimeType(mdb.mimeTypeForFile(fileName).name());
+ setMimeType(Utils::mimeTypeForFile(fileName).name());
return OpenResult::Success;
}
diff --git a/src/plugins/modeleditor/modelindexer.cpp b/src/plugins/modeleditor/modelindexer.cpp
index eac685f433..049352b537 100644
--- a/src/plugins/modeleditor/modelindexer.cpp
+++ b/src/plugins/modeleditor/modelindexer.cpp
@@ -389,7 +389,7 @@ void ModelIndexer::scanProject(ProjectExplorer::Project *project)
foreach (const QString &file, files) {
QFileInfo fileInfo(file);
- Utils::MimeType mimeType = Utils::MimeDatabase().mimeTypeForFile(fileInfo);
+ Utils::MimeType mimeType = Utils::mimeTypeForFile(fileInfo);
if (mimeType.name() == QLatin1String(Constants::MIME_TYPE_MODEL)) {
QueuedFile queuedFile(file, project, fileInfo.lastModified());
filesQueue.append(queuedFile);
@@ -451,8 +451,7 @@ void ModelIndexer::scanProject(ProjectExplorer::Project *project)
QString ModelIndexer::findFirstModel(ProjectExplorer::FolderNode *folderNode)
{
foreach (ProjectExplorer::FileNode *fileNode, folderNode->fileNodes()) {
- Utils::MimeType mimeType = Utils::MimeDatabase().mimeTypeForFile(
- fileNode->filePath().toFileInfo());
+ Utils::MimeType mimeType = Utils::mimeTypeForFile(fileNode->filePath().toFileInfo());
if (mimeType.name() == QLatin1String(Constants::MIME_TYPE_MODEL))
return fileNode->filePath().toString();
}
diff --git a/src/plugins/nim/project/nimbuildconfigurationfactory.cpp b/src/plugins/nim/project/nimbuildconfigurationfactory.cpp
index 2459ebd8cc..ef2b882a07 100644
--- a/src/plugins/nim/project/nimbuildconfigurationfactory.cpp
+++ b/src/plugins/nim/project/nimbuildconfigurationfactory.cpp
@@ -166,8 +166,7 @@ BuildConfiguration *NimBuildConfigurationFactory::clone(Target *parent, BuildCon
int NimBuildConfigurationFactory::priority(const Kit *k, const QString &projectPath) const
{
- MimeDatabase mdb;
- if (k && mdb.mimeTypeForFile(projectPath).matchesName(Constants::C_NIM_PROJECT_MIMETYPE))
+ if (k && Utils::mimeTypeForFile(projectPath).matchesName(Constants::C_NIM_PROJECT_MIMETYPE))
return 0;
return -1;
}
diff --git a/src/plugins/projectexplorer/customwizard/customwizardparameters.cpp b/src/plugins/projectexplorer/customwizard/customwizardparameters.cpp
index f72e183295..010ade99f8 100644
--- a/src/plugins/projectexplorer/customwizard/customwizardparameters.cpp
+++ b/src/plugins/projectexplorer/customwizard/customwizardparameters.cpp
@@ -907,12 +907,11 @@ void CustomWizardContext::reset()
const QDate currentDate = QDate::currentDate();
const QTime currentTime = QTime::currentTime();
baseReplacements.clear();
- Utils::MimeDatabase mdb;
baseReplacements.insert(QLatin1String("CppSourceSuffix"),
- mdb.mimeTypeForName(QLatin1String(CppTools::Constants::CPP_SOURCE_MIMETYPE))
+ Utils::mimeTypeForName(QLatin1String(CppTools::Constants::CPP_SOURCE_MIMETYPE))
.preferredSuffix());
baseReplacements.insert(QLatin1String("CppHeaderSuffix"),
- mdb.mimeTypeForName(QLatin1String(CppTools::Constants::CPP_HEADER_MIMETYPE))
+ Utils::mimeTypeForName(QLatin1String(CppTools::Constants::CPP_HEADER_MIMETYPE))
.preferredSuffix());
baseReplacements.insert(QLatin1String("CurrentDate"),
currentDate.toString(Qt::ISODate));
diff --git a/src/plugins/projectexplorer/jsonwizard/jsonkitspage.cpp b/src/plugins/projectexplorer/jsonwizard/jsonkitspage.cpp
index 12e5d7556c..29e4f93020 100644
--- a/src/plugins/projectexplorer/jsonwizard/jsonkitspage.cpp
+++ b/src/plugins/projectexplorer/jsonwizard/jsonkitspage.cpp
@@ -112,8 +112,7 @@ void JsonKitsPage::setupProjectFiles(const JsonWizard::GeneratorFiles &files)
const QFileInfo fi(f.file.path());
const QString path = fi.absoluteFilePath();
- Utils::MimeDatabase mdb;
- Utils::MimeType mt = mdb.mimeTypeForFile(fi);
+ Utils::MimeType mt = Utils::mimeTypeForFile(fi);
if (!mt.isValid())
continue;
diff --git a/src/plugins/projectexplorer/jsonwizard/jsonwizardgeneratorfactory.cpp b/src/plugins/projectexplorer/jsonwizard/jsonwizardgeneratorfactory.cpp
index 79b29c8f7c..c58395d8a5 100644
--- a/src/plugins/projectexplorer/jsonwizard/jsonwizardgeneratorfactory.cpp
+++ b/src/plugins/projectexplorer/jsonwizard/jsonwizardgeneratorfactory.cpp
@@ -86,8 +86,7 @@ bool JsonWizardGenerator::formatFile(const JsonWizard *wizard, GeneratedFile *fi
if (file->isBinary() || file->contents().isEmpty())
return true; // nothing to do
- Utils::MimeDatabase mdb;
- Id languageId = TextEditorSettings::languageId(mdb.mimeTypeForFile(file->path()).name());
+ Id languageId = TextEditorSettings::languageId(Utils::mimeTypeForFile(file->path()).name());
if (!languageId.isValid())
return true; // don't modify files like *.ui, *.pro
diff --git a/src/plugins/projectexplorer/jsonwizard/jsonwizardscannergenerator.cpp b/src/plugins/projectexplorer/jsonwizard/jsonwizardscannergenerator.cpp
index 435ed37529..cf23511e34 100644
--- a/src/plugins/projectexplorer/jsonwizard/jsonwizardscannergenerator.cpp
+++ b/src/plugins/projectexplorer/jsonwizard/jsonwizardscannergenerator.cpp
@@ -87,7 +87,6 @@ Core::GeneratedFiles JsonWizardScannerGenerator::fileList(Utils::MacroExpander *
QDir project(projectDir);
Core::GeneratedFiles result;
- Utils::MimeDatabase mdb;
QRegularExpression binaryPattern;
if (!m_binaryPattern.isEmpty()) {
@@ -112,7 +111,7 @@ Core::GeneratedFiles JsonWizardScannerGenerator::fileList(Utils::MacroExpander *
const QString relPath = project.relativeFilePath(it->path());
it->setBinary(binaryPattern.match(relPath).hasMatch());
- Utils::MimeType mt = mdb.mimeTypeForFile(relPath);
+ Utils::MimeType mt = Utils::mimeTypeForFile(relPath);
if (mt.isValid()) {
bool found = Utils::anyOf(projectManagers, [mt](IProjectManager *m) {
return mt.matchesName(m->mimeType());
diff --git a/src/plugins/projectexplorer/projectexplorer.cpp b/src/plugins/projectexplorer/projectexplorer.cpp
index c8f906cd68..6c13bb6eb8 100644
--- a/src/plugins/projectexplorer/projectexplorer.cpp
+++ b/src/plugins/projectexplorer/projectexplorer.cpp
@@ -1473,12 +1473,11 @@ void ProjectExplorerPlugin::extensionsInitialized()
return nullptr;
});
- Utils::MimeDatabase mdb;
factory->addMimeType(QStringLiteral("inode/directory"));
foreach (IProjectManager *manager, projectManagers) {
const QString mimeType = manager->mimeType();
factory->addMimeType(mimeType);
- Utils::MimeType mime = mdb.mimeTypeForName(mimeType);
+ Utils::MimeType mime = Utils::mimeTypeForName(mimeType);
allGlobPatterns.append(mime.globPatterns());
filterStrings.append(mime.filterString());
@@ -1701,8 +1700,7 @@ ProjectExplorerPlugin::OpenProjectResult ProjectExplorerPlugin::openProjects(con
continue;
}
- Utils::MimeDatabase mdb;
- Utils::MimeType mt = mdb.mimeTypeForFile(fileName);
+ Utils::MimeType mt = Utils::mimeTypeForFile(fileName);
if (mt.isValid()) {
bool foundProjectManager = false;
foreach (IProjectManager *manager, projectManagers) {
@@ -1802,9 +1800,8 @@ void ProjectExplorerPluginPrivate::determineSessionToRestoreAtStartup()
QStringList ProjectExplorerPlugin::projectFileGlobs()
{
QStringList result;
- Utils::MimeDatabase mdb;
foreach (const IProjectManager *ipm, ExtensionSystem::PluginManager::getObjects<IProjectManager>()) {
- Utils::MimeType mimeType = mdb.mimeTypeForName(ipm->mimeType());
+ Utils::MimeType mimeType = Utils::mimeTypeForName(ipm->mimeType());
if (mimeType.isValid()) {
const QStringList patterns = mimeType.globPatterns();
if (!patterns.isEmpty())
@@ -3404,9 +3401,8 @@ ProjectExplorerSettings ProjectExplorerPlugin::projectExplorerSettings()
QStringList ProjectExplorerPlugin::projectFilePatterns()
{
QStringList patterns;
- Utils::MimeDatabase mdb;
foreach (const IProjectManager *pm, allProjectManagers()) {
- Utils::MimeType mt = mdb.mimeTypeForName(pm->mimeType());
+ Utils::MimeType mt = Utils::mimeTypeForName(pm->mimeType());
if (mt.isValid())
patterns.append(mt.globPatterns());
}
diff --git a/src/plugins/projectexplorer/projectfilewizardextension.cpp b/src/plugins/projectexplorer/projectfilewizardextension.cpp
index 79d5669d67..bc8a04382c 100644
--- a/src/plugins/projectexplorer/projectfilewizardextension.cpp
+++ b/src/plugins/projectexplorer/projectfilewizardextension.cpp
@@ -214,8 +214,7 @@ void ProjectFileWizardExtension::applyCodeStyle(GeneratedFile *file) const
if (file->isBinary() || file->contents().isEmpty())
return; // nothing to do
- Utils::MimeDatabase mdb;
- Id languageId = TextEditorSettings::languageId(mdb.mimeTypeForFile(file->path()).name());
+ Id languageId = TextEditorSettings::languageId(Utils::mimeTypeForFile(file->path()).name());
if (!languageId.isValid())
return; // don't modify files like *.ui *.pro
diff --git a/src/plugins/qbsprojectmanager/qbsbuildconfiguration.cpp b/src/plugins/qbsprojectmanager/qbsbuildconfiguration.cpp
index 0c6e9af025..9f9cd1f90d 100644
--- a/src/plugins/qbsprojectmanager/qbsbuildconfiguration.cpp
+++ b/src/plugins/qbsprojectmanager/qbsbuildconfiguration.cpp
@@ -377,8 +377,7 @@ QList<BuildInfo *> QbsBuildConfigurationFactory::availableBuilds(const Target *p
int QbsBuildConfigurationFactory::priority(const Kit *k, const QString &projectPath) const
{
- Utils::MimeDatabase mdb;
- if (k && mdb.mimeTypeForFile(projectPath).matchesName(QLatin1String(Constants::MIME_TYPE)))
+ if (k && Utils::mimeTypeForFile(projectPath).matchesName(Constants::MIME_TYPE))
return 0;
return -1;
}
diff --git a/src/plugins/qmakeprojectmanager/qmakebuildconfiguration.cpp b/src/plugins/qmakeprojectmanager/qmakebuildconfiguration.cpp
index da72d79093..14609144f3 100644
--- a/src/plugins/qmakeprojectmanager/qmakebuildconfiguration.cpp
+++ b/src/plugins/qmakeprojectmanager/qmakebuildconfiguration.cpp
@@ -628,8 +628,7 @@ QList<BuildInfo *> QmakeBuildConfigurationFactory::availableBuilds(const Target
int QmakeBuildConfigurationFactory::priority(const Kit *k, const QString &projectPath) const
{
- MimeDatabase mdb;
- if (k && mdb.mimeTypeForFile(projectPath).matchesName(QLatin1String(Constants::PROFILE_MIMETYPE)))
+ if (k && Utils::mimeTypeForFile(projectPath).matchesName(Constants::PROFILE_MIMETYPE))
return 0;
return -1;
}
diff --git a/src/plugins/qmakeprojectmanager/qmakeparsernodes.cpp b/src/plugins/qmakeprojectmanager/qmakeparsernodes.cpp
index e7f38f0e4e..8b555df827 100644
--- a/src/plugins/qmakeprojectmanager/qmakeparsernodes.cpp
+++ b/src/plugins/qmakeprojectmanager/qmakeparsernodes.cpp
@@ -511,9 +511,8 @@ bool QmakePriFile::addFiles(const QStringList &filePaths, QStringList *notAdded)
typedef QMap<QString, QStringList> TypeFileMap;
// Split into lists by file type and bulk-add them.
TypeFileMap typeFileMap;
- Utils::MimeDatabase mdb;
foreach (const QString &file, filePaths) {
- const Utils::MimeType mt = mdb.mimeTypeForFile(file);
+ const Utils::MimeType mt = Utils::mimeTypeForFile(file);
typeFileMap[mt.name()] << file;
}
@@ -559,9 +558,8 @@ bool QmakePriFile::removeFiles(const QStringList &filePaths,
typedef QMap<QString, QStringList> TypeFileMap;
// Split into lists by file type and bulk-add them.
TypeFileMap typeFileMap;
- Utils::MimeDatabase mdb;
foreach (const QString &file, filePaths) {
- const Utils::MimeType mt = mdb.mimeTypeForFile(file);
+ const Utils::MimeType mt = Utils::mimeTypeForFile(file);
typeFileMap[mt.name()] << file;
}
foreach (const QString &type, typeFileMap.keys()) {
@@ -587,9 +585,8 @@ bool QmakePriFile::canRenameFile(const QString &filePath, const QString &newFile
bool changeProFileOptional = deploysFolder(QFileInfo(filePath).absolutePath());
if (changeProFileOptional)
return true;
- Utils::MimeDatabase mdb;
- const Utils::MimeType mt = mdb.mimeTypeForFile(newFilePath);
+ const Utils::MimeType mt = Utils::mimeTypeForFile(newFilePath);
return renameFile(filePath, newFilePath, mt.name(), Change::TestOnly);
}
@@ -599,8 +596,7 @@ bool QmakePriFile::renameFile(const QString &filePath, const QString &newFilePat
return false;
bool changeProFileOptional = deploysFolder(QFileInfo(filePath).absolutePath());
- Utils::MimeDatabase mdb;
- const Utils::MimeType mt = mdb.mimeTypeForFile(newFilePath);
+ const Utils::MimeType mt = Utils::mimeTypeForFile(newFilePath);
if (renameFile(filePath, newFilePath, mt.name()))
return true;
diff --git a/src/plugins/qmakeprojectmanager/wizards/simpleprojectwizard.cpp b/src/plugins/qmakeprojectmanager/wizards/simpleprojectwizard.cpp
index 6725779e43..7dc6f129f1 100644
--- a/src/plugins/qmakeprojectmanager/wizards/simpleprojectwizard.cpp
+++ b/src/plugins/qmakeprojectmanager/wizards/simpleprojectwizard.cpp
@@ -173,8 +173,7 @@ GeneratedFiles SimpleProjectWizard::generateFiles(const QWizard *w,
const QString proFileName = QFileInfo(dir, projectName + ".pro").absoluteFilePath();
const QStringList paths = Utils::transform(wizard->selectedPaths(), &FileName::toString);
- MimeDatabase mdb;
- MimeType headerType = mdb.mimeTypeForName("text/x-chdr");
+ MimeType headerType = Utils::mimeTypeForName("text/x-chdr");
QStringList nameFilters = headerType.globPatterns();
@@ -194,7 +193,7 @@ GeneratedFiles SimpleProjectWizard::generateFiles(const QWizard *w,
for (const FileName &fileName : wizard->selectedFiles()) {
QString source = dir.relativeFilePath(fileName.toString());
- MimeType mimeType = mdb.mimeTypeForFile(fileName.toFileInfo());
+ MimeType mimeType = Utils::mimeTypeForFile(fileName.toFileInfo());
if (mimeType.matchesName("text/x-chdr") || mimeType.matchesName("text/x-c++hdr"))
proHeaders += " $$PWD/" + source + " \\\n";
else
diff --git a/src/plugins/qmljstools/qmljsmodelmanager.cpp b/src/plugins/qmljstools/qmljsmodelmanager.cpp
index 16d1503879..cfbde13308 100644
--- a/src/plugins/qmljstools/qmljsmodelmanager.cpp
+++ b/src/plugins/qmljstools/qmljsmodelmanager.cpp
@@ -76,7 +76,6 @@ ModelManagerInterface::ProjectInfo ModelManager::defaultProjectInfoForProject(
ModelManagerInterface::ProjectInfo projectInfo(project);
Target *activeTarget = 0;
if (project) {
- MimeDatabase mdb;
QSet<QString> qmlTypeNames;
qmlTypeNames << QLatin1String(Constants::QML_MIMETYPE)
<< QLatin1String(Constants::QBS_MIMETYPE)
@@ -84,8 +83,8 @@ ModelManagerInterface::ProjectInfo ModelManager::defaultProjectInfoForProject(
<< QLatin1String(Constants::QMLTYPES_MIMETYPE)
<< QLatin1String(Constants::QMLUI_MIMETYPE);
foreach (const QString &filePath, project->files(Project::SourceFiles)) {
- if (qmlTypeNames.contains(mdb.mimeTypeForFile(
- filePath, MimeDatabase::MatchExtension).name())) {
+ if (qmlTypeNames.contains(Utils::mimeTypeForFile(
+ filePath, MimeMatchMode::MatchExtension).name())) {
projectInfo.sourceFiles << filePath;
}
}
@@ -174,23 +173,22 @@ QHash<QString,Dialect> ModelManager::initLanguageForSuffix() const
QHash<QString,Dialect> res = ModelManagerInterface::languageForSuffix();
if (ICore::instance()) {
- MimeDatabase mdb;
- MimeType jsSourceTy = mdb.mimeTypeForName(QLatin1String(Constants::JS_MIMETYPE));
+ MimeType jsSourceTy = Utils::mimeTypeForName(Constants::JS_MIMETYPE);
foreach (const QString &suffix, jsSourceTy.suffixes())
res[suffix] = Dialect::JavaScript;
- MimeType qmlSourceTy = mdb.mimeTypeForName(QLatin1String(Constants::QML_MIMETYPE));
+ MimeType qmlSourceTy = Utils::mimeTypeForName(Constants::QML_MIMETYPE);
foreach (const QString &suffix, qmlSourceTy.suffixes())
res[suffix] = Dialect::Qml;
- MimeType qbsSourceTy = mdb.mimeTypeForName(QLatin1String(Constants::QBS_MIMETYPE));
+ MimeType qbsSourceTy = Utils::mimeTypeForName(Constants::QBS_MIMETYPE);
foreach (const QString &suffix, qbsSourceTy.suffixes())
res[suffix] = Dialect::QmlQbs;
- MimeType qmlProjectSourceTy = mdb.mimeTypeForName(QLatin1String(Constants::QMLPROJECT_MIMETYPE));
+ MimeType qmlProjectSourceTy = Utils::mimeTypeForName(Constants::QMLPROJECT_MIMETYPE);
foreach (const QString &suffix, qmlProjectSourceTy.suffixes())
res[suffix] = Dialect::QmlProject;
- MimeType qmlUiSourceTy = mdb.mimeTypeForName(QLatin1String(Constants::QMLUI_MIMETYPE));
+ MimeType qmlUiSourceTy = Utils::mimeTypeForName(Constants::QMLUI_MIMETYPE);
foreach (const QString &suffix, qmlUiSourceTy.suffixes())
res[suffix] = Dialect::QmlQtQuick2Ui;
- MimeType jsonSourceTy = mdb.mimeTypeForName(QLatin1String(Constants::JSON_MIMETYPE));
+ MimeType jsonSourceTy = Utils::mimeTypeForName(Constants::JSON_MIMETYPE);
foreach (const QString &suffix, jsonSourceTy.suffixes())
res[suffix] = Dialect::Json;
}
diff --git a/src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp b/src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp
index 81f88e365a..1c2e77fb04 100644
--- a/src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp
+++ b/src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp
@@ -265,9 +265,8 @@ void QmlProjectRunConfiguration::updateEnabled()
{
bool qmlFileFound = false;
if (mainScriptSource() == FileInEditor) {
- Utils::MimeDatabase mimeDataBase;
IDocument *document = EditorManager::currentDocument();
- Utils::MimeType mainScriptMimeType = mimeDataBase.mimeTypeForFile(mainScript());
+ Utils::MimeType mainScriptMimeType = Utils::mimeTypeForFile(mainScript());
if (document) {
m_currentFileFilename = document->filePath().toString();
if (mainScriptMimeType.matchesName(QLatin1String(ProjectExplorer::Constants::QML_MIMETYPE)))
@@ -281,7 +280,7 @@ void QmlProjectRunConfiguration::updateEnabled()
const QFileInfo fi(filename);
if (!filename.isEmpty() && fi.baseName()[0].isLower()
- && mimeDataBase.mimeTypeForFile(fi).matchesName(QLatin1String(ProjectExplorer::Constants::QML_MIMETYPE)))
+ && Utils::mimeTypeForFile(fi).matchesName(QLatin1String(ProjectExplorer::Constants::QML_MIMETYPE)))
{
m_currentFileFilename = filename;
qmlFileFound = true;
diff --git a/src/plugins/resourceeditor/resourcenode.cpp b/src/plugins/resourceeditor/resourcenode.cpp
index 2c37480812..ae505537a6 100644
--- a/src/plugins/resourceeditor/resourcenode.cpp
+++ b/src/plugins/resourceeditor/resourcenode.cpp
@@ -48,8 +48,7 @@ static bool hasPriority(const QStringList &files)
{
if (files.isEmpty())
return false;
- Utils::MimeDatabase mdb;
- QString type = mdb.mimeTypeForFile(files.at(0)).name();
+ QString type = Utils::mimeTypeForFile(files.at(0)).name();
if (type.startsWith(QLatin1String("image/"))
|| type == QLatin1String(QmlJSTools::Constants::QML_MIMETYPE)
|| type == QLatin1String(QmlJSTools::Constants::JS_MIMETYPE))
diff --git a/src/plugins/texteditor/generichighlighter/manager.cpp b/src/plugins/texteditor/generichighlighter/manager.cpp
index 6dcee88bed..0cd730a168 100644
--- a/src/plugins/texteditor/generichighlighter/manager.cpp
+++ b/src/plugins/texteditor/generichighlighter/manager.cpp
@@ -149,7 +149,6 @@ static bool matchesPattern(const QString &fileName, DefinitionMetaDataPtr metaDa
QString Manager::definitionIdByMimeType(const Utils::MimeType &mimeType) const
{
- Utils::MimeDatabase mdb;
QList<Utils::MimeType> queue;
queue.append(mimeType);
while (!queue.isEmpty()) {
@@ -158,7 +157,7 @@ QString Manager::definitionIdByMimeType(const Utils::MimeType &mimeType) const
if (!id.isEmpty())
return id;
foreach (const QString &parent, mt.parentMimeTypes()) {
- const Utils::MimeType parentMt = mdb.mimeTypeForName(parent);
+ const Utils::MimeType parentMt = Utils::mimeTypeForName(parent);
if (parentMt.isValid())
queue.append(parentMt);
}
diff --git a/src/plugins/texteditor/textdocument.cpp b/src/plugins/texteditor/textdocument.cpp
index 7c1e3157ab..a6280978f7 100644
--- a/src/plugins/texteditor/textdocument.cpp
+++ b/src/plugins/texteditor/textdocument.cpp
@@ -614,8 +614,7 @@ Core::IDocument::OpenResult TextDocument::open(QString *errorString, const QStri
emit aboutToOpen(fileName, realFileName);
OpenResult success = openImpl(errorString, fileName, realFileName, /*reload =*/ false);
if (success == OpenResult::Success) {
- Utils::MimeDatabase mdb;
- setMimeType(mdb.mimeTypeForFile(fileName).name());
+ setMimeType(Utils::mimeTypeForFile(fileName).name());
emit openFinishedSuccessfully();
}
return success;
diff --git a/src/plugins/texteditor/texteditor.cpp b/src/plugins/texteditor/texteditor.cpp
index 93037d992e..2f57598ae2 100644
--- a/src/plugins/texteditor/texteditor.cpp
+++ b/src/plugins/texteditor/texteditor.cpp
@@ -2814,8 +2814,7 @@ void TextEditorWidgetPrivate::updateCodeFoldingVisible()
void TextEditorWidgetPrivate::reconfigure()
{
- Utils::MimeDatabase mdb;
- m_document->setMimeType(mdb.mimeTypeForFile(m_document->filePath().toString()).name());
+ m_document->setMimeType(Utils::mimeTypeForFile(m_document->filePath().toString()).name());
q->configureGenericHighlighter();
}
@@ -7660,8 +7659,7 @@ void TextEditorWidget::configureGenericHighlighter()
setCodeFoldingSupported(false);
const QString type = textDocument()->mimeType();
- Utils::MimeDatabase mdb;
- const Utils::MimeType mimeType = mdb.mimeTypeForName(type);
+ const MimeType mimeType = Utils::mimeTypeForName(type);
if (mimeType.isValid()) {
d->m_isMissingSyntaxDefinition = true;