Merge pull request #266 from jan-cerny/obs

Replace obsolete QString::SkipEmptyParts

Author: matejak

src/OscapCapabilities.cpp

@@ -86,7 +86,11 @@ void OscapCapabilities::parse(const QString& mmv)
     if (lines.size() < 1)
         return; // TODO: Throw exception?
 
+#if (QT_VERSION >= QT_VERSION_CHECK(5, 15, 0))
+    const QStringList firstLine = lines[0].split(' ', Qt::SkipEmptyParts);
+#else
     const QStringList firstLine = lines[0].split(' ', QString::SkipEmptyParts);
+#endif
     const QString& versionCandidate = firstLine.last();
 
     if (!versionCandidate.contains(QRegExp("^([0-9]+\\.){2,}[0-9]+$")))

src/RPMOpenHelper.cpp

@@ -54,7 +54,11 @@ RPMOpenHelper::RPMOpenHelper(const QString& path)
         static QRegExp tailoringRE("^\\.\\/usr\\/share\\/xml\\/scap\\/[^\\/]+\\/tailoring-xccdf\\.xml+$");
         static QRegExp inputRE("^\\.\\/usr\\/share\\/xml\\/scap\\/[^\\/]+\\/[^\\/]+\\-(xccdf|ds)\\.xml+$");
 
+#if (QT_VERSION >= QT_VERSION_CHECK(5, 15, 0))
+        QStringList lines = proc.getStdErrContents().split('\n', Qt::SkipEmptyParts);
+#else
         QStringList lines = proc.getStdErrContents().split('\n', QString::SkipEmptyParts);
+#endif
         for (QStringList::const_iterator it = lines.constBegin(); it != lines.constEnd(); ++it)
         {
             const QString& line = *it;