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/qproxystyle.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/qproxystyle.cpp')
| -rw-r--r-- | src/widgets/styles/qproxystyle.cpp | 25 |
1 files changed, 9 insertions, 16 deletions
diff --git a/src/widgets/styles/qproxystyle.cpp b/src/widgets/styles/qproxystyle.cpp index 80124872a6..cb10b1ec59 100644 --- a/src/widgets/styles/qproxystyle.cpp +++ b/src/widgets/styles/qproxystyle.cpp @@ -377,17 +377,10 @@ bool QProxyStyle::event(QEvent *e) subclass. The \a option argument can be used to pass extra information required to find the appropriate icon. The \a widget argument is optional and can also be used to help find the icon. - - \note Because of binary compatibility constraints, standardIcon() - introduced in Qt 4.1 is not virtual. Therefore it must dynamically - detect and call \e this slot. This default implementation simply - calls standardIcon() with the given parameters. - - \sa standardIcon() */ -QIcon QProxyStyle::standardIconImplementation(StandardPixmap standardIcon, - const QStyleOption *option, - const QWidget *widget) const +QIcon QProxyStyle::standardIcon(StandardPixmap standardIcon, + const QStyleOption *option, + const QWidget *widget) const { Q_D (const QProxyStyle); d->ensureBaseStyle(); @@ -404,13 +397,13 @@ QIcon QProxyStyle::standardIconImplementation(StandardPixmap standardIcon, The default implementation returns -1. - \sa layoutSpacing(), combinedLayoutSpacing() + \sa combinedLayoutSpacing() */ -int QProxyStyle::layoutSpacingImplementation(QSizePolicy::ControlType control1, - QSizePolicy::ControlType control2, - Qt::Orientation orientation, - const QStyleOption *option, - const QWidget *widget) const +int QProxyStyle::layoutSpacing(QSizePolicy::ControlType control1, + QSizePolicy::ControlType control2, + Qt::Orientation orientation, + const QStyleOption *option, + const QWidget *widget) const { Q_D (const QProxyStyle); d->ensureBaseStyle(); |