From 7b696e4ec72bff9a606658e70258fcdba55c6cd0 Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Thu, 20 Sep 2012 16:16:27 +0200 Subject: Add Q_UNREACHABLE / Q_ASSERT to two conditions that can't happen Just so the code generation is a little better. Change-Id: I2a43a4df0ae67900c465a6c2b4f2b8ba284dbbaa Reviewed-by: Shane Kearns Reviewed-by: David Faure --- src/corelib/io/qurl.cpp | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/corelib/io/qurl.cpp b/src/corelib/io/qurl.cpp index 1e0d7d7ded..b7339a202e 100644 --- a/src/corelib/io/qurl.cpp +++ b/src/corelib/io/qurl.cpp @@ -3522,6 +3522,9 @@ static QString errorMessage(QUrlPrivate::ErrorCode errorCode, QChar c) { switch (errorCode) { case QUrlPrivate::NoError: + Q_ASSERT_X(false, "QUrl::errorString", + "Impossible: QUrl::errorString should have treated this condition"); + Q_UNREACHABLE(); return QString(); case QUrlPrivate::InvalidSchemeError: { @@ -3573,7 +3576,10 @@ static QString errorMessage(QUrlPrivate::ErrorCode errorCode, QChar c) case QUrlPrivate::RelativeUrlPathContainsColonBeforeSlash: return QStringLiteral("Relative URL's path component contains ':' before any '/'"); } - return QStringLiteral(""); + + Q_ASSERT_X(false, "QUrl::errorString", "Cannot happen, unknown error"); + Q_UNREACHABLE(); + return QString(); } static inline void appendComponentIfPresent(QString &msg, bool present, const char *componentName, -- cgit v1.2.3