diff options
| -rw-r--r-- | src/corelib/io/qurl.cpp | 6 | ||||
| -rw-r--r-- | src/corelib/io/qurl_p.h | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/corelib/io/qurl.cpp b/src/corelib/io/qurl.cpp index e78d810bdb..4cedb848fc 100644 --- a/src/corelib/io/qurl.cpp +++ b/src/corelib/io/qurl.cpp @@ -709,7 +709,7 @@ bool QUrlPrivate::setScheme(const QString &value, int len) return true; } -bool QUrlPrivate::setAuthority(const QString &auth, int from, int end, QUrl::ParsingMode mode) +inline void QUrlPrivate::setAuthority(const QString &auth, int from, int end, QUrl::ParsingMode mode) { sectionHasError &= ~Authority; sectionIsPresent &= ~Authority; @@ -719,7 +719,7 @@ bool QUrlPrivate::setAuthority(const QString &auth, int from, int end, QUrl::Par password.clear(); host.clear(); port = -1; - return true; + return; } int userInfoIndex = auth.indexOf(QLatin1Char('@'), from); @@ -769,7 +769,7 @@ bool QUrlPrivate::setAuthority(const QString &auth, int from, int end, QUrl::Par port = -1; } - return setHost(auth, from, qMin<uint>(end, colonIndex), mode) && !(sectionHasError & Port); + setHost(auth, from, qMin<uint>(end, colonIndex), mode); } void QUrlPrivate::setUserInfo(const QString &userInfo, int from, int end) diff --git a/src/corelib/io/qurl_p.h b/src/corelib/io/qurl_p.h index 12ab0c763d..780fb387d9 100644 --- a/src/corelib/io/qurl_p.h +++ b/src/corelib/io/qurl_p.h @@ -127,7 +127,7 @@ public: // the "end" parameters are like STL iterators: they point to one past the last valid element bool setScheme(const QString &value, int len); - bool setAuthority(const QString &auth, int from, int end, QUrl::ParsingMode mode); + void setAuthority(const QString &auth, int from, int end, QUrl::ParsingMode mode); void setUserInfo(const QString &userInfo, int from, int end); void setUserName(const QString &value, int from, int end); void setPassword(const QString &value, int from, int end); |