feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

More Qt 6 porting

Browse Source 
Task-number: QTCREATORBUG-24098
Change-Id: I8d118e75021996127344e75dffe263cebd95a5b8
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
hjk
2020-06-18 09:44:44 +02:00
parent 8eac3fba80
commit 938f81c601
3 changed files with 32 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/libs/utils/consoleprocess.cpp
View File

@@ -34,11 +34,11 @@
#include <QAbstractEventDispatcher> #include <QAbstractEventDispatcher>
#include <QCoreApplication> #include <QCoreApplication>
#include <QCoreApplication>
#include <QDir> #include <QDir>
#include <QFileInfo> #include <QFileInfo>
#include <QLocalServer> #include <QLocalServer>
#include <QLocalSocket> #include <QLocalSocket>
#include <QRegularExpression>
#include <QSettings> #include <QSettings>
#include <QTemporaryFile> #include <QTemporaryFile>
#include <QTimer> #include <QTimer>
@@ -283,8 +283,8 @@ static QString quoteWinArgument(const QString &arg)
QString ret(arg); QString ret(arg);
// Quotes are escaped and their preceding backslashes are doubled. // Quotes are escaped and their preceding backslashes are doubled.
ret.replace(QRegExp(QLatin1String("(\\\\*)\"")), QLatin1String("\\1\\1\\\"")); ret.replace(QRegularExpression("(\\\\*)\""), "\\1\\1\\\"");
if (ret.contains(QRegExp(QLatin1String("\\s")))) { if (ret.contains(QRegularExpression("\\s"))) {
// The argument must not end with a \ since this would be interpreted // The argument must not end with a \ since this would be interpreted
// as escaping the quote -- rather put the \ behind the quote: e.g. // as escaping the quote -- rather put the \ behind the quote: e.g.
// rather use "foo"\ than "foo\" // rather use "foo"\ than "foo\"

64
src/libs/utils/htmldocextractor.cpp
View File

@@ -26,17 +26,9 @@
#include "htmldocextractor.h" #include "htmldocextractor.h"
#include <QStringList> #include <QStringList>
#include <QRegExp> #include <QRegularExpression>
using namespace Utils; namespace Utils {
namespace {
QRegExp createMinimalExp(const QString &pattern) {
QRegExp exp(pattern);
exp.setMinimal(true);
return exp;
}
}
HtmlDocExtractor::HtmlDocExtractor() = default; HtmlDocExtractor::HtmlDocExtractor() = default;
@@ -100,7 +92,7 @@ QString HtmlDocExtractor::getFunctionDescription(const QString &html,
startMark.append(QLatin1String("[overload1]")); startMark.append(QLatin1String("[overload1]"));
} else { } else {
QString complement = mark.right(mark.length() - parenthesis); QString complement = mark.right(mark.length() - parenthesis);
complement.remove(QRegExp(QLatin1String("[\\(\\), ]"))); complement.remove(QRegularExpression("[\\(\\), ]"));
startMark.append(complement); startMark.append(complement);
} }
} }
@@ -115,10 +107,10 @@ QString HtmlDocExtractor::getFunctionDescription(const QString &html,
// So I try to find the link to this property in the list of properties, extract its // So I try to find the link to this property in the list of properties, extract its
// anchor and then follow by the name found. // anchor and then follow by the name found.
const QString &pattern = const QString &pattern =
QString::fromLatin1("<a href=\"[a-z\\.]+#([A-Za-z]+)-prop\">%1</a>").arg(cleanMark); QString("<a href=\"[a-z\\.]+?#([A-Za-z]+?)-prop\">%1</a>").arg(cleanMark);
QRegExp exp = createMinimalExp(pattern); const QRegularExpressionMatch match = QRegularExpression(pattern).match(html);
if (exp.indexIn(html) != -1) { if (match.hasMatch()) {
const QString &prop = exp.cap(1); const QString &prop = match.captured(1);
contents = getClassOrNamespaceMemberDescription(html, contents = getClassOrNamespaceMemberDescription(html,
prop + QLatin1String("-prop"), prop + QLatin1String("-prop"),
prop); prop);
@@ -278,33 +270,32 @@ void HtmlDocExtractor::processOutput(QString *html) const
void HtmlDocExtractor::stripAllHtml(QString *html) void HtmlDocExtractor::stripAllHtml(QString *html)
{ {
html->remove(createMinimalExp(QLatin1String("<.*>"))); html->remove(QRegularExpression("<.*?>"));
} }
void HtmlDocExtractor::stripHeadings(QString *html) void HtmlDocExtractor::stripHeadings(QString *html)
{ {
html->remove(createMinimalExp(QLatin1String("<h\\d{1}.*>|</h\\d{1}>"))); html->remove(QRegularExpression("<h\\d{1}.*?>|</h\\d{1}>"));
} }
void HtmlDocExtractor::stripLinks(QString *html) void HtmlDocExtractor::stripLinks(QString *html)
{ {
html->remove(createMinimalExp(QLatin1String("<a\\s+.*>|</a>"))); html->remove(QRegularExpression("<a\\s.*?>|</a>"));
} }
void HtmlDocExtractor::stripHorizontalLines(QString *html) void HtmlDocExtractor::stripHorizontalLines(QString *html)
{ {
html->remove(createMinimalExp(QLatin1String("<hr\\s+/>"))); html->remove(QRegularExpression("<hr\\s+/>"));
} }
void HtmlDocExtractor::stripDivs(QString *html) void HtmlDocExtractor::stripDivs(QString *html)
{ {
html->remove(createMinimalExp(QLatin1String("<div\\s+.*>|</div>|<div\\s+.*/\\s*>"))); html->remove(QRegularExpression("<div\\s.*?>|</div>|<div\\s.*?/\\s*>"));
} }
void HtmlDocExtractor::stripTagsStyles(QString *html) void HtmlDocExtractor::stripTagsStyles(QString *html)
{ {
const QRegExp &exp = createMinimalExp(QLatin1String("<(.*\\s+)class=\".*\">")); html->replace(QRegularExpression("<(.*?\\s+)class=\".*?\">"), "<\\1>");
html->replace(exp, QLatin1String("<\\1>"));
} }
void HtmlDocExtractor::stripTeletypes(QString *html) void HtmlDocExtractor::stripTeletypes(QString *html)
@@ -315,7 +306,7 @@ void HtmlDocExtractor::stripTeletypes(QString *html)
void HtmlDocExtractor::stripImagens(QString *html) void HtmlDocExtractor::stripImagens(QString *html)
{ {
html->remove(createMinimalExp(QLatin1String("<img.*>"))); html->remove(QRegularExpression("<img.*?>"));
} }
void HtmlDocExtractor::stripBold(QString *html) void HtmlDocExtractor::stripBold(QString *html)
@@ -331,34 +322,35 @@ void HtmlDocExtractor::stripEmptyParagraphs(QString *html)
void HtmlDocExtractor::replaceNonStyledHeadingsForBold(QString *html) void HtmlDocExtractor::replaceNonStyledHeadingsForBold(QString *html)
{ {
const QRegExp &hStart = createMinimalExp(QLatin1String("<h\\d{1}>")); const QRegularExpression hStart("<h\\d{1}>");
const QRegExp &hEnd = createMinimalExp(QLatin1String("</h\\d{1}>")); const QRegularExpression hEnd("</h\\d{1}>");
html->replace(hStart, QLatin1String("<p><b>")); html->replace(hStart, QLatin1String("<p><b>"));
html->replace(hEnd, QLatin1String("</b></p>")); html->replace(hEnd, QLatin1String("</b></p>"));
} }
void HtmlDocExtractor::replaceTablesForSimpleLines(QString *html) void HtmlDocExtractor::replaceTablesForSimpleLines(QString *html)
{ {
html->replace(createMinimalExp(QLatin1String("(?:<p>)?<table.*>")), QLatin1String("<p>")); html->replace(QRegularExpression("(?:<p>)?<table.*?>"), QLatin1String("<p>"));
html->replace(QLatin1String("</table>"), QLatin1String("</p>")); html->replace(QLatin1String("</table>"), QLatin1String("</p>"));
html->remove(createMinimalExp(QLatin1String("<thead.*>"))); html->remove(QRegularExpression("<thead.*?>"));
html->remove(QLatin1String("</thead>")); html->remove(QLatin1String("</thead>"));
html->remove(createMinimalExp(QLatin1String("<tfoot.*>"))); html->remove(QRegularExpression("<tfoot.*?>"));
html->remove(QLatin1String("</tfoot>")); html->remove(QLatin1String("</tfoot>"));
html->remove(createMinimalExp(QLatin1String("<tr.*><th.*>.*</th></tr>"))); html->remove(QRegularExpression("<tr.*?><th.*?>.*?</th></tr>"));
html->replace(QLatin1String("</td><td"), QLatin1String("</td>&nbsp;<td")); html->replace(QLatin1String("</td><td"), QLatin1String("</td>&nbsp;<td"));
html->remove(createMinimalExp(QLatin1String("<td.*><p>"))); html->remove(QRegularExpression("<td.*?><p>"));
html->remove(createMinimalExp(QLatin1String("<td.*>"))); html->remove(QRegularExpression("<td.*?>"));
html->remove(createMinimalExp(QLatin1String("(?:</p>)?</td>"))); html->remove(QRegularExpression("(?:</p>)?</td>"));
html->replace(createMinimalExp(QLatin1String("<tr.*>")), html->replace(QRegularExpression("<tr.*?>"), QLatin1String("&nbsp;&nbsp;&nbsp;&nbsp;"));
QLatin1String("&nbsp;&nbsp;&nbsp;&nbsp;"));
html->replace(QLatin1String("</tr>"), QLatin1String("<br />")); html->replace(QLatin1String("</tr>"), QLatin1String("<br />"));
} }
void HtmlDocExtractor::replaceListsForSimpleLines(QString *html) void HtmlDocExtractor::replaceListsForSimpleLines(QString *html)
{ {
html->remove(createMinimalExp(QLatin1String("<(?:ul|ol).*>"))); html->remove(QRegularExpression("<(?:ul|ol).*?>"));
html->remove(createMinimalExp(QLatin1String("</(?:ul|ol)>"))); html->remove(QRegularExpression("</(?:ul|ol)>"));
html->replace(QLatin1String("<li>"), QLatin1String("&nbsp;&nbsp;&nbsp;&nbsp;")); html->replace(QLatin1String("<li>"), QLatin1String("&nbsp;&nbsp;&nbsp;&nbsp;"));
html->replace(QLatin1String("</li>"), QLatin1String("<br />")); html->replace(QLatin1String("</li>"), QLatin1String("<br />"));
} }
} // namespace Utils

2
src/libs/utils/templateengine.cpp
View File

@@ -138,7 +138,7 @@ bool PreprocessContext::process(const QString &in, QString *out, QString *errorM
reset(); reset();
const QChar newLine = QLatin1Char('\n'); const QChar newLine = QLatin1Char('\n');
const QStringList lines = in.split(newLine, QString::KeepEmptyParts); const QStringList lines = in.split(newLine);
const int lineCount = lines.size(); const int lineCount = lines.size();
bool first = true; bool first = true;
for (int l = 0; l < lineCount; l++) { for (int l = 0; l < lineCount; l++) {