diff options
author | Marc Mutz <marc.mutz@kdab.com> | 2015-06-24 21:22:59 +0200 |
---|---|---|
committer | Marc Mutz <marc.mutz@kdab.com> | 2015-07-16 13:21:24 +0000 |
commit | 6e42a1ad4ee7a259a87a7c8f386d256c104a27df (patch) | |
tree | ee4143db57ddaaf26f8953bfdd11fe748cf96b36 /src/widgets/styles/qstylesheetstyle.cpp | |
parent | 2c235303c2cf303ab0132f75607b044decc3404c (diff) |
QStyleSheetStyle: separate data and functions in QRenderRule
In preparation of marking it movable. For this, it is important to
have a good overview over the data members. Distributing them among
the function members is not helpful for that. Fix.
Change-Id: I29e6e270c698ce32f7e58e083e6205bdba9c1362
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com>
Diffstat (limited to 'src/widgets/styles/qstylesheetstyle.cpp')
-rw-r--r-- | src/widgets/styles/qstylesheetstyle.cpp | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/src/widgets/styles/qstylesheetstyle.cpp b/src/widgets/styles/qstylesheetstyle.cpp index 40b8aaae9a..7b3c7f7717 100644 --- a/src/widgets/styles/qstylesheetstyle.cpp +++ b/src/widgets/styles/qstylesheetstyle.cpp @@ -558,16 +558,22 @@ public: return csz; } + bool hasStyleHint(const QString &sh) const { return styleHints.contains(sh); } + QVariant styleHint(const QString &sh) const { return styleHints.value(sh); } + + void fixupBorder(int); + + // Shouldn't be here + void setClip(QPainter *p, const QRect &rect); + void unsetClip(QPainter *); + +public: int features; QBrush defaultBackground; QFont font; bool hasFont; QHash<QString, QVariant> styleHints; - bool hasStyleHint(const QString& sh) const { return styleHints.contains(sh); } - QVariant styleHint(const QString& sh) const { return styleHints.value(sh); } - - void fixupBorder(int); QSharedDataPointer<QStyleSheetPaletteData> pal; QSharedDataPointer<QStyleSheetBoxData> b; @@ -578,9 +584,6 @@ public: QSharedDataPointer<QStyleSheetPositionData> p; QSharedDataPointer<QStyleSheetImageData> img; - // Shouldn't be here - void setClip(QPainter *p, const QRect &rect); - void unsetClip(QPainter *); int clipset; QPainterPath clipPath; }; |