API review: QRegExp::numCaptures() -> QRegExp::captureCount()

QRegExp::numCaptures() is marked as obsolete.
Replaced all usage in Qt and test-cases.

Reviewed-by: Andreas Aardal Hanssen

3 files changed, 20 insertions, 20 deletions

diff --git a/tests/auto/qregexp/tst_qregexp.cpp b/tests/auto/qregexp/tst_qregexp.cpp
index 86d831e..e305386 100644
--- a/tests/auto/qregexp/tst_qregexp.cpp
+++ b/tests/auto/qregexp/tst_qregexp.cpp
@@ -628,7 +628,7 @@ void tst_QRegExp::capturedTexts()
     QRegExp rx7("([A-Za-z_])([A-Za-z_0-9]*)");
     rx7.setCaseSensitivity(Qt::CaseSensitive);
     rx7.setPatternSyntax(QRegExp::RegExp);
-    QCOMPARE(rx7.numCaptures(), 2);
+    QCOMPARE(rx7.captureCount(), 2);
 
     int pos = rx7.indexIn("(10 + delta4) * 32");
     QCOMPARE(pos, 6);
@@ -1177,36 +1177,36 @@ void tst_QRegExp::prepareEngineOptimization()
     QCOMPARE(rx1.capturedTexts(), QStringList() << "" << "" << "" << "");
     QCOMPARE(rx1.matchedLength(), -1);
     QCOMPARE(rx1.matchedLength(), -1);
-    QCOMPARE(rx1.numCaptures(), 3);
+    QCOMPARE(rx1.captureCount(), 3);
 
     QCOMPARE(rx1.exactMatch("foo"), true);
     QCOMPARE(rx1.matchedLength(), 3);
     QCOMPARE(rx1.capturedTexts(), QStringList() << "foo" << "f" << "o" << "o");
-    QCOMPARE(rx1.numCaptures(), 3);
+    QCOMPARE(rx1.captureCount(), 3);
     QCOMPARE(rx1.matchedLength(), 3);
     QCOMPARE(rx1.capturedTexts(), QStringList() << "foo" << "f" << "o" << "o");
     QCOMPARE(rx1.pos(3), 2);
 
     QCOMPARE(rx1.exactMatch("foo"), true);
-    QCOMPARE(rx1.numCaptures(), 3);
+    QCOMPARE(rx1.captureCount(), 3);
     QCOMPARE(rx1.matchedLength(), 3);
     QCOMPARE(rx1.capturedTexts(), QStringList() << "foo" << "f" << "o" << "o");
     QCOMPARE(rx1.pos(3), 2);
 
     QRegExp rx2 = rx1;
 
-    QCOMPARE(rx1.numCaptures(), 3);
+    QCOMPARE(rx1.captureCount(), 3);
     QCOMPARE(rx1.matchedLength(), 3);
     QCOMPARE(rx1.capturedTexts(), QStringList() << "foo" << "f" << "o" << "o");
     QCOMPARE(rx1.pos(3), 2);
 
-    QCOMPARE(rx2.numCaptures(), 3);
+    QCOMPARE(rx2.captureCount(), 3);
     QCOMPARE(rx2.matchedLength(), 3);
     QCOMPARE(rx2.capturedTexts(), QStringList() << "foo" << "f" << "o" << "o");
     QCOMPARE(rx2.pos(3), 2);
 
     QCOMPARE(rx1.exactMatch("fo"), true);
-    QCOMPARE(rx1.numCaptures(), 3);
+    QCOMPARE(rx1.captureCount(), 3);
     QCOMPARE(rx1.matchedLength(), 2);
     QCOMPARE(rx1.capturedTexts(), QStringList() << "fo" << "f" << "o" << "");
     QCOMPARE(rx1.pos(2), 1);
@@ -1245,25 +1245,25 @@ void tst_QRegExp::prepareEngineOptimization()
 
     rx11.setPatternSyntax(QRegExp::Wildcard);
     QVERIFY(!rx11.isValid());
-    QCOMPARE(rx11.numCaptures(), 0);
+    QCOMPARE(rx11.captureCount(), 0);
     QCOMPARE(rx11.matchedLength(), -1);
 
     rx11.setPatternSyntax(QRegExp::RegExp);
     QVERIFY(!rx11.isValid());
-    QCOMPARE(rx11.numCaptures(), 0);
+    QCOMPARE(rx11.captureCount(), 0);
     QCOMPARE(rx11.matchedLength(), -1);
 
     rx11.setPattern("(foo)");
     QVERIFY(rx11.isValid());
