diff options
author | hjk <hjk121@nokiamail.com> | 2014-09-04 13:48:44 +0200 |
---|---|---|
committer | hjk <hjk121@nokiamail.com> | 2014-09-04 15:57:44 +0200 |
commit | 50e951dcb4a421d94e387fb91d527a9ba4bbce00 (patch) | |
tree | f3948529fa4bb3ac5c8125bea4ad7eb25f1f7a5d /src/plugins/analyzerbase/analyzermanager.cpp | |
parent | 3df7f9498ae9044cd08e5b2b4bb0afba04fb4d65 (diff) | |
download | qt-creator-50e951dcb4a421d94e387fb91d527a9ba4bbce00.tar.gz |
ProjectExplorer: Streamline the canRun(Project) functions
There's no real need to go through the chain of decisions
a second time to retrieve a message.
Change-Id: Id32ee486a7555f8eaf38668f23ec8fb2e179db89
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Diffstat (limited to 'src/plugins/analyzerbase/analyzermanager.cpp')
-rw-r--r-- | src/plugins/analyzerbase/analyzermanager.cpp | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/src/plugins/analyzerbase/analyzermanager.cpp b/src/plugins/analyzerbase/analyzermanager.cpp index 0de28c728d..45089c6068 100644 --- a/src/plugins/analyzerbase/analyzermanager.cpp +++ b/src/plugins/analyzerbase/analyzermanager.cpp @@ -419,8 +419,7 @@ bool AnalyzerManagerPrivate::isActionRunnable(AnalyzerAction *action) const if (action->startMode() == StartRemote) return true; - ProjectExplorerPlugin *pe = ProjectExplorerPlugin::instance(); - return pe->canRun(SessionManager::startupProject(), action->tool()->runMode()); + return ProjectExplorerPlugin::canRun(SessionManager::startupProject(), action->tool()->runMode(), 0); } void AnalyzerManagerPrivate::startTool() @@ -572,16 +571,14 @@ void AnalyzerManagerPrivate::saveToolSettings(AnalyzerAction *action) void AnalyzerManagerPrivate::updateRunActions() { - ProjectExplorerPlugin *pe = ProjectExplorerPlugin::instance(); - Project *project = SessionManager::startupProject(); - QString disabledReason; if (m_isRunning) disabledReason = tr("An analysis is still in progress."); else if (!m_currentAction) disabledReason = tr("No analyzer tool selected."); else - disabledReason = pe->cannotRunReason(project, m_currentAction->tool()->runMode()); + ProjectExplorerPlugin::canRun(SessionManager::startupProject(), + m_currentAction->tool()->runMode(), &disabledReason); m_startAction->setEnabled(isActionRunnable(m_currentAction)); m_startAction->setToolTip(disabledReason); |