1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Extract the entity parsing code to a static function

Browse Source 
This way we can use it from qtdeclarative to parse styled text

Change-Id: Ic888a75a9700558e97b3e743d6d42fda121ddcba
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
This commit is contained in:
Albert Astals Cid 2021-05-28 14:51:34 +02:00
parent eab0bb73a5
commit c3102b1f76
2 changed files with 34 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
src/gui/text/qtexthtmlparser.cpp
View File

@ -800,12 +800,38 @@ void QTextHtmlParser::parseExclamationTag()
}
}
QString QTextHtmlParser::parseEntity(QStringView entity)
{
QChar resolved = resolveEntity(entity);
if (!resolved.isNull())
return QString(resolved);
if (entity.length() > 1 && entity.at(0) == QLatin1Char('#')) {
entity = entity.mid(1); // removing leading #
int base = 10;
bool ok = false;
if (entity.at(0).toLower() == QLatin1Char('x')) { // hex entity?
entity = entity.mid(1);
base = 16;
}
uint uc = entity.toUInt(&ok, base);
if (ok) {
if (uc >= 0x80 && uc < 0x80 + (sizeof(windowsLatin1ExtendedCharacters)/sizeof(windowsLatin1ExtendedCharacters[0])))
uc = windowsLatin1ExtendedCharacters[uc - 0x80];
return QStringView{QChar::fromUcs4(uc)}.toString();
}
}
return {};
}
// parses an entity after "&", and returns it
QString QTextHtmlParser::parseEntity()
{
const int recover = pos;
int entityLen = 0;
QStringView entity;
while (pos < len) {
QChar c = txt.at(pos++);
if (c.isSpace() || pos - recover > 9) {
@ -816,28 +842,10 @@ QString QTextHtmlParser::parseEntity()
++entityLen;
}
if (entityLen) {
entity = QStringView(txt).mid(recover, entityLen);
QChar resolved = resolveEntity(entity);
if (!resolved.isNull())
return QString(resolved);
if (entityLen > 1 && entity.at(0) == QLatin1Char('#')) {
entity = entity.mid(1); // removing leading #
int base = 10;
bool ok = false;
if (entity.at(0).toLower() == QLatin1Char('x')) { // hex entity?
entity = entity.mid(1);
base = 16;
}
uint uc = entity.toUInt(&ok, base);
if (ok) {
if (uc >= 0x80 && uc < 0x80 + (sizeof(windowsLatin1ExtendedCharacters)/sizeof(windowsLatin1ExtendedCharacters[0])))
uc = windowsLatin1ExtendedCharacters[uc - 0x80];
return QStringView{QChar::fromUcs4(uc)}.toString();
}
const QStringView entity = QStringView(txt).mid(recover, entityLen);
const QString parsedEntity = parseEntity(entity);
if (!parsedEntity.isNull()) {
return parsedEntity;
}
}
error:

3
src/gui/text/qtexthtmlparser_p.h
View File

@ -310,6 +310,9 @@ public:
void parse(const QString &text, const QTextDocument *resourceProvider);
static int lookupElement(const QString &element);
Q_GUI_EXPORT static QString parseEntity(QStringView entity);
protected:
QTextHtmlParserNode *newNode(int parent);
QList<QTextHtmlParserNode *> nodes;