diff options
Diffstat (limited to 'src/plugins/coreplugin/toolsettings.cpp')
| -rw-r--r-- | src/plugins/coreplugin/toolsettings.cpp | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/plugins/coreplugin/toolsettings.cpp b/src/plugins/coreplugin/toolsettings.cpp index 672bc6593f..84b13024b3 100644 --- a/src/plugins/coreplugin/toolsettings.cpp +++ b/src/plugins/coreplugin/toolsettings.cpp @@ -64,13 +64,12 @@ bool ToolSettings::matches(const QString & searchKeyWord) const QWidget *ToolSettings::createPage(QWidget *parent) { m_widget = new ExternalToolConfig(parent); - m_widget->setTools(ExternalToolManager::instance()->toolsByCategory()); + m_widget->setTools(ExternalToolManager::toolsByCategory()); if (m_searchKeywords.isEmpty()) m_searchKeywords = m_widget->searchKeywords(); return m_widget; } - static QString getUserFilePath(const QString &proposalFileName) { QDir resourceDir(ICore::userResourcePath()); @@ -132,7 +131,7 @@ void ToolSettings::apply() if (!m_widget) return; m_widget->apply(); - QMap<QString, ExternalTool *> originalTools = ExternalToolManager::instance()->toolsById(); + QMap<QString, ExternalTool *> originalTools = ExternalToolManager::toolsById(); QMap<QString, QList<ExternalTool *> > newToolsMap = m_widget->tools(); QMap<QString, QList<ExternalTool *> > resultMap; QMapIterator<QString, QList<ExternalTool *> > it(newToolsMap); @@ -202,10 +201,9 @@ void ToolSettings::apply() QFile::remove(tool->fileName()); } - ExternalToolManager::instance()->setToolsByCategory(resultMap); + ExternalToolManager::setToolsByCategory(resultMap); } - void ToolSettings::finish() { } |