diff options
Diffstat (limited to 'src/corelib/io/qurl.h')
-rw-r--r-- | src/corelib/io/qurl.h | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/src/corelib/io/qurl.h b/src/corelib/io/qurl.h index 918c3e5831..d6779cf485 100644 --- a/src/corelib/io/qurl.h +++ b/src/corelib/io/qurl.h @@ -6,10 +6,10 @@ #define QURL_H #include <QtCore/qbytearray.h> +#include <QtCore/qcompare.h> #include <QtCore/qobjectdefs.h> #include <QtCore/qstring.h> #include <QtCore/qlist.h> -#include <QtCore/qpair.h> #include <QtCore/qglobal.h> #if defined(Q_OS_DARWIN) || defined(Q_QDOC) @@ -143,8 +143,8 @@ public: #endif QUrl(); - QUrl(const QUrl ©); - QUrl &operator =(const QUrl ©); + QUrl(const QUrl ©) noexcept; + QUrl &operator =(const QUrl ©) noexcept; #ifdef QT_NO_URL_CAST_FROM_STRING explicit QUrl(const QString &url, ParsingMode mode = TolerantMode); #else @@ -165,7 +165,10 @@ public: [[nodiscard]] QUrl adjusted(FormattingOptions options) const; QByteArray toEncoded(FormattingOptions options = FullyEncoded) const; +#if QT_CORE_REMOVED_SINCE(6, 7) static QUrl fromEncoded(const QByteArray &url, ParsingMode mode = TolerantMode); +#endif + static QUrl fromEncoded(QByteArrayView input, ParsingMode mode = TolerantMode); enum UserInputResolutionOption { DefaultResolution, @@ -228,9 +231,11 @@ public: void detach(); bool isDetached() const; +#if QT_CORE_REMOVED_SINCE(6, 8) bool operator <(const QUrl &url) const; bool operator ==(const QUrl &url) const; bool operator !=(const QUrl &url) const; +#endif bool matches(const QUrl &url, FormattingOptions options) const; @@ -266,6 +271,11 @@ public: friend Q_CORE_EXPORT size_t qHash(const QUrl &url, size_t seed) noexcept; private: + friend Q_CORE_EXPORT bool comparesEqual(const QUrl &lhs, const QUrl &rhs); + friend Q_CORE_EXPORT Qt::weak_ordering + compareThreeWay(const QUrl &lhs, const QUrl &rhs); + Q_DECLARE_WEAKLY_ORDERED(QUrl) + QUrlPrivate *d; friend class QUrlQuery; |