Katana_mirror/katie
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/katie.git synced 2025-02-25 03:12:56 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

QTextBlockData and QTextDocumentPrivate cleanup

Browse source 
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
This commit is contained in:
Ivailo Monev 2019-05-13 16:59:02 +00:00
parent 3a8df17f8a
commit 41d7cbb8fd
1 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/gui/text/qtextdocument_p.h
View file

@ -53,7 +53,6 @@
// We mean it. // We mean it.
// //
#include "QtCore/qglobal.h"
#include "QtCore/qstring.h" #include "QtCore/qstring.h"
#include "QtCore/qvector.h" #include "QtCore/qvector.h"
#include "QtCore/qlist.h" #include "QtCore/qlist.h"
@ -103,18 +102,18 @@ class QTextBlockData : public QFragment<3>
{ {
public: public:
inline void initialize() inline void initialize()
{ layout = 0; userData = 0; userState = -1; revision = 0; hidden = 0; } { layout = Q_NULLPTR; userData = Q_NULLPTR; userState = -1; revision = 0; hidden = false; }
void invalidate() const; void invalidate() const;
inline void free() inline void free()
{ delete layout; layout = 0; delete userData; userData = 0; } { delete layout; layout = Q_NULLPTR; delete userData; userData = Q_NULLPTR; }
mutable int format; mutable int format;
// ##### probably store a QTextEngine * here! // ##### probably store a QTextEngine * here!
mutable QTextLayout *layout; mutable QTextLayout *layout;
mutable QTextBlockUserData *userData; mutable QTextBlockUserData *userData;
mutable int userState; mutable int userState;
mutable int revision : 31; mutable int revision;
mutable uint hidden : 1; mutable bool hidden;
}; };
@ -347,9 +346,9 @@ public:
QCss::StyleSheet parsedDefaultStyleSheet; QCss::StyleSheet parsedDefaultStyleSheet;
#endif #endif
int maximumBlockCount; int maximumBlockCount;
uint needsEnsureMaximumBlockCount : 1; bool needsEnsureMaximumBlockCount;
uint inContentsChange : 1; bool inContentsChange;
uint blockCursorAdjustment : 1; bool blockCursorAdjustment;
QSizeF pageSize; QSizeF pageSize;
QString title; QString title;
QString url; QString url;