Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
KFind
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
1
Issues
1
List
Boards
Labels
Service Desk
Milestones
Merge Requests
2
Merge Requests
2
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Utilities
KFind
Commits
7ae13f7c
Commit
7ae13f7c
authored
Mar 03, 2020
by
Laurent Montel
😁
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Make it compile against qt5.15. SkipEmptyParts is part of Qt::.
parent
b3d99646
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
8 additions
and
0 deletions
+8
-0
src/kquery.cpp
src/kquery.cpp
+8
-0
No files found.
src/kquery.cpp
View file @
7ae13f7c
...
@@ -560,7 +560,11 @@ void KQuery::setRegExp(const QString ®exp, bool caseSensitive)
...
@@ -560,7 +560,11 @@ void KQuery::setRegExp(const QString ®exp, bool caseSensitive)
{
{
QRegExp
*
regExp
=
nullptr
;
QRegExp
*
regExp
=
nullptr
;
QRegExp
sep
(
QStringLiteral
(
";"
));
QRegExp
sep
(
QStringLiteral
(
";"
));
#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0)
const
QStringList
strList
=
regexp
.
split
(
sep
,
QString
::
SkipEmptyParts
);
const
QStringList
strList
=
regexp
.
split
(
sep
,
QString
::
SkipEmptyParts
);
#else
const
QStringList
strList
=
regexp
.
split
(
sep
,
Qt
::
SkipEmptyParts
);
#endif
// QRegExp globChars ("[\\*\\?\\[\\]]", TRUE, FALSE);
// QRegExp globChars ("[\\*\\?\\[\\]]", TRUE, FALSE);
while
(
!
m_regexps
.
isEmpty
())
{
while
(
!
m_regexps
.
isEmpty
())
{
delete
m_regexps
.
takeFirst
();
delete
m_regexps
.
takeFirst
();
...
@@ -610,7 +614,11 @@ void KQuery::slotendProcessLocate(int code, QProcess::ExitStatus)
...
@@ -610,7 +614,11 @@ void KQuery::slotendProcessLocate(int code, QProcess::ExitStatus)
if
(
!
bufferLocate
.
isEmpty
())
{
if
(
!
bufferLocate
.
isEmpty
())
{
QString
str
=
QString
::
fromLocal8Bit
(
bufferLocate
);
QString
str
=
QString
::
fromLocal8Bit
(
bufferLocate
);
bufferLocate
.
clear
();
bufferLocate
.
clear
();
#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0)
slotListEntries
(
str
.
split
(
QLatin1Char
(
'\n'
),
QString
::
SkipEmptyParts
));
slotListEntries
(
str
.
split
(
QLatin1Char
(
'\n'
),
QString
::
SkipEmptyParts
));
#else
slotListEntries
(
str
.
split
(
QLatin1Char
(
'\n'
),
Qt
::
SkipEmptyParts
));
#endif
}
}
}
}
emit
result
(
0
);
emit
result
(
0
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment