AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

QStringList: optimize replaceInStrings

Browse Source 
By first checking if the list has any matches before potentially making
it detach.

Change-Id: I7a42c2910ef6efc45033e562573414a3a9ef972e
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
This commit is contained in:
Ahmad Samir 2023-05-05 19:17:27 +03:00
parent f7ecad0264
commit b0a3cfaf53
2 changed files with 39 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/corelib/text/qstringlist.cpp
View File

@ -363,7 +363,18 @@ QStringList QtPrivate::QStringList_filter(const QStringList *that, const QRegula
void QtPrivate::QStringList_replaceInStrings(QStringList *that, QStringView before, void QtPrivate::QStringList_replaceInStrings(QStringList *that, QStringView before,
QStringView after, Qt::CaseSensitivity cs) QStringView after, Qt::CaseSensitivity cs)
{ {
for (qsizetype i = 0; i < that->size(); ++i) // Before potentially detaching "that" list, check if any string contains "before"
qsizetype i = -1;
for (qsizetype j = 0; j < that->size(); ++j) {
if (that->at(j).contains(before, cs)) {
i = j;
break;
}
}
if (i == -1)
return;
for (; i < that->size(); ++i)
(*that)[i].replace(before.data(), before.size(), after.data(), after.size(), cs); (*that)[i].replace(before.data(), before.size(), after.data(), after.size(), cs);
} }
@ -391,9 +402,21 @@ void QtPrivate::QStringList_replaceInStrings(QStringList *that, QStringView befo
\snippet qstringlist/main.cpp 5 \snippet qstringlist/main.cpp 5
\snippet qstringlist/main.cpp 17 \snippet qstringlist/main.cpp 17
*/ */
void QtPrivate::QStringList_replaceInStrings(QStringList *that, const QRegularExpression &re, const QString &after) void QtPrivate::QStringList_replaceInStrings(QStringList *that, const QRegularExpression &re,
const QString &after)
{ {
for (qsizetype i = 0; i < that->size(); ++i) // Before potentially detaching "that" list, check if any string contains "before"
qsizetype i = -1;
for (qsizetype j = 0; j < that->size(); ++j) {
if (that->at(j).contains(re)) {
i = j;
break;
}
}
if (i == -1)
return;
for (; i < that->size(); ++i)
(*that)[i].replace(re, after); (*that)[i].replace(re, after);
} }
#endif // QT_CONFIG(regularexpression) #endif // QT_CONFIG(regularexpression)

13
tests/auto/corelib/text/qstringlist/tst_qstringlist.cpp
View File

@ -225,6 +225,19 @@ void tst_QStringList::replaceInStrings()
list13.replaceInStrings( QString("a"), QStringView(QString("o")) ); list13.replaceInStrings( QString("a"), QStringView(QString("o")) );
list14 << "olpho" << "beto" << "gommo" << "epsilon"; list14 << "olpho" << "beto" << "gommo" << "epsilon";
QCOMPARE( list11, list12 ); QCOMPARE( list11, list12 );
QStringList list{"alpha", "beta", "gamma"};
QStringList copy = list;
QVERIFY(!copy.isDetached());
// No matches, no detach
copy.replaceInStrings("z", "y");
QVERIFY(!copy.isDetached());
QCOMPARE(copy, list);
copy.replaceInStrings("a", "y");
QVERIFY(copy.isDetached());
QCOMPARE(copy, (QStringList{"ylphy", "bety", "gymmy"}));
} }
void tst_QStringList::contains() void tst_QStringList::contains()