diff options
Diffstat (limited to 'src/corelib/io')
-rw-r--r-- | src/corelib/io/qurl.cpp | 22 | ||||
-rw-r--r-- | src/corelib/io/qurl.h | 9 |
2 files changed, 3 insertions, 28 deletions
diff --git a/src/corelib/io/qurl.cpp b/src/corelib/io/qurl.cpp index 1e74b2ad9f..bbf557a0fb 100644 --- a/src/corelib/io/qurl.cpp +++ b/src/corelib/io/qurl.cpp @@ -3060,17 +3060,6 @@ QString QUrl::fromAce(const QByteArray &domain, QUrl::AceProcessingOptions optio ForbidLeadingDot /*FIXME: make configurable*/, options); } -#if QT_VERSION < QT_VERSION_CHECK(7, 0, 0) -/*! - \since 4.2 - \overload -*/ -QString QUrl::fromAce(const QByteArray &domain) -{ - return fromAce(domain, {}); -} -#endif - /*! \since 6.3 @@ -3094,17 +3083,6 @@ QByteArray QUrl::toAce(const QString &domain, AceProcessingOptions options) .toLatin1(); } -#if QT_VERSION < QT_VERSION_CHECK(7, 0, 0) -/*! - \since 4.2 - \overload -*/ -QByteArray QUrl::toAce(const QString &domain) -{ - return toAce(domain, {}); -} -#endif - /*! \internal diff --git a/src/corelib/io/qurl.h b/src/corelib/io/qurl.h index 3001904ef3..e226462289 100644 --- a/src/corelib/io/qurl.h +++ b/src/corelib/io/qurl.h @@ -287,15 +287,12 @@ public: }; Q_DECLARE_FLAGS(AceProcessingOptions, AceProcessingOption) -#if QT_VERSION >= QT_VERSION_CHECK(7, 0, 0) - static QString fromAce(const QByteArray &, AceProcessingOptions options = {}); - static QByteArray toAce(const QString &, AceProcessingOptions options = {}); -#else +#if QT_REMOVED_SINCE(6, 3) static QString fromAce(const QByteArray &); static QByteArray toAce(const QString &); - static QString fromAce(const QByteArray &, AceProcessingOptions options); - static QByteArray toAce(const QString &, AceProcessingOptions options); #endif + static QString fromAce(const QByteArray &domain, AceProcessingOptions options = {}); + static QByteArray toAce(const QString &domain, AceProcessingOptions options = {}); static QStringList idnWhitelist(); static QStringList toStringList(const QList<QUrl> &uris, FormattingOptions options = FormattingOptions(PrettyDecoded)); |