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

Adapt to upstream analyzer changes

Browse Source 
Change-Id: I541aeb4de35ec89146721ef017d6a58f0a1911a9
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
This commit is contained in:
hjk
2016-01-20 10:55:34 +01:00
parent e775ff3049
commit 1386ff6443
6 changed files with 15 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
plugins/clangstaticanalyzer/clangstaticanalyzerplugin.cpp
View File

@@ -132,15 +132,15 @@ bool ClangStaticAnalyzerPlugin::initializeEnterpriseFeatures(const QStringList &
addAutoReleasedObject(new ClangStaticAnalyzerOptionsPage); addAutoReleasedObject(new ClangStaticAnalyzerOptionsPage);
auto widgetCreator = [tool] { return tool->createWidgets(); }; auto widgetCreator = [tool] { return tool->createWidgets(); };
auto runControlCreator = [tool](const AnalyzerStartParameters &sp, auto runControlCreator = [tool](const AnalyzerStartParameters &,
ProjectExplorer::RunConfiguration *runConfiguration, Core::Id runMode) { ProjectExplorer::RunConfiguration *runConfiguration, Core::Id runMode) {
return tool->createRunControl(sp, runConfiguration, runMode); return tool->createRunControl(runConfiguration, runMode);
}; };
const QString toolTip = tr("Clang Static Analyzer uses the analyzer from the clang project " const QString toolTip = tr("Clang Static Analyzer uses the analyzer from the clang project "
"to find bugs."); "to find bugs.");
AnalyzerAction *action = new AnalyzerAction(this); auto action = new AnalyzerAction(this);
action->setRunMode(Constants::CLANGSTATICANALYZER_RUN_MODE); action->setRunMode(Constants::CLANGSTATICANALYZER_RUN_MODE);
action->setToolId(ClangStaticAnalyzerToolId); action->setToolId(ClangStaticAnalyzerToolId);
action->setActionId("ClangStaticAnalyzer"); action->setActionId("ClangStaticAnalyzer");

3
plugins/clangstaticanalyzer/clangstaticanalyzerruncontrol.cpp
View File

@@ -66,11 +66,10 @@ namespace ClangStaticAnalyzer {
namespace Internal { namespace Internal {
ClangStaticAnalyzerRunControl::ClangStaticAnalyzerRunControl( ClangStaticAnalyzerRunControl::ClangStaticAnalyzerRunControl(
const Analyzer::AnalyzerStartParameters &startParams,
RunConfiguration *runConfiguration, RunConfiguration *runConfiguration,
Core::Id runMode, Core::Id runMode,
const ProjectInfo &projectInfo) const ProjectInfo &projectInfo)
: AnalyzerRunControl(startParams, runConfiguration, runMode) : AnalyzerRunControl(runConfiguration, runMode)
, m_projectInfo(projectInfo) , m_projectInfo(projectInfo)
, m_wordWidth(runConfiguration->abi().wordWidth()) , m_wordWidth(runConfiguration->abi().wordWidth())
, m_initialFilesToProcessSize(0) , m_initialFilesToProcessSize(0)

3
plugins/clangstaticanalyzer/clangstaticanalyzerruncontrol.h
View File

@@ -53,8 +53,7 @@ class ClangStaticAnalyzerRunControl : public Analyzer::AnalyzerRunControl
Q_OBJECT Q_OBJECT
public: public:
ClangStaticAnalyzerRunControl(const Analyzer::AnalyzerStartParameters &startParams, ClangStaticAnalyzerRunControl(ProjectExplorer::RunConfiguration *runConfiguration,
ProjectExplorer::RunConfiguration *runConfiguration,
Core::Id runMode, Core::Id runMode,
const CppTools::ProjectInfo &projectInfo); const CppTools::ProjectInfo &projectInfo);

2
plugins/clangstaticanalyzer/clangstaticanalyzerruncontrolfactory.cpp
View File

@@ -115,7 +115,7 @@ RunControl *ClangStaticAnalyzerRunControlFactory::create(RunConfiguration *runCo
return 0; return 0;
} }
return AnalyzerManager::createRunControl(AnalyzerStartParameters(), runConfiguration, runMode); return AnalyzerManager::createRunControl(runConfiguration, runMode);
} }
} // namespace Internal } // namespace Internal

18
plugins/clangstaticanalyzer/clangstaticanalyzertool.cpp
View File

@@ -165,10 +165,8 @@ QWidget *ClangStaticAnalyzerTool::createWidgets()
return toolbarWidget; return toolbarWidget;
} }
AnalyzerRunControl *ClangStaticAnalyzerTool::createRunControl( AnalyzerRunControl *ClangStaticAnalyzerTool::createRunControl(RunConfiguration *runConfiguration,
const AnalyzerStartParameters &sp, Core::Id runMode)
RunConfiguration *runConfiguration,
Core::Id runMode)
{ {
QTC_ASSERT(runConfiguration, return 0); QTC_ASSERT(runConfiguration, return 0);
QTC_ASSERT(m_projectInfoBeforeBuild.isValid(), return 0); QTC_ASSERT(m_projectInfoBeforeBuild.isValid(), return 0);
@@ -184,15 +182,15 @@ AnalyzerRunControl *ClangStaticAnalyzerTool::createRunControl(
return 0); return 0);
m_projectInfoBeforeBuild = CppTools::ProjectInfo(); m_projectInfoBeforeBuild = CppTools::ProjectInfo();
auto engine = new ClangStaticAnalyzerRunControl(sp, runConfiguration, runMode, auto runControl = new ClangStaticAnalyzerRunControl(runConfiguration, runMode,
projectInfoAfterBuild); projectInfoAfterBuild);
connect(engine, &ClangStaticAnalyzerRunControl::starting, connect(runControl, &ClangStaticAnalyzerRunControl::starting,
this, &ClangStaticAnalyzerTool::onEngineIsStarting); this, &ClangStaticAnalyzerTool::onEngineIsStarting);
connect(engine, &ClangStaticAnalyzerRunControl::newDiagnosticsAvailable, connect(runControl, &ClangStaticAnalyzerRunControl::newDiagnosticsAvailable,
this, &ClangStaticAnalyzerTool::onNewDiagnosticsAvailable); this, &ClangStaticAnalyzerTool::onNewDiagnosticsAvailable);
connect(engine, &ClangStaticAnalyzerRunControl::finished, connect(runControl, &ClangStaticAnalyzerRunControl::finished,
this, &ClangStaticAnalyzerTool::onEngineFinished); this, &ClangStaticAnalyzerTool::onEngineFinished);
return engine; return runControl;
} }
static bool dontStartAfterHintForDebugMode(Project *project) static bool dontStartAfterHintForDebugMode(Project *project)

3
plugins/clangstaticanalyzer/clangstaticanalyzertool.h
View File

@@ -59,8 +59,7 @@ public:
QList<Diagnostic> diagnostics() const; QList<Diagnostic> diagnostics() const;
QWidget *createWidgets(); QWidget *createWidgets();
Analyzer::AnalyzerRunControl *createRunControl(const Analyzer::AnalyzerStartParameters &sp, Analyzer::AnalyzerRunControl *createRunControl(ProjectExplorer::RunConfiguration *runConfiguration,
ProjectExplorer::RunConfiguration *runConfiguration,
Core::Id runMode); Core::Id runMode);
void startTool(); void startTool();