OSDN Git Service

replace prepareEngine_helper() with its body
authorIvailo Monev <xakepa10@gmail.com>
Wed, 31 Mar 2021 00:39:56 +0000 (03:39 +0300)
committerIvailo Monev <xakepa10@gmail.com>
Wed, 31 Mar 2021 00:39:56 +0000 (03:39 +0300)
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
src/core/tools/qregexp.cpp

index 57b1f62..98c4555 100644 (file)
@@ -3431,8 +3431,10 @@ static void derefEngine(QRegExpEngine *eng, const QRegExpEngineKey &key)
     }
 }
 
-static void prepareEngine_helper(QRegExpPrivate *priv)
+static void prepareEngine(QRegExpPrivate *priv)
 {
+    if (priv->eng)
+        return;
     bool initMatchState = !priv->eng;
 #if !defined(QT_NO_REGEXP_OPTIM)
     if (!priv->eng && globalEngineCache()) {
@@ -3450,13 +3452,6 @@ static void prepareEngine_helper(QRegExpPrivate *priv)
         priv->matchState.prepareForMatch(priv->eng);
 }
 
-inline static void prepareEngine(QRegExpPrivate *priv)
-{
-    if (priv->eng)
-        return;
-    prepareEngine_helper(priv);
-}
-
 static void prepareEngineForMatch(QRegExpPrivate *priv, const QString &str)
 {
     prepareEngine(priv);