diff options
5 files changed, 13 insertions, 13 deletions
diff --git a/src/plugins/clangcodemodel/clangeditordocumentprocessor.cpp b/src/plugins/clangcodemodel/clangeditordocumentprocessor.cpp index 9ec7e79fbb..d862e9c16f 100644 --- a/src/plugins/clangcodemodel/clangeditordocumentprocessor.cpp +++ b/src/plugins/clangcodemodel/clangeditordocumentprocessor.cpp @@ -476,7 +476,7 @@ private: } CppTools::CompilerOptionsBuilder builder(m_projectPart); - builder.updateLanguageOption(fileKind); + builder.updateFileLanguage(fileKind); m_options.append(builder.options()); } diff --git a/src/plugins/clangcodemodel/clangutils.cpp b/src/plugins/clangcodemodel/clangutils.cpp index daed860fb9..0e1cfe7484 100644 --- a/src/plugins/clangcodemodel/clangutils.cpp +++ b/src/plugins/clangcodemodel/clangutils.cpp @@ -316,7 +316,7 @@ static QJsonObject createFileObject(CompilerOptionsBuilder &optionsBuilder, const ::Utils::FileName &buildDir) { const ProjectFile::Kind kind = ProjectFile::classify(projFile.path); - optionsBuilder.updateLanguageOption(kind); + optionsBuilder.updateFileLanguage(kind); QJsonObject fileObject; fileObject["file"] = projFile.path; diff --git a/src/plugins/cpptools/compileroptionsbuilder.cpp b/src/plugins/cpptools/compileroptionsbuilder.cpp index 1914ce7197..61f8242537 100644 --- a/src/plugins/cpptools/compileroptionsbuilder.cpp +++ b/src/plugins/cpptools/compileroptionsbuilder.cpp @@ -110,8 +110,8 @@ QStringList CompilerOptionsBuilder::build(ProjectFile::Kind fileKind, addTargetTriple(); addExtraCodeModelFlags(); - updateLanguageOption(fileKind); - addOptionsForLanguage(/*checkForBorlandExtensions*/ true); + updateFileLanguage(fileKind); + addLanguageVersionAndExtensions(); addToolchainAndProjectMacros(); undefineClangVersionMacrosForMsvc(); @@ -316,7 +316,7 @@ void CompilerOptionsBuilder::addMacros(const ProjectExplorer::Macros ¯os) m_options.append(options); } -void CompilerOptionsBuilder::updateLanguageOption(ProjectFile::Kind fileKind) +void CompilerOptionsBuilder::updateFileLanguage(ProjectFile::Kind fileKind) { const bool objcExt = m_projectPart.languageExtensions & ProjectExplorer::LanguageExtension::ObjectiveC; @@ -332,7 +332,7 @@ void CompilerOptionsBuilder::updateLanguageOption(ProjectFile::Kind fileKind) m_options[langOptIndex + 1] = options[1]; } -void CompilerOptionsBuilder::addOptionsForLanguage(bool checkForBorlandExtensions) +void CompilerOptionsBuilder::addLanguageVersionAndExtensions() { using ProjectExplorer::LanguageExtension; using ProjectExplorer::LanguageVersion; @@ -381,7 +381,7 @@ void CompilerOptionsBuilder::addOptionsForLanguage(bool checkForBorlandExtension if (languageExtensions & LanguageExtension::OpenMP) options << "-fopenmp"; - if (checkForBorlandExtensions && (languageExtensions & LanguageExtension::Borland)) + if (languageExtensions & LanguageExtension::Borland) options << "-fborland-extensions"; m_options.append(options); diff --git a/src/plugins/cpptools/compileroptionsbuilder.h b/src/plugins/cpptools/compileroptionsbuilder.h index 478e5fc7e1..06e549d613 100644 --- a/src/plugins/cpptools/compileroptionsbuilder.h +++ b/src/plugins/cpptools/compileroptionsbuilder.h @@ -62,8 +62,8 @@ public: void addTargetTriple(); void addExtraCodeModelFlags(); void insertWrappedQtHeaders(); - void addOptionsForLanguage(bool checkForBorlandExtensions = true); - void updateLanguageOption(ProjectFile::Kind fileKind); + void addLanguageVersionAndExtensions(); + void updateFileLanguage(ProjectFile::Kind fileKind); void addMsvcCompatibilityVersion(); void undefineCppLanguageFeatureMacrosForMsvc2015(); diff --git a/tests/unit/unittest/compileroptionsbuilder-test.cpp b/tests/unit/unittest/compileroptionsbuilder-test.cpp index fb45f7bc1f..39b4616efe 100644 --- a/tests/unit/unittest/compileroptionsbuilder-test.cpp +++ b/tests/unit/unittest/compileroptionsbuilder-test.cpp @@ -364,7 +364,7 @@ TEST_F(CompilerOptionsBuilder, InsertWrappedQtHeaders) TEST_F(CompilerOptionsBuilder, SetLanguageVersion) { - compilerOptionsBuilder.updateLanguageOption(ProjectFile::CXXSource); + compilerOptionsBuilder.updateFileLanguage(ProjectFile::CXXSource); ASSERT_THAT(compilerOptionsBuilder.options(), ElementsAre("-x", "c++")); } @@ -373,16 +373,16 @@ TEST_F(CompilerOptionsBuilder, HandleLanguageExtension) { projectPart.languageExtensions = ProjectExplorer::LanguageExtension::ObjectiveC; - compilerOptionsBuilder.updateLanguageOption(ProjectFile::CXXSource); + compilerOptionsBuilder.updateFileLanguage(ProjectFile::CXXSource); ASSERT_THAT(compilerOptionsBuilder.options(), ElementsAre("-x", "objective-c++")); } TEST_F(CompilerOptionsBuilder, UpdateLanguageVersion) { - compilerOptionsBuilder.updateLanguageOption(ProjectFile::CXXSource); + compilerOptionsBuilder.updateFileLanguage(ProjectFile::CXXSource); - compilerOptionsBuilder.updateLanguageOption(ProjectFile::CXXHeader); + compilerOptionsBuilder.updateFileLanguage(ProjectFile::CXXHeader); ASSERT_THAT(compilerOptionsBuilder.options(), ElementsAre("-x", "c++-header")); } |