diff --git a/src/libs/cplusplus/FindUsages.cpp b/src/libs/cplusplus/FindUsages.cpp index ae18b0794f9..173a6e2a5e6 100644 --- a/src/libs/cplusplus/FindUsages.cpp +++ b/src/libs/cplusplus/FindUsages.cpp @@ -170,7 +170,7 @@ void FindUsages::reportResult(unsigned tokenIndex) const int len = tk.utf16chars(); - const Usage u(_doc->fileName(), lineText, line, col, len); + const Usage u(Utils::FileName::fromString(_doc->fileName()), lineText, line, col, len); _usages.append(u); _references.append(tokenIndex); } diff --git a/src/libs/cplusplus/FindUsages.h b/src/libs/cplusplus/FindUsages.h index 897106b33e6..deed69276aa 100644 --- a/src/libs/cplusplus/FindUsages.h +++ b/src/libs/cplusplus/FindUsages.h @@ -30,6 +30,7 @@ #include "TypeOfExpression.h" #include +#include #include @@ -39,11 +40,11 @@ class CPLUSPLUS_EXPORT Usage { public: Usage() = default; - Usage(const QString &path, const QString &lineText, int line, int col, int len) + Usage(const Utils::FileName &path, const QString &lineText, int line, int col, int len) : path(path), lineText(lineText), line(line), col(col), len(len) {} public: - QString path; + Utils::FileName path; QString lineText; int line = 0; int col = 0; diff --git a/src/plugins/cpptools/cppfindreferences.cpp b/src/plugins/cpptools/cppfindreferences.cpp index 2283a7b9b1d..de598e3d619 100644 --- a/src/plugins/cpptools/cppfindreferences.cpp +++ b/src/plugins/cpptools/cppfindreferences.cpp @@ -469,7 +469,7 @@ static void displayResults(SearchResult *search, QFutureWatcher *watcher, { for (int index = first; index != last; ++index) { Usage result = watcher->future().resultAt(index); - search->addResult(result.path, + search->addResult(result.path.toString(), result.line, result.lineText, result.col, @@ -536,7 +536,7 @@ restart_search: if (macro.name() == useMacro.name()) { unsigned column; const QString &lineSource = matchingLine(use.bytesBegin(), source, &column); - usages.append(Usage(fileName.toString(), lineSource, use.beginLine(), column, + usages.append(Usage(fileName, lineSource, use.beginLine(), column, useMacro.nameToQString().size())); } }