Katana_mirror/katie
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/katie.git synced 2025-02-24 10:52:56 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert "avoid temporary copies in QString"

Browse source 
This reverts commit dae8364153.
This commit is contained in:
Ivailo Monev 2021-06-19 20:58:15 +03:00
parent ed371fbd0f
commit a4baf913a0
1 changed files with 19 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
src/core/tools/qstring.cpp
View file

@ -2550,13 +2550,15 @@ struct QStringCapture
*/
QString& QString::replace(const QRegExp &rx, const QString &after)
{
if (isEmpty() && rx.indexIn(*this) == -1)
QRegExp rx2(rx);
if (isEmpty() && rx2.indexIn(*this) == -1)
return *this;
reallocData(d->size);
int index = 0;
const int numCaptures = rx.captureCount();
const int numCaptures = rx2.captureCount();
const int al = after.length();
QRegExp::CaretMode caretMode = QRegExp::CaretAtZero;
@ -2602,21 +2604,21 @@ QString& QString::replace(const QRegExp &rx, const QString &after)
}
while (index <= length()) {
index = rx.indexIn(*this, index, caretMode);
index = rx2.indexIn(*this, index, caretMode);
if (index == -1)
break;
QString after2(after);
for (j = numBackRefs - 1; j >= 0; j--) {
const QStringCapture &capture = captures[j];
after2.replace(capture.pos, capture.len, rx.cap(capture.no));
after2.replace(capture.pos, capture.len, rx2.cap(capture.no));
}
replace(index, rx.matchedLength(), after2);
replace(index, rx2.matchedLength(), after2);
index += after2.length();
// avoid infinite loop on 0-length matches (e.g., QRegExp("[a-z]*"))
if (rx.matchedLength() == 0)
if (rx2.matchedLength() == 0)
++index;
caretMode = QRegExp::CaretWontMatch;
@ -2638,10 +2640,10 @@ QString& QString::replace(const QRegExp &rx, const QString &after)
int pos = 0;
int adjust = 0;
while (pos < 2047) {
index = rx.indexIn(*this, index, caretMode);
index = rx2.indexIn(*this, index, caretMode);
if (index == -1)
break;
int ml = rx.matchedLength();
int ml = rx2.matchedLength();
replacements[pos].pos = index;
replacements[pos++].length = ml;
index += ml;
@ -2794,7 +2796,8 @@ int QString::count(const QStringRef &str, Qt::CaseSensitivity cs) const
*/
int QString::indexOf(const QRegExp& rx, int from) const
{
return rx.indexIn(*this, from);
QRegExp rx2(rx);
return rx2.indexIn(*this, from);
}
/*!
@ -2830,7 +2833,8 @@ int QString::indexOf(QRegExp& rx, int from) const
*/
int QString::lastIndexOf(const QRegExp& rx, int from) const
{
return rx.lastIndexIn(*this, from);
QRegExp rx2(rx);
return rx2.lastIndexIn(*this, from);
}
/*!
@ -2867,11 +2871,12 @@ int QString::lastIndexOf(QRegExp& rx, int from) const
*/
int QString::count(const QRegExp& rx) const
{
QRegExp rx2(rx);
int count = 0;
int index = -1;
int len = length();
while (index < len - 1) { // count overlapping matches
index = rx.indexIn(*this, index + 1);
index = rx2.indexIn(*this, index + 1);
if (index == -1)
break;
count++;
@ -5595,12 +5600,13 @@ QStringList QString::split(const QChar &sep, SplitBehavior behavior, Qt::CaseSen
*/
QStringList QString::split(const QRegExp &rx, SplitBehavior behavior) const
{
QRegExp rx2(rx);
QStringList list;
int start = 0;
int extra = 0;
int end;
while ((end = rx.indexIn(*this, start + extra)) != -1) {
int matchedLen = rx.matchedLength();
while ((end = rx2.indexIn(*this, start + extra)) != -1) {
int matchedLen = rx2.matchedLength();
if (start != end || behavior == KeepEmptyParts)
list.append(mid(start, end - start));
start = end + matchedLen;