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

Adjust to Analyzer core changes

Browse Source 
Change-Id: I2985b1be505f9aa43f2a8615a8dfcafaeb991e21
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
This commit is contained in:
André Pönitz
2015-02-20 10:05:44 +01:00
committed by Andre Poenitz
parent 4495ab283c
commit 6ac1dc95fd
3 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
plugins/clangstaticanalyzer/clangstaticanalyzerplugin.cpp
View File

@@ -129,7 +129,6 @@ bool ClangStaticAnalyzerPlugin::initializeEnterpriseFeatures(const QStringList &
addAutoReleasedObject(new ClangStaticAnalyzerRunControlFactory(m_analyzerTool)); addAutoReleasedObject(new ClangStaticAnalyzerRunControlFactory(m_analyzerTool));
addAutoReleasedObject(new ClangStaticAnalyzerOptionsPage); addAutoReleasedObject(new ClangStaticAnalyzerOptionsPage);
auto toolStarter = [tool](StartMode mode) { return tool->startTool(mode); };
auto widgetCreator = [tool] { return tool->createWidgets(); }; auto widgetCreator = [tool] { return tool->createWidgets(); };
auto runControlCreator = [tool](const AnalyzerStartParameters &sp, auto runControlCreator = [tool](const AnalyzerStartParameters &sp,
ProjectExplorer::RunConfiguration *runConfiguration) { ProjectExplorer::RunConfiguration *runConfiguration) {
@@ -145,7 +144,7 @@ bool ClangStaticAnalyzerPlugin::initializeEnterpriseFeatures(const QStringList &
action->setActionId("ClangStaticAnalyzer"); action->setActionId("ClangStaticAnalyzer");
action->setWidgetCreator(widgetCreator); action->setWidgetCreator(widgetCreator);
action->setRunControlCreator(runControlCreator); action->setRunControlCreator(runControlCreator);
action->setToolStarter(toolStarter); action->setToolStarter([tool] { tool->startTool(); });
action->setText(tr("Clang Static Analyzer")); action->setText(tr("Clang Static Analyzer"));
action->setToolTip(toolTip); action->setToolTip(toolTip);
action->setMenuGroup(Constants::G_ANALYZER_TOOLS); action->setMenuGroup(Constants::G_ANALYZER_TOOLS);

4
plugins/clangstaticanalyzer/clangstaticanalyzertool.cpp
View File

@@ -191,10 +191,8 @@ static bool dontStartAfterHintForDebugMode()
return false; return false;
} }
void ClangStaticAnalyzerTool::startTool(StartMode mode) void ClangStaticAnalyzerTool::startTool()
{ {
QTC_ASSERT(mode == Analyzer::StartLocal, return);
AnalyzerManager::showMode(); AnalyzerManager::showMode();
if (dontStartAfterHintForDebugMode()) if (dontStartAfterHintForDebugMode())

2
plugins/clangstaticanalyzer/clangstaticanalyzertool.h
View File

@@ -49,7 +49,7 @@ public:
QWidget *createWidgets(); QWidget *createWidgets();
Analyzer::AnalyzerRunControl *createRunControl(const Analyzer::AnalyzerStartParameters &sp, Analyzer::AnalyzerRunControl *createRunControl(const Analyzer::AnalyzerStartParameters &sp,
ProjectExplorer::RunConfiguration *runConfiguration); ProjectExplorer::RunConfiguration *runConfiguration);
void startTool(Analyzer::StartMode mode); void startTool();
signals: signals:
void finished(); // For testing. void finished(); // For testing.