QQuickTextNode: Minor cleanup

Move decorations to QQuickTextNodeEngine, as the only place that uses them.

Change-Id: I7d0b2bf8979bf5d7e447beac02c3419da4edb759
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>

3 files changed, 31 insertions, 33 deletions

diff --git a/src/quick/items/qquicktextnode_p.h b/src/quick/items/qquicktextnode_p.h
index fb30956fea..2969ce9dbc 100644
--- a/src/quick/items/qquicktextnode_p.h
+++ b/src/quick/items/qquicktextnode_p.h
@@ -77,15 +77,6 @@ class QQuickTextNodeEngine;
 class Q_QUICK_PRIVATE_EXPORT QQuickTextNode : public QSGTransformNode
 {
 public:
-    enum Decoration {
-        NoDecoration = 0x0,
-        Underline    = 0x1,
-        Overline     = 0x2,
-        StrikeOut    = 0x4,
-        Background   = 0x8
-    };
-    Q_DECLARE_FLAGS(Decorations, Decoration)
-
     QQuickTextNode(QQuickItem *ownerElement);
     ~QQuickTextNode();
 
diff --git a/src/quick/items/qquicktextnodeengine.cpp b/src/quick/items/qquicktextnodeengine.cpp
index 11249be8c6..4631b2e724 100644
--- a/src/quick/items/qquicktextnodeengine.cpp
+++ b/src/quick/items/qquicktextnodeengine.cpp
@@ -68,7 +68,7 @@ QQuickTextNodeEngine::BinaryTreeNodeKey::BinaryTreeNodeKey(BinaryTreeNode *node)
 QQuickTextNodeEngine::BinaryTreeNode::BinaryTreeNode(const QGlyphRun &g,
                                                      SelectionState selState,
                                                      const QRectF &brect,
-                                                     const QQuickTextNode::Decorations &decs,
+                                                     const Decorations &decs,
                                                      const QColor &c,
                                                      const QColor &bc,
                                                      const QPointF &pos, qreal a)
@@ -90,7 +90,7 @@ QQuickTextNodeEngine::BinaryTreeNode::BinaryTreeNode(const QGlyphRun &g,
 
 
 void QQuickTextNodeEngine::BinaryTreeNode::insert(QVarLengthArray<BinaryTreeNode, 16> *binaryTree, const QGlyphRun &glyphRun, SelectionState selectionState,
-                                             QQuickTextNode::Decorations decorations, const QColor &textColor,
+                                             Decorations decorations, const QColor &textColor,
                                              const QColor &backgroundColor, const QPointF &position)
 {
     QRectF searchRect = glyphRun.boundingRect();
@@ -99,10 +99,10 @@ void QQuickTextNodeEngine::BinaryTreeNode::insert(QVarLengthArray<BinaryTreeNode
     if (qFuzzyIsNull(searchRect.width()) || qFuzzyIsNull(searchRect.height()))
         return;
 
-    decorations |= (glyphRun.underline() ? QQuickTextNode::Underline : QQuickTextNode::NoDecoration);
-    decorations |= (glyphRun.overline()  ? QQuickTextNode::Overline  : QQuickTextNode::NoDecoration);
-    decorations |= (glyphRun.strikeOut() ? QQuickTextNode::StrikeOut : QQuickTextNode::NoDecoration);
-    decorations |= (backgroundColor.isValid() ? QQuickTextNode::Background : QQuickTextNode::NoDecoration);
+    decorations |= (glyphRun.underline() ? Decoration::Underline : Decoration::NoDecoration);
+    decorations |= (glyphRun.overline()  ? Decoration::Overline  : Decoration::NoDecoration);
+    decorations |= (glyphRun.strikeOut() ? Decoration::StrikeOut : Decoration::NoDecoration);
+    decorations |= (backgroundColor.isValid() ? Decoration::Background : Decoration::NoDecoration);
 
     qreal ascent = glyphRun.rawFont().ascent();
     insert(binaryTree, BinaryTreeNode(glyphRun,
@@ -237,7 +237,7 @@ void QQuickTextNodeEngine::processCurrentLine()
     SelectionState currentSelectionState = Unselected;
     QRectF currentRect;
 
-    QQuickTextNode::Decorations currentDecorations = QQuickTextNode::NoDecoration;
+    Decorations currentDecorations = Decoration::NoDecoration;
     qreal underlineOffset = 0.0;
     qreal underlineThickness = 0.0;
 
@@ -271,7 +271,7 @@ void QQuickTextNodeEngine::processCurrentLine()
                 currentSelectionState = node->selectionState;
 
             // Update decorations
-            if (currentDecorations != QQuickTextNode::NoDecoration) {
+            if (currentDecorations != Decoration::NoDecoration) {
                 decorationRect.setY(m_position.y() + m_currentLine.y());
                 decorationRect.setHeight(m_currentLine.height());
 
@@ -279,16 +279,16 @@ void QQuickTextNodeEngine::processCurrentLine()
                     decorationRect.setRight(node->boundingRect.left());
 
                 TextDecoration textDecoration(currentSelectionState, decorationRect, lastColor);
-                if (currentDecorations & QQuickTextNode::Underline)
+                if (currentDecorations & Decoration::Underline)
                     pendingUnderlines.append(textDecoration);
 
-                if (currentDecorations & QQuickTextNode::Overline)
+                if (currentDecorations & Decoration::Overline)
                     pendingOverlines.append(textDecoration);
 
-                if (currentDecorations & QQuickTextNode::StrikeOut)
+                if (currentDecorations & Decoration::StrikeOut)
                     pendingStrikeOuts.append(textDecoration);
 
-                if (currentDecorations & QQuickTextNode::Background)
+                if (currentDecorations & Decoration::Background)
                     m_backgrounds.append(qMakePair(decorationRect, lastBackgroundColor));
             }
 
@@ -344,7 +344,7 @@ void QQuickTextNodeEngine::processCurrentLine()
                 // If previous item(s) had underline and current does not, then we add the
                 // pending lines to the lists and likewise for overlines and strikeouts
                 if (!pendingUnderlines.isEmpty()
-                        && !(node->decorations & QQuickTextNode::Underline)) {
+                        && !(node->decorations & Decoration::Underline)) {
                     addTextDecorations(pendingUnderlines, underlineOffset, underlineThickness);
 
                     pendingUnderlines.clear();
@@ -377,19 +377,19 @@ void QQuickTextNodeEngine::processCurrentLine()
 
                 // Merge current values with previous. Prefer greatest thickness
                 QRawFont rawFont = node->glyphRun.rawFont();
-                if (node->decorations & QQuickTextNode::Underline) {
+                if (node->decorations & Decoration::Underline) {
                     if (rawFont.lineThickness() > underlineThickness) {
                         underlineThickness = rawFont.lineThickness();
                         underlineOffset = rawFont.underlinePosition();
                     }
                 }
 
-                if (node->decorations & QQuickTextNode::Overline) {
+                if (node->decorations & Decoration::Overline) {
                     overlineOffset = -rawFont.ascent();
                     overlineThickness = rawFont.lineThickness();
                 }
 
-                if (node->decorations & QQuickTextNode::StrikeOut) {
+                if (node->decorations & Decoration::StrikeOut) {
                     strikeOutThickness = rawFont.lineThickness();
                     strikeOutOffset = rawFont.ascent() / -3.0;
                 }
@@ -495,7 +495,7 @@ void QQuickTextNodeEngine::addUnselectedGlyphs(const QGlyphRun &glyphRun)
     BinaryTreeNode::insert(&m_currentLineTree,
                            glyphRun,
                            Unselected,
-                           QQuickTextNode::NoDecoration,
+                           Decoration::NoDecoration,
                            m_textColor,
                            m_backgroundColor,
                            m_position);
@@ -507,7 +507,7 @@ void QQuickTextNodeEngine::addSelectedGlyphs(const QGlyphRun &glyphRun)
     BinaryTreeNode::insert(&m_currentLineTree,
                            glyphRun,
                            Selected,
-                           QQuickTextNode::NoDecoration,
+                           Decoration::NoDecoration,
                            m_textColor,
                            m_backgroundColor,
                            m_position);
diff --git a/src/quick/items/qquicktextnodeengine_p.h b/src/quick/items/qquicktextnodeengine_p.h
index 87235344e6..91ed6f4430 100644
--- a/src/quick/items/qquicktextnodeengine_p.h
+++ b/src/quick/items/qquicktextnodeengine_p.h
@@ -68,8 +68,15 @@ QT_BEGIN_NAMESPACE
 // number of nodes, and join decorations in neighbouring items
 
 class QQuickTextNodeEngine {
-
 public:
+    enum Decoration {
+        NoDecoration = 0x0,
+        Underline    = 0x1,
+        Overline     = 0x2,
+        StrikeOut    = 0x4,
+        Background   = 0x8
+    };
+    Q_DECLARE_FLAGS(Decorations, Decoration)
 
     enum SelectionState {
         Unselected,
@@ -79,26 +86,26 @@ public:
     struct BinaryTreeNode {
 
         BinaryTreeNode()
-            : selectionState(Unselected), clipNode(0), decorations(QQuickTextNode::NoDecoration)
+            : selectionState(Unselected), clipNode(0), decorations(Decoration::NoDecoration)
             , ascent(0.0), leftChildIndex(-1), rightChildIndex(-1)
         {
         }
 
         BinaryTreeNode(const QRectF &brect, const QImage &i, SelectionState selState, qreal a)
-            : boundingRect(brect), selectionState(selState), clipNode(0), decorations(QQuickTextNode::NoDecoration)
+            : boundingRect(brect), selectionState(selState), clipNode(0), decorations(Decoration::NoDecoration)
             , image(i), ascent(a), leftChildIndex(-1), rightChildIndex(-1)
         {
         }
 
         BinaryTreeNode(const QGlyphRun &g, SelectionState selState, const QRectF &brect,
-                       const QQuickTextNode::Decorations &decs, const QColor &c, const QColor &bc,
+                       const Decorations &decs, const QColor &c, const QColor &bc,
                        const QPointF &pos, qreal a);
 
         QGlyphRun glyphRun;
         QRectF boundingRect;
         SelectionState selectionState;
         QQuickDefaultClipNode *clipNode;
-        QQuickTextNode::Decorations decorations;
+        Decorations decorations;
         QColor color;
         QColor backgroundColor;
         QPointF position;
@@ -114,7 +121,7 @@ public:
         { insert(binaryTree, BinaryTreeNode(rect, image, selectionState, ascent)); }
 
         static void insert(QVarLengthArray<BinaryTreeNode, 16> *binaryTree, const QGlyphRun &glyphRun, SelectionState selectionState,
-                           QQuickTextNode::Decorations decorations, const QColor &textColor, const QColor &backgroundColor, const QPointF &position);
+                           Decorations decorations, const QColor &textColor, const QColor &backgroundColor, const QPointF &position);
         static void insert(QVarLengthArray<BinaryTreeNode, 16> *binaryTree, const BinaryTreeNode &binaryTreeNode);
         static void inOrder(const QVarLengthArray<BinaryTreeNode, 16> &binaryTree, QVarLengthArray<int> *sortedIndexes, int currentIndex = 0);
     };