diff options
| author | J-P Nurmi <j-p.nurmi@nokia.com> | 2012-08-27 13:40:30 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-08-31 18:56:35 +0200 |
| commit | 50e3da79bf15374cc6e2b7a108004a1b7b1c4126 (patch) | |
| tree | 87dac6178330c20a0cdde3b968d0b9b2867c1276 /src/widgets/styles/qstylesheetstyle.cpp | |
| parent | dd299a568b2cf5ee335fcb01020da9032a57f01e (diff) | |
QXxxStyle: override standardIcon() & layoutSpacing()
QStyle::standardIconImplementation() & layoutSpacingImplementation()
are removed, and standardIcon() & layoutSpacing() made pure virtual.
Change-Id: Ibf43323d0cf6c3b6cec4547afe8e826e120f74ba
Reviewed-by: Gabriel de Dietrich <gabriel.dietrich-de@nokia.com>
Diffstat (limited to 'src/widgets/styles/qstylesheetstyle.cpp')
| -rw-r--r-- | src/widgets/styles/qstylesheetstyle.cpp | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/src/widgets/styles/qstylesheetstyle.cpp b/src/widgets/styles/qstylesheetstyle.cpp index 78be5af604..887fa2cbfe 100644 --- a/src/widgets/styles/qstylesheetstyle.cpp +++ b/src/widgets/styles/qstylesheetstyle.cpp @@ -5075,8 +5075,8 @@ static QLatin1String propertyNameForStandardPixmap(QStyle::StandardPixmap sp) } } -QIcon QStyleSheetStyle::standardIconImplementation(StandardPixmap standardIcon, const QStyleOption *opt, - const QWidget *w) const +QIcon QStyleSheetStyle::standardIcon(StandardPixmap standardIcon, const QStyleOption *opt, + const QWidget *w) const { RECURSION_GUARD(return baseStyle()->standardIcon(standardIcon, opt, w)) QString s = propertyNameForStandardPixmap(standardIcon); @@ -5115,15 +5115,6 @@ int QStyleSheetStyle::layoutSpacing(QSizePolicy::ControlType control1, QSizePoli return baseStyle()->layoutSpacing(control1, control2, orientation, option, widget); } -int QStyleSheetStyle::layoutSpacingImplementation(QSizePolicy::ControlType control1 , - QSizePolicy::ControlType control2, - Qt::Orientation orientation, - const QStyleOption * option , - const QWidget * widget) const -{ - return baseStyle()->layoutSpacing(control1, control2, orientation, option, widget); -} - int QStyleSheetStyle::styleHint(StyleHint sh, const QStyleOption *opt, const QWidget *w, QStyleHintReturn *shret) const { |