QTextHtmlParserNode cleanup

Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>

diff --git a/src/gui/text/qtexthtmlparser.cpp b/src/gui/text/qtexthtmlparser.cpp
index e99842c..9c3541b 100644 (file)
--- a/src/gui/text/qtexthtmlparser.cpp
+++ b/src/gui/text/qtexthtmlparser.cpp
@@ -480,7 +480,7 @@ QTextHtmlParserNode::QTextHtmlParserNode()
     : parent(0), id(Html_unknown),
       cssFloat(QTextFrameFormat::InFlow), hasOwnListStyle(false),
       hasCssListIndent(false), isEmptyParagraph(false), isTextFrame(false), isRootFrame(false),
-      displayMode(QTextHtmlElement::DisplayInline), hasHref(false),
+      hasHref(false), displayMode(QTextHtmlElement::DisplayInline),
       listStyle(QTextListFormat::ListStyleUndefined), imageWidth(-1), imageHeight(-1), tableBorder(0),
       tableCellRowSpan(1), tableCellColSpan(1), tableCellSpacing(2), tableCellPadding(0),
       borderBrush(Qt::darkGray), borderStyle(QTextFrameFormat::BorderStyle_Outset),

diff --git a/src/gui/text/qtexthtmlparser_p.h b/src/gui/text/qtexthtmlparser_p.h
index 10af70d..be0c567 100644 (file)
--- a/src/gui/text/qtexthtmlparser_p.h
+++ b/src/gui/text/qtexthtmlparser_p.h
@@ -163,14 +163,14 @@ struct QTextHtmlParserNode {
     QTextHTMLElements id;
     QTextCharFormat charFormat;
     QTextBlockFormat blockFormat;
-    uint cssFloat : 2;
-    uint hasOwnListStyle : 1;
-    uint hasCssListIndent : 1;
-    uint isEmptyParagraph : 1;
-    uint isTextFrame : 1;
-    uint isRootFrame : 1;
-    uint displayMode : 3; // QTextHtmlElement::DisplayMode
-    uint hasHref : 1;
+    QTextFrameFormat::Position cssFloat;
+    bool hasOwnListStyle;
+    bool hasCssListIndent;
+    bool isEmptyParagraph;
+    bool isTextFrame;
+    bool isRootFrame;
+    bool hasHref;
+    QTextHtmlElement::DisplayMode displayMode;
     QTextListFormat::Style listStyle;
     QString textListNumberPrefix;
     QString textListNumberSuffix;