-    QCOMPARE(rx11.numCaptures(), 1);
+    QCOMPARE(rx11.captureCount(), 1);
     QCOMPARE(rx11.matchedLength(), -1);
 
     QCOMPARE(rx11.indexIn("ofoo"), 1);
-    QCOMPARE(rx11.numCaptures(), 1);
+    QCOMPARE(rx11.captureCount(), 1);
     QCOMPARE(rx11.matchedLength(), 3);
 
     rx11.setPatternSyntax(QRegExp::RegExp);
-    QCOMPARE(rx11.numCaptures(), 1);
+    QCOMPARE(rx11.captureCount(), 1);
     QCOMPARE(rx11.matchedLength(), 3);
 
     /*
@@ -1278,11 +1278,11 @@ void tst_QRegExp::prepareEngineOptimization()
     QCOMPARE(rx11.matchedLength(), 3);
 
     rx11.setPatternSyntax(QRegExp::Wildcard);
-    QCOMPARE(rx11.numCaptures(), 0);
+    QCOMPARE(rx11.captureCount(), 0);
     QCOMPARE(rx11.matchedLength(), -1);
 
     rx11.setPatternSyntax(QRegExp::RegExp);
-    QCOMPARE(rx11.numCaptures(), 1);
+    QCOMPARE(rx11.captureCount(), 1);
     QCOMPARE(rx11.matchedLength(), -1);
 }
 
diff --git a/tests/auto/qscriptengine/tst_qscriptengine.cpp b/tests/auto/qscriptengine/tst_qscriptengine.cpp
index 804534f..8eaad78 100644
--- a/tests/auto/qscriptengine/tst_qscriptengine.cpp
+++ b/tests/auto/qscriptengine/tst_qscriptengine.cpp
@@ -4485,7 +4485,7 @@ void tst_QScriptEngine::qRegExpInport()
     QScriptValue result = func.call(QScriptValue(),  QScriptValueList() << string << rexp);
 
     rx.indexIn(string);
-    for (int i = 0; i <= rx.numCaptures(); i++)  {
+    for (int i = 0; i <= rx.captureCount(); i++)  {
         QCOMPARE(result.property(i).toString(), rx.cap(i));
     }
 }
diff --git a/tests/auto/qtextdocument/tst_qtextdocument.cpp b/tests/auto/qtextdocument/tst_qtextdocument.cpp
index 5237438..1d54409 100644
--- a/tests/auto/qtextdocument/tst_qtextdocument.cpp
+++ b/tests/auto/qtextdocument/tst_qtextdocument.cpp
@@ -1721,21 +1721,21 @@ void tst_QTextDocument::capitalizationHtmlInExport()
 
     const QString smallcaps = doc->toHtml();
     QVERIFY(re.exactMatch(doc->toHtml()));
-    QCOMPARE(re.numCaptures(), 1);
+    QCOMPARE(re.captureCount(), 1);
     QCOMPARE(re.cap(1).trimmed(), QString("font-variant:small-caps;"));
 
     cf.setFontCapitalization(QFont::AllUppercase);
     cursor.mergeCharFormat(cf);
     const QString uppercase = doc->toHtml();
     QVERIFY(re.exactMatch(doc->toHtml()));
-    QCOMPARE(re.numCaptures(), 1);
+    QCOMPARE(re.captureCount(), 1);
     QCOMPARE(re.cap(1).trimmed(), QString("text-transform:uppercase;"));
 
     cf.setFontCapitalization(QFont::AllLowercase);
     cursor.mergeCharFormat(cf);
     const QString lowercase = doc->toHtml();
     QVERIFY(re.exactMatch(doc->toHtml()));
-    QCOMPARE(re.numCaptures(), 1);
+    QCOMPARE(re.captureCount(), 1);
     QCOMPARE(re.cap(1).trimmed(), QString("text-transform:lowercase;"));
 
     doc->setHtml(smallcaps);
@@ -1761,14 +1761,14 @@ void tst_QTextDocument::wordspacingHtmlExport()
     cursor.mergeCharFormat(cf);
 
     QVERIFY(re.exactMatch(doc->toHtml()));
-    QCOMPARE(re.numCaptures(), 1);
+    QCOMPARE(re.captureCount(), 1);
     QCOMPARE(re.cap(1).trimmed(), QString("word-spacing:4px;"));
 
     cf.setFontWordSpacing(-8.5);
     cursor.mergeCharFormat(cf);
 
     QVERIFY(re.exactMatch(doc->toHtml()));
-    QCOMPARE(re.numCaptures(), 1);
+    QCOMPARE(re.captureCount(), 1);
     QCOMPARE(re.cap(1).trimmed(), QString("word-spacing:-8.5px;"));
 }