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/qmacstyle_mac.mm | |
| 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/qmacstyle_mac.mm')
| -rw-r--r-- | src/widgets/styles/qmacstyle_mac.mm | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/widgets/styles/qmacstyle_mac.mm b/src/widgets/styles/qmacstyle_mac.mm index 9ab1663385..f71d2534a6 100644 --- a/src/widgets/styles/qmacstyle_mac.mm +++ b/src/widgets/styles/qmacstyle_mac.mm @@ -3028,7 +3028,7 @@ QPixmap QMacStyle::standardPixmap(StandardPixmap standardPixmap, const QStyleOpt return QWindowsStyle::standardPixmap(standardPixmap, opt, widget); recursionGuard = true; - QIcon icon = standardIconImplementation(standardPixmap, opt, widget); + QIcon icon = standardIcon(standardPixmap, opt, widget); recursionGuard = false; int size; switch (standardPixmap) { @@ -6474,12 +6474,12 @@ bool QMacStyle::event(QEvent *e) return false; } -QIcon QMacStyle::standardIconImplementation(StandardPixmap standardIcon, const QStyleOption *opt, - const QWidget *widget) const +QIcon QMacStyle::standardIcon(StandardPixmap standardIcon, const QStyleOption *opt, + const QWidget *widget) const { switch (standardIcon) { default: - return QWindowsStyle::standardIconImplementation(standardIcon, opt, widget); + return QWindowsStyle::standardIcon(standardIcon, opt, widget); case SP_ToolBarHorizontalExtensionButton: case SP_ToolBarVerticalExtensionButton: { QPixmap pixmap(qt_mac_toolbar_ext); @@ -6497,11 +6497,11 @@ QIcon QMacStyle::standardIconImplementation(StandardPixmap standardIcon, const Q } } -int QMacStyle::layoutSpacingImplementation(QSizePolicy::ControlType control1, - QSizePolicy::ControlType control2, - Qt::Orientation orientation, - const QStyleOption *option, - const QWidget *widget) const +int QMacStyle::layoutSpacing(QSizePolicy::ControlType control1, + QSizePolicy::ControlType control2, + Qt::Orientation orientation, + const QStyleOption *option, + const QWidget *widget) const { const int ButtonMask = QSizePolicy::ButtonBox | QSizePolicy::PushButton; bool isMetal = (widget && widget->testAttribute(Qt::WA_MacBrushedMetal)); |