CppEditor: Proliferate FilePath use

This includes one functional change: It drops some cleaning
of the path used to create the CppDocument, which is now
assumed to be done on the caller side.

Change-Id: I5e2a182028e4d5b56282ad85f4a5c665f081754f
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
This commit is contained in:
hjk
2022-11-23 10:28:47 +01:00
parent 8d645a506d
commit 9d80e23256
23 changed files with 61 additions and 52 deletions

View File

@@ -21,7 +21,9 @@
#include <QVarLengthArray>
#include <QDebug>
using namespace CPlusPlus;
using namespace Utils;
namespace CPlusPlus {
static const bool debug = qEnvironmentVariableIsSet("QTC_LOOKUPCONTEXT_DEBUG");
@@ -86,8 +88,6 @@ static bool isNestedInstantiationEnclosingTemplate(
return true;
}
namespace CPlusPlus {
static inline bool compareName(const Name *name, const Name *other)
{
if (name == other)
@@ -117,9 +117,6 @@ bool compareFullyQualifiedName(const QList<const Name *> &path, const QList<cons
return true;
}
}
namespace CPlusPlus {
namespace Internal {
bool operator==(const FullyQualifiedName &left, const FullyQualifiedName &right)
@@ -140,7 +137,7 @@ size_t qHash(const FullyQualifiedName &fullyQualifiedName)
}
return h;
}
}
}
/////////////////////////////////////////////////////////////////////
@@ -152,7 +149,7 @@ LookupContext::LookupContext()
LookupContext::LookupContext(Document::Ptr thisDocument,
const Snapshot &snapshot)
: _expressionDocument(Document::create(QLatin1String("<LookupContext>")))
: _expressionDocument(Document::create(FilePath::fromPathPart(u"<LookupContext>")))
, _thisDocument(thisDocument)
, _snapshot(snapshot)
, _bindings(new CreateBindings(thisDocument, snapshot))
@@ -2059,3 +2056,4 @@ Symbol *CreateBindings::instantiateTemplateFunction(const Name *instantiationNam
return cloner.symbol(specialization, &subst);
}
} // CPlusPlus