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

Core: Remove settings accessor indirection via MainWindow

Browse Source 
Change-Id: I2ece1fb47eb48c4e56561ed2c947dc1c997af344
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
This commit is contained in:
hjk
2014-03-04 16:07:44 +01:00
parent 3affbed2b6
commit 7f76ef3b18
3 changed files with 35 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/coreplugin/icore.cpp
View File

@@ -298,6 +298,7 @@
#include <QStatusBar>
using namespace Core::Internal;
using namespace ExtensionSystem;
namespace Core {
@@ -356,7 +357,10 @@ bool ICore::showWarningWithOptions(const QString &title, const QString &text,
QSettings *ICore::settings(QSettings::Scope scope)
{
return m_mainwindow->settings(scope);
if (scope == QSettings::UserScope)
return PluginManager::settings();
else
return PluginManager::globalSettings();
}
SettingsDatabase *ICore::settingsDatabase()