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

CPlusPlus: Migrate Macro to FilePath

Browse Source 
Change-Id: I94e8702e81e809e4d8318572cc070a0531edaefa
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
hjk
2022-11-28 13:06:13 +01:00
parent 3c8c5b08a8
commit f68db427ef
6 changed files with 20 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/plugins/cppeditor/cppfindreferences.cpp
View File

@@ -650,7 +650,7 @@ restart_search:
for (const CPlusPlus::Document::MacroUse &use : doc->macroUses()) {
const CPlusPlus::Macro &useMacro = use.macro();
if (useMacro.fileName() == macro.fileName()) { // Check if this is a match, but possibly against an outdated document.
if (useMacro.filePath() == macro.filePath()) { // Check if this is a match, but possibly against an outdated document.
if (source.isEmpty())
source = getSource(fileName, workingCopy);
@@ -752,13 +752,12 @@ void CppFindReferences::findMacroUses(const CPlusPlus::Macro &macro, const QStri
// add the macro definition itself
{
const QByteArray &source = getSource(Utils::FilePath::fromString(macro.fileName()),
workingCopy);
const QByteArray &source = getSource(macro.filePath(), workingCopy);
unsigned column;
const QString line = FindMacroUsesInFile::matchingLine(macro.bytesOffset(), source,
&column);
SearchResultItem item;
const Utils::FilePath filePath = Utils::FilePath::fromString(macro.fileName());
const FilePath filePath = macro.filePath();
item.setFilePath(filePath);
item.setLineText(line);
item.setMainRange(macro.line(), column, macro.nameToQString().length());