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

QTextHtmlParser: remove 317 unneeded relocations

Browse Source 
Same change as in QColor (d38f86e50b01c6dd60f5a97355031e08d6a47d18).

  relocs: -317
  text:  -6480B
  data:  -5088B

(optimized GCC 6.1 Linux AMD64 build)

Change-Id: I647cd327b421caad45a19a14955de9e3aefaefab
Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com>
This commit is contained in:
Marc Mutz 2016-08-19 12:59:09 +02:00
parent 661b10649a
commit 881bda9e6e
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -54,7 +54,7 @@ QT_BEGIN_NAMESPACE
// see also tst_qtextdocumentfragment.cpp // see also tst_qtextdocumentfragment.cpp
#define MAX_ENTITY 258 #define MAX_ENTITY 258
static const struct QTextHtmlEntity { const char *name; quint16 code; } entities[MAX_ENTITY]= { static const struct QTextHtmlEntity { const char name[9]; quint16 code; } entities[]= {
{ "AElig", 0x00c6 }, { "AElig", 0x00c6 },
{ "AMP", 38 }, { "AMP", 38 },
{ "Aacute", 0x00c1 }, { "Aacute", 0x00c1 },
@ -314,6 +314,7 @@ static const struct QTextHtmlEntity { const char *name; quint16 code; } entities
{ "zwj", 0x200d }, { "zwj", 0x200d },
{ "zwnj", 0x200c } { "zwnj", 0x200c }
}; };
Q_STATIC_ASSERT(MAX_ENTITY == sizeof entities / sizeof *entities);
#if defined(Q_CC_MSVC) && _MSC_VER < 1600 #if defined(Q_CC_MSVC) && _MSC_VER < 1600
bool operator<(const QTextHtmlEntity &entity1, const QTextHtmlEntity &entity2) bool operator<(const QTextHtmlEntity &entity1, const QTextHtmlEntity &entity2)

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

@ -138,7 +138,7 @@ enum QTextHTMLElements {
struct QTextHtmlElement struct QTextHtmlElement
{ {
const char *name; const char name[11];
QTextHTMLElements id; QTextHTMLElements id;
enum DisplayMode { DisplayBlock, DisplayInline, DisplayTable, DisplayNone } displayMode; enum DisplayMode { DisplayBlock, DisplayInline, DisplayTable, DisplayNone } displayMode;
}; };