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

Mainwindow: Remove accessors for mimedatabase and vcsmanager

Browse Source 
Fix fallout of those changes.

Change-Id: Ie90a8d3a9eb0a171ea5b4036f99298badf0302fc
Reviewed-by: hjk <hjk121@nokiamail.com>
This commit is contained in:
Tobias Hunger
2013-09-03 11:57:37 +02:00
committed by hjk
parent 451637a697
commit acd5e135f1
3 changed files with 4 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -106,7 +106,7 @@ bool CorePlugin::initialize(const QStringList &arguments, QString *errorMessage)
void CorePlugin::extensionsInitialized() void CorePlugin::extensionsInitialized()
{ {
m_mainWindow->mimeDatabase()->syncUserModifiedMimeTypes(); MimeDatabase::syncUserModifiedMimeTypes();
if (m_designMode->designModeIsRequired()) if (m_designMode->designModeIsRequired())
addObject(m_designMode); addObject(m_designMode);
m_mainWindow->extensionsInitialized(); m_mainWindow->extensionsInitialized();

17
src/plugins/coreplugin/mainwindow.cpp
View File

@@ -312,7 +312,7 @@ bool MainWindow::init(QString *errorMessage)
{ {
Q_UNUSED(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; return false;
ExtensionSystem::PluginManager::addObject(m_coreImpl); ExtensionSystem::PluginManager::addObject(m_coreImpl);
@@ -805,10 +805,9 @@ static QList<IDocumentFactory*> getNonEditorDocumentFactories()
} }
static IDocumentFactory *findDocumentFactory(const QList<IDocumentFactory*> &fileFactories, static IDocumentFactory *findDocumentFactory(const QList<IDocumentFactory*> &fileFactories,
const MimeDatabase *db,
const QFileInfo &fi) const QFileInfo &fi)
{ {
if (const MimeType mt = db->findByFile(fi)) { if (const MimeType mt = MimeDatabase::findByFile(fi)) {
const QString type = mt.type(); const QString type = mt.type();
foreach (IDocumentFactory *factory, fileFactories) { foreach (IDocumentFactory *factory, fileFactories) {
if (factory->mimeTypes().contains(type)) if (factory->mimeTypes().contains(type))
@@ -836,7 +835,7 @@ IDocument *MainWindow::openFiles(const QStringList &fileNames, ICore::OpenFilesF
foreach (const QString &fileName, fileNames) { foreach (const QString &fileName, fileNames) {
const QFileInfo fi(fileName); const QFileInfo fi(fileName);
const QString absoluteFilePath = fi.absoluteFilePath(); const QString absoluteFilePath = fi.absoluteFilePath();
if (IDocumentFactory *documentFactory = findDocumentFactory(nonEditorFileFactories, mimeDatabase(), fi)) { if (IDocumentFactory *documentFactory = findDocumentFactory(nonEditorFileFactories, fi)) {
IDocument *document = documentFactory->open(absoluteFilePath); IDocument *document = documentFactory->open(absoluteFilePath);
if (!document) { if (!document) {
if (flags & ICore::StopOnLoadFail) 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 QSettings *MainWindow::settings(QSettings::Scope scope) const
{ {
if (scope == QSettings::UserScope) if (scope == QSettings::UserScope)
@@ -966,11 +960,6 @@ QSettings *MainWindow::settings(QSettings::Scope scope) const
return m_globalSettings; return m_globalSettings;
} }
MimeDatabase *MainWindow::mimeDatabase() const
{
return m_mimeDatabase;
}
IContext *MainWindow::contextObject(QWidget *widget) IContext *MainWindow::contextObject(QWidget *widget)
{ {
return m_contextWidgets.value(widget); return m_contextWidgets.value(widget);

3
src/plugins/coreplugin/mainwindow.h
View File

@@ -96,9 +96,6 @@ public:
Core::IDocument *openFiles(const QStringList &fileNames, ICore::OpenFilesFlags flags); Core::IDocument *openFiles(const QStringList &fileNames, ICore::OpenFilesFlags flags);
Core::MimeDatabase *mimeDatabase() const;
VcsManager *vcsManager() const;
QSettings *settings(QSettings::Scope scope) const; QSettings *settings(QSettings::Scope scope) const;
inline SettingsDatabase *settingsDatabase() const { return m_settingsDatabase; } inline SettingsDatabase *settingsDatabase() const { return m_settingsDatabase; }
virtual QPrinter *printer() const; virtual QPrinter *printer() const;