Skip to content

Commit 904394a

Browse files
committed
Resolve use of Qstring::remove(const QRegExp &) for Qt 6
1 parent 4451102 commit 904394a

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

src/svn.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -1306,7 +1306,7 @@ int SvnRevision::fetchIgnoreProps(QString *ignore, apr_pool_t *pool, const char
13061306
*ignore = QString(prop->data);
13071307
// remove patterns with slashes or backslashes,
13081308
// they didn't match anything in Subversion but would in Git eventually
1309-
ignore->remove(QRegExp("^[^\\r\\n]*[\\\\/][^\\r\\n]*(?:[\\r\\n]|$)|[\\r\\n][^\\r\\n]*[\\\\/][^\\r\\n]*(?=[\\r\\n]|$)"));
1309+
*ignore = QRegExp("^[^\\r\\n]*[\\\\/][^\\r\\n]*(?:[\\r\\n]|$)|[\\r\\n][^\\r\\n]*[\\\\/][^\\r\\n]*(?=[\\r\\n]|$)").removeIn(*ignore);
13101310
// add a slash in front to have the same meaning in Git of only working on the direct children
13111311
*ignore = QRegExp("(^|[\\r\\n])\\s*(?![\\r\\n]|$)").replaceIn(*ignore, "\\1/");
13121312
if (ignore->trimmed().isEmpty()) {
@@ -1323,7 +1323,7 @@ int SvnRevision::fetchIgnoreProps(QString *ignore, apr_pool_t *pool, const char
13231323
QString global_ignore = QString(prop->data);
13241324
// remove patterns with slashes or backslashes,
13251325
// they didn't match anything in Subversion but would in Git eventually
1326-
global_ignore.remove(QRegExp("^[^\\r\\n]*[\\\\/][^\\r\\n]*(?:[\\r\\n]|$)|[\\r\\n][^\\r\\n]*[\\\\/][^\\r\\n]*(?=[\\r\\n]|$)"));
1326+
global_ignore = QRegExp("^[^\\r\\n]*[\\\\/][^\\r\\n]*(?:[\\r\\n]|$)|[\\r\\n][^\\r\\n]*[\\\\/][^\\r\\n]*(?=[\\r\\n]|$)").removeIn(global_ignore);
13271327
if (!global_ignore.trimmed().isEmpty()) {
13281328
ignore->append(global_ignore);
13291329
}

0 commit comments

Comments
 (0)