diff options
author | Marc Mutz <marc.mutz@kdab.com> | 2015-07-05 22:37:40 +0200 |
---|---|---|
committer | Marc Mutz <marc.mutz@kdab.com> | 2016-03-03 16:22:27 +0000 |
commit | 53abb8267bfa4c261a1aa543f1ad50ed0851bcbf (patch) | |
tree | ef7509730372e4d32d7357264252b73728d148fa /src/gui/text/qtextdocumentfragment_p.h | |
parent | e2a7d185647f0aaabb3519f1434161faf3de9857 (diff) |
QtGui: mark some more types as movable/primitive
These are already held in QVectors.
Public API types need to wait until Qt 6, for BC reasons. Even
though Q_RELOCATABLE_TYPE deals with most of them, we lack a way
to mark a type as primitive, but still isStatic - for QList.
Change-Id: I91392b01ae6f94cc847007636e12d4e64c43b2bc
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@theqtcompany.com>
Diffstat (limited to 'src/gui/text/qtextdocumentfragment_p.h')
-rw-r--r-- | src/gui/text/qtextdocumentfragment_p.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/gui/text/qtextdocumentfragment_p.h b/src/gui/text/qtextdocumentfragment_p.h index 4cc4f0429f..56dff01149 100644 --- a/src/gui/text/qtextdocumentfragment_p.h +++ b/src/gui/text/qtextdocumentfragment_p.h @@ -148,6 +148,7 @@ private: int listNode; QPointer<QTextList> list; }; + friend class QTypeInfo<List>; QVector<List> lists; int indent; @@ -187,6 +188,7 @@ private: int row; int column; }; + friend class QTypeInfo<TableCellIterator>; friend struct Table; struct Table @@ -200,6 +202,7 @@ private: TableCellIterator currentCell; int lastIndent; }; + friend class QTypeInfo<Table>; QVector<Table> tables; struct RowColSpanInfo @@ -207,6 +210,7 @@ private: int row, col; int rowSpan, colSpan; }; + friend class QTypeInfo<RowColSpanInfo>; enum WhiteSpace { @@ -227,6 +231,10 @@ private: int currentNodeIdx; const QTextHtmlParserNode *currentNode; }; +Q_DECLARE_TYPEINFO(QTextHtmlImporter::List, Q_MOVABLE_TYPE); +Q_DECLARE_TYPEINFO(QTextHtmlImporter::TableCellIterator, Q_PRIMITIVE_TYPE); +Q_DECLARE_TYPEINFO(QTextHtmlImporter::Table, Q_MOVABLE_TYPE); +Q_DECLARE_TYPEINFO(QTextHtmlImporter::RowColSpanInfo, Q_PRIMITIVE_TYPE); QT_END_NAMESPACE #endif // QT_NO_TEXTHTMLPARSER |