AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove TableFormat as FormatType from QTextFormat

Browse Source 
The enum value is unused, a QTextTableFormat is actually documented
to have a FormatType of FrameFormat, and isTableFormat() etc. do
the right thing.

Task-number: QTBUG-35114
Change-Id: I2f3305630b92f117c1f89b85460457265e5af126
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
This commit is contained in:
Lars Knoll 2014-01-21 09:07:49 +01:00 committed by The Qt Project
parent 9e6f0f16ab
commit fe3637a70f
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/gui/text/qtextformat.cpp
View File

@ -524,7 +524,7 @@ Q_GUI_EXPORT QDataStream &operator>>(QDataStream &stream, QTextFormat &fmt)
\value BlockFormat The object formats a text block \value BlockFormat The object formats a text block
\value CharFormat The object formats a single character \value CharFormat The object formats a single character
\value ListFormat The object formats a list \value ListFormat The object formats a list
\value TableFormat The object formats a table \omitvalue TableFormat Unused Value, a table's FormatType is FrameFormat.
\value FrameFormat The object formats a frame \value FrameFormat The object formats a frame
\value UserFormat \value UserFormat

2
src/gui/text/qtextformat.h
View File

@ -141,7 +141,9 @@ public:
BlockFormat = 1, BlockFormat = 1,
CharFormat = 2, CharFormat = 2,
ListFormat = 3, ListFormat = 3,
#if QT_DEPRECATED_SINCE(5, 3)
TableFormat = 4, TableFormat = 4,
#endif
FrameFormat = 5, FrameFormat = 5,
UserFormat = 100 UserFormat = 100