whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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>
bb10
Marc Mutz 2015-06-24 21:22:59 +02:00
parent 2c235303c2
commit 6e42a1ad4e
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/widgets/styles/qstylesheetstyle.cpp
View File

@ -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;
};