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

Utils: Wrap MimeDatabase into static functions

Browse Source 
To avoid repeating the 'MimeDatabase mdb; mdb.something(); ' mantra
all over the place.

Change-Id: I4bfef62e73275a991455141671d6071162788e9d
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
hjk
2017-03-02 12:07:11 +01:00
parent 2cd8378148
commit 3f5caf4cdc
51 changed files with 238 additions and 245 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/libs/extensionsystem/pluginmanager.cpp
View File

@@ -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);