mirror of
https://bitbucket.org/smil3y/katie.git
synced 2025-02-24 19:02:59 +00:00
QTextBlockData and QTextDocumentPrivate cleanup
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
This commit is contained in:
parent
3a8df17f8a
commit
41d7cbb8fd
1 changed files with 7 additions and 8 deletions
|
@ -53,7 +53,6 @@
|
|||
// We mean it.
|
||||
//
|
||||
|
||||
#include "QtCore/qglobal.h"
|
||||
#include "QtCore/qstring.h"
|
||||
#include "QtCore/qvector.h"
|
||||
#include "QtCore/qlist.h"
|
||||
|
@ -103,18 +102,18 @@ class QTextBlockData : public QFragment<3>
|
|||
{
|
||||
public:
|
||||
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;
|
||||
inline void free()
|
||||
{ delete layout; layout = 0; delete userData; userData = 0; }
|
||||
{ delete layout; layout = Q_NULLPTR; delete userData; userData = Q_NULLPTR; }
|
||||
|
||||
mutable int format;
|
||||
// ##### probably store a QTextEngine * here!
|
||||
mutable QTextLayout *layout;
|
||||
mutable QTextBlockUserData *userData;
|
||||
mutable int userState;
|
||||
mutable int revision : 31;
|
||||
mutable uint hidden : 1;
|
||||
mutable int revision;
|
||||
mutable bool hidden;
|
||||
};
|
||||
|
||||
|
||||
|
@ -347,9 +346,9 @@ public:
|
|||
QCss::StyleSheet parsedDefaultStyleSheet;
|
||||
#endif
|
||||
int maximumBlockCount;
|
||||
uint needsEnsureMaximumBlockCount : 1;
|
||||
uint inContentsChange : 1;
|
||||
uint blockCursorAdjustment : 1;
|
||||
bool needsEnsureMaximumBlockCount;
|
||||
bool inContentsChange;
|
||||
bool blockCursorAdjustment;
|
||||
QSizeF pageSize;
|
||||
QString title;
|
||||
QString url;
|
||||
|
|
Loading…
Add table
Reference in a new issue