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

Clang: Fix build

Browse Source 
This amends commit cf4dbb4bb6.

Change-Id: Ib74fba38348a02f6bb9d254b7a5e9013a2013942
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
Orgad Shaneh
2018-04-08 01:20:42 +03:00
committed by Orgad Shaneh
parent 1c82a53e74
commit 5e483d04bc
14 changed files with 163 additions and 166 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/tools/clangrefactoringbackend/source/clangquerygatherer.cpp
View File

@@ -50,10 +50,10 @@ ClangQueryGatherer::createSourceRangesForSource(
{
ClangQuery clangQuery(*filePathCache, std::move(query));
clangQuery.addFile(std::string(source.filePath().directory()),
std::string(source.filePath().name()),
std::string(source.takeUnsavedFileContent()),
std::vector<std::string>(source.takeCommandLineArguments()));
clangQuery.addFile(std::string(source.filePath.directory()),
std::string(source.filePath.name()),
std::string(source.unsavedFileContent),
std::vector<std::string>(source.commandLineArguments));
clangQuery.addUnsavedFiles(unsaved);

4
src/tools/clangrefactoringbackend/source/clangtool.cpp
View File

@@ -102,8 +102,8 @@ void ClangTool::addUnsavedFiles(const V2::FileContainers &unsavedFiles)
m_unsavedFileContents.reserve(m_unsavedFileContents.size() + unsavedFiles.size());
auto convertToUnsavedFileContent = [] (const V2::FileContainer &unsavedFile) {
return UnsavedFileContent{toNativePath(unsavedFile.filePath().path().clone()),
unsavedFile.unsavedFileContent().clone()};
return UnsavedFileContent{toNativePath(unsavedFile.filePath.path().clone()),
unsavedFile.unsavedFileContent.clone()};
};
std::transform(unsavedFiles.begin(),

20
src/tools/clangrefactoringbackend/source/refactoringserver.cpp
View File

@@ -58,18 +58,18 @@ void RefactoringServer::end()
void RefactoringServer::requestSourceLocationsForRenamingMessage(RequestSourceLocationsForRenamingMessage &&message)
{
SymbolFinder symbolFinder(message.line(), message.column(), m_filePathCache);
SymbolFinder symbolFinder(message.line, message.column, m_filePathCache);
symbolFinder.addFile(std::string(message.filePath().directory()),
std::string(message.filePath().name()),
std::string(message.unsavedContent()),
std::vector<std::string>(message.commandLine()));
symbolFinder.addFile(std::string(message.filePath.directory()),
std::string(message.filePath.name()),
std::string(message.unsavedContent),
std::vector<std::string>(message.commandLine));
symbolFinder.findSymbol();
client()->sourceLocationsForRenamingMessage({symbolFinder.takeSymbolName(),
symbolFinder.takeSourceLocations(),
message.textDocumentRevision()});
message.textDocumentRevision});
}
void RefactoringServer::requestSourceRangesAndDiagnosticsForQueryMessage(
@@ -77,10 +77,10 @@ void RefactoringServer::requestSourceRangesAndDiagnosticsForQueryMessage(
{
ClangQuery clangQuery(m_filePathCache, message.takeQuery());
clangQuery.addFile(std::string(message.source().filePath().directory()),
std::string(message.source().filePath().name()),
std::string(message.source().unsavedFileContent()),
std::vector<std::string>(message.source().commandLineArguments()));
clangQuery.addFile(std::string(message.source.filePath.directory()),
std::string(message.source.filePath.name()),
std::string(message.source.unsavedFileContent),
std::vector<std::string>(message.source.commandLineArguments));
clangQuery.findLocations();

2
src/tools/clangrefactoringbackend/source/sourcerangeextractor.cpp
View File

@@ -179,7 +179,7 @@ void SourceRangeExtractor::addSourceRanges(const std::vector<clang::SourceRange>
const std::vector<SourceRangeWithTextContainer> &SourceRangeExtractor::sourceRangeWithTextContainers() const
{
return sourceRangesContainer.sourceRangeWithTextContainers();
return sourceRangesContainer.sourceRangeWithTextContainers;
}
} // namespace ClangBackEnd