diff --git a/src/plugins/coreplugin/coreplugin.cpp b/src/plugins/coreplugin/coreplugin.cpp index 4090601a4c0..1c1241b4cdc 100644 --- a/src/plugins/coreplugin/coreplugin.cpp +++ b/src/plugins/coreplugin/coreplugin.cpp @@ -106,7 +106,7 @@ bool CorePlugin::initialize(const QStringList &arguments, QString *errorMessage) void CorePlugin::extensionsInitialized() { - m_mainWindow->mimeDatabase()->syncUserModifiedMimeTypes(); + MimeDatabase::syncUserModifiedMimeTypes(); if (m_designMode->designModeIsRequired()) addObject(m_designMode); m_mainWindow->extensionsInitialized(); diff --git a/src/plugins/coreplugin/mainwindow.cpp b/src/plugins/coreplugin/mainwindow.cpp index fb9d28ca8f1..cb62e48e627 100644 --- a/src/plugins/coreplugin/mainwindow.cpp +++ b/src/plugins/coreplugin/mainwindow.cpp @@ -312,7 +312,7 @@ bool MainWindow::init(QString *errorMessage) { Q_UNUSED(errorMessage) - if (!mimeDatabase()->addMimeTypes(QLatin1String(":/core/editormanager/BinFiles.mimetypes.xml"), errorMessage)) + if (!MimeDatabase::addMimeTypes(QLatin1String(":/core/editormanager/BinFiles.mimetypes.xml"), errorMessage)) return false; ExtensionSystem::PluginManager::addObject(m_coreImpl); @@ -805,10 +805,9 @@ static QList getNonEditorDocumentFactories() } static IDocumentFactory *findDocumentFactory(const QList &fileFactories, - const MimeDatabase *db, const QFileInfo &fi) { - if (const MimeType mt = db->findByFile(fi)) { + if (const MimeType mt = MimeDatabase::findByFile(fi)) { const QString type = mt.type(); foreach (IDocumentFactory *factory, fileFactories) { if (factory->mimeTypes().contains(type)) @@ -836,7 +835,7 @@ IDocument *MainWindow::openFiles(const QStringList &fileNames, ICore::OpenFilesF foreach (const QString &fileName, fileNames) { const QFileInfo fi(fileName); const QString absoluteFilePath = fi.absoluteFilePath(); - if (IDocumentFactory *documentFactory = findDocumentFactory(nonEditorFileFactories, mimeDatabase(), fi)) { + if (IDocumentFactory *documentFactory = findDocumentFactory(nonEditorFileFactories, fi)) { IDocument *document = documentFactory->open(absoluteFilePath); if (!document) { if (flags & ICore::StopOnLoadFail) @@ -953,11 +952,6 @@ void MainWindow::openFileWith() } } -VcsManager *MainWindow::vcsManager() const -{ - return m_vcsManager; -} - QSettings *MainWindow::settings(QSettings::Scope scope) const { if (scope == QSettings::UserScope) @@ -966,11 +960,6 @@ QSettings *MainWindow::settings(QSettings::Scope scope) const return m_globalSettings; } -MimeDatabase *MainWindow::mimeDatabase() const -{ - return m_mimeDatabase; -} - IContext *MainWindow::contextObject(QWidget *widget) { return m_contextWidgets.value(widget); diff --git a/src/plugins/coreplugin/mainwindow.h b/src/plugins/coreplugin/mainwindow.h index ce097cdff5c..8c7f0b1290e 100644 --- a/src/plugins/coreplugin/mainwindow.h +++ b/src/plugins/coreplugin/mainwindow.h @@ -96,9 +96,6 @@ public: Core::IDocument *openFiles(const QStringList &fileNames, ICore::OpenFilesFlags flags); - Core::MimeDatabase *mimeDatabase() const; - - VcsManager *vcsManager() const; QSettings *settings(QSettings::Scope scope) const; inline SettingsDatabase *settingsDatabase() const { return m_settingsDatabase; } virtual QPrinter *printer() const;