diff --git a/src/libs/utils/filepath.cpp b/src/libs/utils/filepath.cpp index fa969ee7a86..44aa5727574 100644 --- a/src/libs/utils/filepath.cpp +++ b/src/libs/utils/filepath.cpp @@ -341,6 +341,11 @@ QStringView FilePath::host() const return QStringView{m_data}.mid(m_pathLen + m_schemeLen, m_hostLen); } +QStringView FilePath::pathView() const +{ + return QStringView{m_data}.left(m_pathLen); +} + QString FilePath::path() const { QTC_ASSERT(!m_data.startsWith(u"/./"), return m_data.mid(3, m_pathLen - 3)); @@ -871,7 +876,7 @@ QVariant FilePath::toVariant() const bool FilePath::operator==(const FilePath &other) const { - return QString::compare(path(), other.path(), caseSensitivity()) == 0 + return pathView().compare(other.pathView(), caseSensitivity()) == 0 && host() == other.host() && scheme() == other.scheme(); } @@ -883,7 +888,7 @@ bool FilePath::operator!=(const FilePath &other) const bool FilePath::operator<(const FilePath &other) const { - const int cmp = QString::compare(path(), other.path(), caseSensitivity()); + const int cmp = pathView().compare(other.pathView(), caseSensitivity()); if (cmp != 0) return cmp < 0; if (host() != other.host()) @@ -932,7 +937,7 @@ bool FilePath::isChildOf(const FilePath &s) const /// \returns whether path() startsWith \a s bool FilePath::startsWith(const QString &s) const { - return path().startsWith(s, caseSensitivity()); + return pathView().startsWith(s, caseSensitivity()); } /*! @@ -941,7 +946,7 @@ bool FilePath::startsWith(const QString &s) const */ bool FilePath::endsWith(const QString &s) const { - return path().endsWith(s, caseSensitivity()); + return pathView().endsWith(s, caseSensitivity()); } /*! diff --git a/src/libs/utils/filepath.h b/src/libs/utils/filepath.h index f7ba8631bcb..d0fb810e465 100644 --- a/src/libs/utils/filepath.h +++ b/src/libs/utils/filepath.h @@ -74,6 +74,7 @@ public: QStringView scheme() const; QStringView host() const; + QStringView pathView() const; QString path() const; void setParts(const QStringView scheme, const QStringView host, const QStringView path);