summaryrefslogtreecommitdiff
path: root/src/tools/clangrefactoringbackend/source/refactoringserver.cpp
diff options
context:
space:
mode:
authorIvan Donchevskii <ivan.donchevskii@qt.io>2019-01-31 10:30:58 +0100
committerIvan Donchevskii <ivan.donchevskii@qt.io>2019-02-07 15:03:39 +0000
commitdd778bcb2388bdc643e1d5eb5ce60c03cee2719b (patch)
tree99f53071034dd48b3ad6df63750f0dc2f72cdf37 /src/tools/clangrefactoringbackend/source/refactoringserver.cpp
parent874dde6863129ce5b236a8c7b08e75aec2d5f5dc (diff)
downloadqt-creator-dd778bcb2388bdc643e1d5eb5ce60c03cee2719b.tar.gz
Clang: Use full paths in compilation database for symbol collector
We we FilePath and NativeFilePath so that compiler warns us if we mix them up. Change-Id: I33d7abc7e4e724dff2a9b2b9b23deea8b358ccfd Reviewed-by: Marco Bubke <marco.bubke@qt.io>
Diffstat (limited to 'src/tools/clangrefactoringbackend/source/refactoringserver.cpp')
-rw-r--r--src/tools/clangrefactoringbackend/source/refactoringserver.cpp14
1 files changed, 6 insertions, 8 deletions
diff --git a/src/tools/clangrefactoringbackend/source/refactoringserver.cpp b/src/tools/clangrefactoringbackend/source/refactoringserver.cpp
index 4b51ee0d69..83aa5a31fd 100644
--- a/src/tools/clangrefactoringbackend/source/refactoringserver.cpp
+++ b/src/tools/clangrefactoringbackend/source/refactoringserver.cpp
@@ -62,10 +62,9 @@ void RefactoringServer::requestSourceLocationsForRenamingMessage(RequestSourceLo
{
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::move(message.filePath),
+ std::move(message.unsavedContent),
+ std::move(message.commandLine));
symbolFinder.findSymbol();
@@ -79,10 +78,9 @@ 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::move(message.source.filePath),
+ std::move(message.source.unsavedFileContent),
+ std::move(message.source.commandLineArguments));
clangQuery.findLocations();