diff options
Diffstat (limited to 'src/gui/text/qtextdocument_p.h')
-rw-r--r-- | src/gui/text/qtextdocument_p.h | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/src/gui/text/qtextdocument_p.h b/src/gui/text/qtextdocument_p.h index 8601be54d0..1c4edc4329 100644 --- a/src/gui/text/qtextdocument_p.h +++ b/src/gui/text/qtextdocument_p.h @@ -29,7 +29,9 @@ #include "QtCore/qurl.h" #include "QtCore/qvariant.h" +#if QT_CONFIG(cssparser) #include "private/qcssparser_p.h" +#endif #include "private/qfragmentmap_p.h" #include "private/qobject_p.h" #include "private/qtextformat_p.h" @@ -140,7 +142,9 @@ public: void setLayout(QAbstractTextDocumentLayout *layout); - void insert(int pos, const QString &text, int format); + void insert(int pos, QStringView text, int format); + void insert(int pos, QChar c, int format) + { insert(pos, QStringView(&c, 1), format); } void insert(int pos, int strPos, int strLength, int format); int insertBlock(int pos, int blockFormat, int charFormat, QTextUndoCommand::Operation = QTextUndoCommand::MoveCursor); int insertBlock(QChar blockSeparator, int pos, int blockFormat, int charFormat, @@ -243,8 +247,8 @@ private: public: void documentChange(int from, int length); - inline void addCursor(QTextCursorPrivate *c) { cursors.insert(c); } - inline void removeCursor(QTextCursorPrivate *c) { cursors.remove(c); } + void addCursor(QTextCursorPrivate *c); + void removeCursor(QTextCursorPrivate *c); QTextFrame *frameAt(int pos) const; QTextFrame *rootFrame() const; @@ -291,10 +295,7 @@ public: return get(object->document()); } - // Only test the width for 0: - // * setTextWidth(x) leads to height -1, which is valid - // * the default page size of (-1, -1) means size determined from contents, this is valid too - bool canLayout() const { return layoutEnabled && !qIsNull(pageSize.width()); } + bool canLayout() const { return layoutEnabled && !pageSize.isNull(); } private: QTextDocumentPrivate(const QTextDocumentPrivate& m); @@ -355,6 +356,7 @@ public: QString title; QString url; QString cssMedia; + QString frontMatter; qreal indentWidth; qreal documentMargin; QUrl baseUrl; |