1 files changed, 15 insertions, 17 deletions

diff --git a/src/corelib/tools/qregexp.cpp b/src/corelib/tools/qregexp.cpp
index ef24c952eb..dd38ba0360 100644
--- a/src/corelib/tools/qregexp.cpp
+++ b/src/corelib/tools/qregexp.cpp
@@ -58,9 +58,6 @@
 
 QT_BEGIN_NAMESPACE
 
-int qFindString(const QChar *haystack, int haystackLen, int from,
-    const QChar *needle, int needleLen, Qt::CaseSensitivity cs);
-
 // error strings for the regexp parser
 #define RXERR_OK         QT_TRANSLATE_NOOP("QRegExp", "no error occurred")
 #define RXERR_DISABLED   QT_TRANSLATE_NOOP("QRegExp", "disabled feature used")
@@ -893,7 +890,7 @@ static bool operator==(const QRegExpEngineKey &key1, const QRegExpEngineKey &key
            && key1.cs == key2.cs;
 }
 
-static uint qHash(const QRegExpEngineKey &key, uint seed = 0) Q_DECL_NOTHROW
+static uint qHash(const QRegExpEngineKey &key, uint seed = 0) noexcept
 {
     QtPrivate::QHashCombine hash;
     seed = hash(seed, key.pattern);
@@ -940,10 +937,10 @@ struct QRegExpMatchState
 
     const QRegExpEngine *eng;
 
-    inline QRegExpMatchState() : bigArray(0), captured(0) {}
+    inline QRegExpMatchState() : bigArray(nullptr), captured(nullptr) {}
     inline ~QRegExpMatchState() { free(bigArray); }
 
-    void drain() { free(bigArray); bigArray = 0; captured = 0; } // to save memory
+    void drain() { free(bigArray); bigArray = nullptr; captured = nullptr; } // to save memory
     void prepareForMatch(QRegExpEngine *eng);
     void match(const QChar *str, int len, int pos, bool minimal,
         bool oneTest, int caretIndex);
@@ -1423,14 +1420,15 @@ void QRegExpMatchState::match(const QChar *str0, int len0, int pos0,
 
 #ifndef QT_NO_REGEXP_OPTIM
     if (eng->trivial && !oneTest) {
-        pos = qFindString(str0, len0, pos0, eng->goodStr.unicode(), eng->goodStr.length(), eng->cs);
+        // ### Qt6: qsizetype
+        pos = int(QtPrivate::findString(QStringView(str0, len0), pos0, QStringView(eng->goodStr.unicode(), eng->goodStr.length()), eng->cs));
         matchLen = eng->goodStr.length();
         matched = (pos != -1);
     } else
 #endif
     {
         in = str0;
-        if (in == 0)
+        if (in == nullptr)
             in = &char_null;
         pos = pos0;
         caretPos = caretIndex;
@@ -1709,7 +1707,7 @@ void QRegExpEngine::dump() const
 
 void QRegExpEngine::setup()
 {
-    ref.store(1);
+    ref.storeRelaxed(1);
 #ifndef QT_NO_REGEXP_CAPTURE
     f.resize(32);
     nf = 0;
@@ -2912,7 +2910,7 @@ int QRegExpEngine::getEscape()
 #ifndef QT_NO_REGEXP_ESCAPE
     if ((prevCh & ~0xff) == 0) {
         const char *p = strchr(tab, prevCh);
-        if (p != 0)
+        if (p != nullptr)
             return Tok_Char | backTab[p - tab];
     }
 #endif
@@ -3532,7 +3530,7 @@ int QRegExpEngine::parse(const QChar *pattern, int len)
 #endif
     box.cat(middleBox);
     box.cat(rightBox);
-    yyCharClass.reset(0);
+    yyCharClass.reset();
 
 #ifndef QT_NO_REGEXP_CAPTURE
     for (int i = 0; i < nf; ++i) {
@@ -3610,7 +3608,7 @@ int QRegExpEngine::parse(const QChar *pattern, int len)
 void QRegExpEngine::parseAtom(Box *box)
 {
 #ifndef QT_NO_REGEXP_LOOKAHEAD
-    QRegExpEngine *eng = 0;
+    QRegExpEngine *eng = nullptr;
     bool neg;
     int len;
 #endif
@@ -3807,9 +3805,9 @@ struct QRegExpPrivate
     QRegExpMatchState matchState;
 
     inline QRegExpPrivate()
-        : eng(0), engineKey(QString(), QRegExp::RegExp, Qt::CaseSensitive), minimal(false) { }
+        : eng(nullptr), engineKey(QString(), QRegExp::RegExp, Qt::CaseSensitive), minimal(false) { }
     inline QRegExpPrivate(const QRegExpEngineKey &key)
-        : eng(0), engineKey(key), minimal(false) {}
+        : eng(nullptr), engineKey(key), minimal(false) {}
 };
 
 #if !defined(QT_NO_REGEXP_OPTIM)
@@ -3888,9 +3886,9 @@ static void prepareEngineForMatch(QRegExpPrivate *priv, const QString &str)
 
 static void invalidateEngine(QRegExpPrivate *priv)
 {
-    if (priv->eng != 0) {
+    if (priv->eng) {
         derefEngine(priv->eng, priv->engineKey);
-        priv->eng = 0;
+        priv->eng = nullptr;
         priv->matchState.drain();
     }
 }
@@ -4048,7 +4046,7 @@ bool QRegExp::operator==(const QRegExp &rx) const
     Returns the hash value for \a key, using
     \a seed to seed the calculation.
 */
-uint qHash(const QRegExp &key, uint seed) Q_DECL_NOTHROW
+uint qHash(const QRegExp &key, uint seed) noexcept
 {
     QtPrivate::QHashCombine hash;
     seed = hash(seed, key.priv->engineKey);