diff options
Diffstat (limited to 'src/quick/items/qquicktextedit_p_p.h')
-rw-r--r-- | src/quick/items/qquicktextedit_p_p.h | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/src/quick/items/qquicktextedit_p_p.h b/src/quick/items/qquicktextedit_p_p.h index 09718cb49a..46d3d5ff6b 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(); @@ -109,8 +112,8 @@ public: QQuickTextEditPrivate() : color(QRgb(0xFF000000)), selectionColor(QRgb(0xFF000080)), selectedTextColor(QRgb(0xFFFFFFFF)) , textMargin(0.0), xoff(0), yoff(0) - , font(sourceFont), cursorComponent(0), cursorItem(0), document(0), control(0) - , quickDocument(0), lastSelectionStart(0), lastSelectionEnd(0), lineCount(0) + , font(sourceFont), cursorComponent(nullptr), cursorItem(nullptr), document(nullptr), control(nullptr) + , quickDocument(nullptr), lastSelectionStart(0), lastSelectionEnd(0), lineCount(0) , hAlign(QQuickTextEdit::AlignLeft), vAlign(QQuickTextEdit::AlignTop) , format(QQuickTextEdit::PlainText), wrapMode(QQuickTextEdit::NoWrap) , renderType(QQuickTextUtil::textRenderType<QQuickTextEdit>()) @@ -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; |