QQuickTextEdit: Simplify node handling

We don't need to manually manage pointers to nodes as QList can do
that for us.

Change-Id: I0185db2d5909178b3e36c8d1b7921bdbb1858ca6
Reviewed-by: Anton Kudryavtsev <antkudr@mail.ru>
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>

1 files changed, 6 insertions, 8 deletions

diff --git a/src/quick/items/qquicktextedit_p_p.h b/src/quick/items/qquicktextedit_p_p.h
index 09718cb49a..ef2bdfd0ea 100644
--- a/src/quick/items/qquicktextedit_p_p.h
+++ b/src/quick/items/qquicktextedit_p_p.h
@@ -59,6 +59,8 @@
 #include <QtCore/qlist.h>
 #include <private/qlazilyallocated_p.h>
 
+#include <limits>
+
 QT_BEGIN_NAMESPACE
 class QTextLayout;
 class QQuickTextDocumentWithImageResources;
@@ -74,7 +76,8 @@ public:
     typedef QQuickTextEdit Public;
 
     struct Node {
-        explicit Node(int startPos, QQuickTextNode* node)
+        explicit Node(int startPos = std::numeric_limits<int>::max(),
+                      QQuickTextNode *node = nullptr)
             : m_startPos(startPos), m_node(node), m_dirty(false) { }
         QQuickTextNode* textNode() const { return m_node; }
         void moveStartPos(int delta) { Q_ASSERT(m_startPos + delta > 0); m_startPos += delta; }
@@ -87,7 +90,7 @@ public:
         QQuickTextNode* m_node;
         bool m_dirty;
     };
-    typedef QList<Node*>::iterator TextNodeIterator;
+    typedef QList<Node>::iterator TextNodeIterator;
 
     struct ExtraData {
         ExtraData();
@@ -128,11 +131,6 @@ public:
     {
     }
 
-    ~QQuickTextEditPrivate()
-    {
-        qDeleteAll(textNodeMap);
-    }
-
     static QQuickTextEditPrivate *get(QQuickTextEdit *item) {
         return static_cast<QQuickTextEditPrivate *>(QObjectPrivate::get(item)); }
 
@@ -186,7 +184,7 @@ public:
     QQuickTextDocumentWithImageResources *document;
     QQuickTextControl *control;
     QQuickTextDocument *quickDocument;
-    QList<Node*> textNodeMap;
+    QList<Node> textNodeMap;
 
     int lastSelectionStart;
     int lastSelectionEnd;