merge QUrl::fromEncoded() overload

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>

diff --git a/src/core/io/qurl.cpp b/src/core/io/qurl.cpp
index fba34dc..abb3964 100644 (file)
--- a/src/core/io/qurl.cpp
+++ b/src/core/io/qurl.cpp
@@ -5821,24 +5821,9 @@ QByteArray QUrl::toEncoded(FormattingOptions options) const
 }
 
 /*!
-    Parses \a input and returns the corresponding QUrl. \a input is
-    assumed to be in encoded form, containing only ASCII characters.
-
-    The URL is parsed using TolerantMode.
-
-    \sa toEncoded(), setUrl()
-*/
-QUrl QUrl::fromEncoded(const QByteArray &input)
-{
-    QUrl tmp;
-    tmp.setEncodedUrl(input, TolerantMode);
-    return tmp;
-}
-
-/*!
-    \overload
-
-    Parses the URL using \a parsingMode.
+    Parses \a input using \a parsingMode and returns the corresponding
+    QUrl. \a input is assumed to be in encoded form, containing only
+    ASCII characters.
 
     \sa toEncoded(), setUrl()
 */

diff --git a/src/core/io/qurl.h b/src/core/io/qurl.h
index ddc68ad..144d385 100644 (file)
--- a/src/core/io/qurl.h
+++ b/src/core/io/qurl.h
@@ -185,9 +185,7 @@ public:
     QString toString(FormattingOptions options = None) const;
 
     QByteArray toEncoded(FormattingOptions options = None) const;
-    static QUrl fromEncoded(const QByteArray &url);
-    static QUrl fromEncoded(const QByteArray &url, ParsingMode mode);
-    // ### Qt 5: merge the two fromEncoded() functions, with mode = TolerantMode
+    static QUrl fromEncoded(const QByteArray &url, ParsingMode mode = TolerantMode);
 
     static QUrl fromUserInput(const QString &userInput);