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/qwindowsvistastyle.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/qwindowsvistastyle.cpp')
| -rw-r--r-- | src/widgets/styles/qwindowsvistastyle.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/widgets/styles/qwindowsvistastyle.cpp b/src/widgets/styles/qwindowsvistastyle.cpp index edc5079bde..81f65654ee 100644 --- a/src/widgets/styles/qwindowsvistastyle.cpp +++ b/src/widgets/styles/qwindowsvistastyle.cpp @@ -2709,14 +2709,14 @@ void QWindowsVistaStylePrivate::cleanupTreeViewTheming() } /*! -\internal +\reimp */ -QIcon QWindowsVistaStyle::standardIconImplementation(StandardPixmap standardIcon, - const QStyleOption *option, - const QWidget *widget) const +QIcon QWindowsVistaStyle::standardIcon(StandardPixmap standardIcon, + const QStyleOption *option, + const QWidget *widget) const { if (!QWindowsVistaStylePrivate::useVista()) { - return QWindowsStyle::standardIconImplementation(standardIcon, option, widget); + return QWindowsStyle::standardIcon(standardIcon, option, widget); } QWindowsVistaStylePrivate *d = const_cast<QWindowsVistaStylePrivate *>(d_func()); @@ -2759,7 +2759,7 @@ QIcon QWindowsVistaStyle::standardIconImplementation(StandardPixmap standardIcon default: break; } - return QWindowsXPStyle::standardIconImplementation(standardIcon, option, widget); + return QWindowsXPStyle::standardIcon(standardIcon, option, widget); } QT_END_NAMESPACE |