From 44f0bb287c577169b408fb5833bf9583799487ae Mon Sep 17 00:00:00 2001 From: Nikolai Kosjar Date: Thu, 25 Jun 2015 14:17:11 +0200 Subject: Adapt to upstream API change in CompilerOptionsBuilder Change-Id: I895e8a32ca8adc1c5f1b4791a3fcc5f18c5078ab Reviewed-by: Christian Kandeler --- .../clangstaticanalyzerruncontrol.cpp | 32 +++++++--------------- 1 file changed, 10 insertions(+), 22 deletions(-) diff --git a/plugins/clangstaticanalyzer/clangstaticanalyzerruncontrol.cpp b/plugins/clangstaticanalyzer/clangstaticanalyzerruncontrol.cpp index 6e77de72d6..9281673bec 100644 --- a/plugins/clangstaticanalyzer/clangstaticanalyzerruncontrol.cpp +++ b/plugins/clangstaticanalyzer/clangstaticanalyzerruncontrol.cpp @@ -118,32 +118,20 @@ static QStringList argumentsFromProjectPart(const CppTools::ProjectPart::Ptr &pr const QString &toolchainType, unsigned char wordWidth) { - QStringList result; - - const bool objcExt = projectPart->languageExtensions & ProjectPart::ObjectiveCExtensions; - result += CppTools::CompilerOptionsBuilder::createLanguageOption(fileKind, objcExt, - toolchainType); - result += CppTools::CompilerOptionsBuilder::createOptionsForLanguage( - projectPart->languageVersion, - projectPart->languageExtensions, false, - toolchainType); - result += CppTools::CompilerOptionsBuilder::createDefineOptions(projectPart->toolchainDefines, - false, toolchainType); - result += CppTools::CompilerOptionsBuilder::createDefineOptions(projectPart->projectDefines, - false, toolchainType); - result += CppTools::CompilerOptionsBuilder::createHeaderPathOptions( - projectPart->headerPaths, - CompilerOptionsBuilder::IsBlackListed(), - toolchainType); + CompilerOptionsBuilder optionsBuilder(projectPart); + optionsBuilder.addLanguageOption(fileKind, toolchainType); + optionsBuilder.addOptionsForLanguage(false, toolchainType); + optionsBuilder.addToolchainAndProjectDefines(toolchainType); + optionsBuilder.addHeaderPathOptions(CompilerOptionsBuilder::IsBlackListed(), toolchainType); if (toolchainType == QLatin1String("msvc")) - result += QLatin1String("/EHsc"); // clang-cl does not understand exceptions + optionsBuilder.add(QLatin1String("/EHsc")); // clang-cl does not understand exceptions else - result += QLatin1String("-fPIC"); // TODO: Remove? + optionsBuilder.add(QLatin1String("-fPIC")); // TODO: Remove? - prependWordWidthArgumentIfNotIncluded(&result, wordWidth); - - return result; + QStringList options = optionsBuilder.options(); + prependWordWidthArgumentIfNotIncluded(&options, wordWidth); + return options; } static AnalyzeUnits unitsToAnalyzeFromCompilerCallData( -- cgit v1.2.1