From 4cd53ad3a64dedc788346979fccabd8810104b20 Mon Sep 17 00:00:00 2001 From: Giuseppe D'Angelo Date: Sun, 24 Aug 2014 09:44:42 +0200 Subject: [PATCH] Refactor QString::contains(QRegularExpression) Unify the code of the two overloads; fix a typo in a warning; and use an opportunity to insert a move. Change-Id: I85eef86d35f0d1e2da25f09d92204e32abf6d7d3 Reviewed-by: Olivier Goffart Reviewed-by: Marc Mutz --- src/corelib/tools/qstring.cpp | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/src/corelib/tools/qstring.cpp b/src/corelib/tools/qstring.cpp index 037c7a8fe5..169b48aa5a 100644 --- a/src/corelib/tools/qstring.cpp +++ b/src/corelib/tools/qstring.cpp @@ -3732,12 +3732,7 @@ int QString::lastIndexOf(const QRegularExpression &re, int from) const */ bool QString::contains(const QRegularExpression &re) const { - if (!re.isValid()) { - qWarning("QString::contains: invalid QRegularExpression object"); - return false; - } - QRegularExpressionMatch match = re.match(*this); - return match.hasMatch(); + return contains(re, Q_NULLPTR); } /*! @@ -3757,13 +3752,13 @@ bool QString::contains(const QRegularExpression &re) const bool QString::contains(const QRegularExpression &re, QRegularExpressionMatch *match) const { if (!re.isValid()) { - qWarning("QString::contains: invalid QRegularExpresssion object"); + qWarning("QString::contains: invalid QRegularExpression object"); return false; } QRegularExpressionMatch m = re.match(*this); bool hasMatch = m.hasMatch(); if (hasMatch && match) - *match = m; + *match = qMove(m); return hasMatch; }