Skip to content
This repository was archived by the owner on Sep 27, 2024. It is now read-only.

Commit c4a7616

Browse files
committed
Replace obsolete QString::SkipEmptyParts
Starting from Qt 5.15, the enum QString::SplitBehavior is obsolete and Qt::SplitBehavior should be used instead. See: https://doc.qt.io/qt-5.15/qstring-obsolete.html#SplitBehavior-enum https://doc.qt.io/qt-5/qt.html#SplitBehaviorFlags-enum
1 parent bab3949 commit c4a7616

File tree

2 files changed

+8
-0
lines changed

2 files changed

+8
-0
lines changed

src/OscapCapabilities.cpp

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,11 @@ void OscapCapabilities::parse(const QString& mmv)
8686
if (lines.size() < 1)
8787
return; // TODO: Throw exception?
8888

89+
#if (QT_VERSION >= QT_VERSION_CHECK(5, 15, 0))
90+
const QStringList firstLine = lines[0].split(' ', Qt::SkipEmptyParts);
91+
#else
8992
const QStringList firstLine = lines[0].split(' ', QString::SkipEmptyParts);
93+
#endif
9094
const QString& versionCandidate = firstLine.last();
9195

9296
if (!versionCandidate.contains(QRegExp("^([0-9]+\\.){2,}[0-9]+$")))

src/RPMOpenHelper.cpp

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,11 @@ RPMOpenHelper::RPMOpenHelper(const QString& path)
5454
static QRegExp tailoringRE("^\\.\\/usr\\/share\\/xml\\/scap\\/[^\\/]+\\/tailoring-xccdf\\.xml+$");
5555
static QRegExp inputRE("^\\.\\/usr\\/share\\/xml\\/scap\\/[^\\/]+\\/[^\\/]+\\-(xccdf|ds)\\.xml+$");
5656

57+
#if (QT_VERSION >= QT_VERSION_CHECK(5, 15, 0))
58+
QStringList lines = proc.getStdErrContents().split('\n', Qt::SkipEmptyParts);
59+
#else
5760
QStringList lines = proc.getStdErrContents().split('\n', QString::SkipEmptyParts);
61+
#endif
5862
for (QStringList::const_iterator it = lines.constBegin(); it != lines.constEnd(); ++it)
5963
{
6064
const QString& line = *it;

0 commit comments

Comments
 (0)