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

CppTools: merge CompilerOptionsBuilder with Clang one

Browse Source 
Since it's never used for other compilers.

Change-Id: I9512692d1dc9f9a701ea2453b7d50005478bed5d
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
This commit is contained in:
Ivan Donchevskii
2017-09-27 10:32:52 +02:00
parent f19facd378
commit b10f8484c7
16 changed files with 176 additions and 287 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/plugins/clangrefactoring/clangqueryprojectsfindfilter.cpp
View File

@@ -32,7 +32,7 @@
#include <refactoringserverinterface.h>
#include <clangrefactoringservermessages.h>
#include <cpptools/clangcompileroptionsbuilder.h>
#include <cpptools/compileroptionsbuilder.h>
#include <QPointer>
@@ -151,12 +151,12 @@ void ClangQueryProjectsFindFilter::setUnsavedContent(
Utils::SmallStringVector ClangQueryProjectsFindFilter::compilerArguments(CppTools::ProjectPart *projectPart,
CppTools::ProjectFile::Kind fileKind)
{
using CppTools::ClangCompilerOptionsBuilder;
using CppTools::CompilerOptionsBuilder;
ClangCompilerOptionsBuilder builder(*projectPart, CLANG_VERSION, CLANG_RESOURCE_DIR);
CompilerOptionsBuilder builder(*projectPart, CLANG_VERSION, CLANG_RESOURCE_DIR);
return Utils::SmallStringVector(builder.build(fileKind,
ClangCompilerOptionsBuilder::PchUsage::None));
CompilerOptionsBuilder::PchUsage::None));
}
QWidget *ClangQueryProjectsFindFilter::widget() const
@@ -170,7 +170,7 @@ Utils::SmallStringVector createCommandLine(CppTools::ProjectPart *projectPart,
const QString &documentFilePath,
CppTools::ProjectFile::Kind fileKind)
{
using CppTools::ClangCompilerOptionsBuilder;
using CppTools::CompilerOptionsBuilder;
Utils::SmallStringVector commandLine = ClangQueryProjectsFindFilter::compilerArguments(projectPart, fileKind);

8
src/plugins/clangrefactoring/refactoringengine.cpp
View File

@@ -31,7 +31,7 @@
#include <refactoringserverinterface.h>
#include <requestsourcelocationforrenamingmessage.h>
#include <cpptools/clangcompileroptionsbuilder.h>
#include <cpptools/compileroptionsbuilder.h>
#include <cpptools/cpptoolsreuse.h>
#include <texteditor/textdocument.h>
@@ -58,7 +58,7 @@ void RefactoringEngine::startLocalRenaming(const CppTools::CursorInEditor &data,
CppTools::ProjectPart *projectPart,
RenameCallback &&renameSymbolsCallback)
{
using CppTools::ClangCompilerOptionsBuilder;
using CppTools::CompilerOptionsBuilder;
setRefactoringEngineAvailable(false);
@@ -66,8 +66,8 @@ void RefactoringEngine::startLocalRenaming(const CppTools::CursorInEditor &data,
QString filePath = data.filePath().toString();
QTextCursor textCursor = data.cursor();
ClangCompilerOptionsBuilder clangCOBuilder{*projectPart, CLANG_VERSION, CLANG_RESOURCE_DIR};
Utils::SmallStringVector commandLine{clangCOBuilder.build(
CompilerOptionsBuilder optionsBuilder{*projectPart, CLANG_VERSION, CLANG_RESOURCE_DIR};
Utils::SmallStringVector commandLine{optionsBuilder.build(
fileKindInProjectPart(projectPart, filePath),
CppTools::getPchUsage())};