Commit dbdb1410 authored by Christoph Cullmann's avatar Christoph Cullmann 🐮
Browse files

fix Qt 5 compile

parent 903abee6
Pipeline #154885 passed with stage
in 2 minutes and 43 seconds
......@@ -104,10 +104,19 @@ void KatePluginSymbolViewerView::parsePhpSymbols(void)
lineWithliterals = line;
// reduce literals to empty strings to not match comments separators in literals
#if (QT_VERSION < QT_VERSION_CHECK(6, 0, 0))
line.replace(literalRegExp, QLatin1String("\\1\\1"));
#else
line = literalRegExp.replaceIn(line, QLatin1String("\\1\\1"));
// kdDebug(13000) << debugBuffer.arg(i, 4).arg("-literals", 10).arg(line);
#endif
// kdDebug(13000) << debugBuffer.arg(i, 4).arg("-literals", 10).arg(line);
#if (QT_VERSION < QT_VERSION_CHECK(6, 0, 0))
line.remove(blockCommentInline);
#else
line = blockCommentInline.removeIn(line);
#endif
// kdDebug(13000) << debugBuffer.arg(i, 4).arg("-comments", 10).arg(line);
// trying to find comments and to remove commented parts
......
......@@ -361,7 +361,11 @@ bool PluginKateXMLCheckView::slotValidate()
// and needs to be ignored then):
QRegExp re("<!--.*-->");
re.setMinimal(true);
#if (QT_VERSION < QT_VERSION_CHECK(6, 0, 0))
text_start.remove(re);
#else
text_start = re.removeIn(text_start);
#endif
QRegExp re_doctype("<!DOCTYPE\\s+(.*)\\s+(?:PUBLIC\\s+[\"'].*[\"']\\s+[\"'](.*)[\"']|SYSTEM\\s+[\"'](.*)[\"'])", Qt::CaseInsensitive);
re_doctype.setMinimal(true);
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment