From 39ffdb416ff3381515b7b4bf579acb23941cd6fc Mon Sep 17 00:00:00 2001 From: hjk Date: Thu, 24 Nov 2022 13:05:41 +0100 Subject: CPlusPlus: Use FilePath for resolved include paths ... and fix fallout. Change-Id: I66886e91ff476eff15db51cc024a8021e952d44d Reviewed-by: Christian Kandeler Reviewed-by: Qt CI Bot --- src/plugins/cppeditor/cppsourceprocessor.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/plugins/cppeditor/cppsourceprocessor.cpp') diff --git a/src/plugins/cppeditor/cppsourceprocessor.cpp b/src/plugins/cppeditor/cppsourceprocessor.cpp index 1e11b8939c..2cd0eafae1 100644 --- a/src/plugins/cppeditor/cppsourceprocessor.cpp +++ b/src/plugins/cppeditor/cppsourceprocessor.cpp @@ -383,12 +383,12 @@ void CppSourceProcessor::mergeEnvironment(Document::Ptr doc) const QList includes = doc->resolvedIncludes(); for (const Document::Include &incl : includes) { - const QString includedFile = incl.resolvedFileName(); + const FilePath includedFile = incl.resolvedFileName(); if (Document::Ptr includedDoc = m_snapshot.document(includedFile)) mergeEnvironment(includedDoc); - else if (!m_included.contains(FilePath::fromString(includedFile))) - run(includedFile); + else if (!m_included.contains(includedFile)) + run(includedFile.toString()); } m_env.addMacros(doc->definedMacros()); @@ -416,7 +416,7 @@ void CppSourceProcessor::sourceNeeded(int line, const QString &fileName, Include const FilePath absoluteFilePath = FilePath::fromString(absoluteFileName); if (m_currentDoc) { - m_currentDoc->addIncludeFile(Document::Include(fileName, absoluteFileName, line, type)); + m_currentDoc->addIncludeFile(Document::Include(fileName, absoluteFilePath, line, type)); if (absoluteFileName.isEmpty()) { m_currentDoc->addDiagnosticMessage(messageNoSuchFile(m_currentDoc, fileName, line)); return; @@ -453,7 +453,7 @@ void CppSourceProcessor::sourceNeeded(int line, const QString &fileName, Include document->setLanguageFeatures(m_languageFeatures); for (const QString &include : initialIncludes) { m_included.insert(FilePath::fromString(include)); - Document::Include inc(include, include, 0, IncludeLocal); + Document::Include inc(include, FilePath::fromString(include), 0, IncludeLocal); document->addIncludeFile(inc); } if (info.exists()) -- cgit v1.2.1