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.h | |
| 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.h')
| -rw-r--r-- | src/widgets/styles/qproxystyle.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/widgets/styles/qproxystyle.h b/src/widgets/styles/qproxystyle.h index 87839e1278..61c2b6cf50 100644 --- a/src/widgets/styles/qproxystyle.h +++ b/src/widgets/styles/qproxystyle.h @@ -80,7 +80,10 @@ public: SubControl hitTestComplexControl(ComplexControl control, const QStyleOptionComplex *option, const QPoint &pos, const QWidget *widget = 0) const; int styleHint(StyleHint hint, const QStyleOption *option = 0, const QWidget *widget = 0, QStyleHintReturn *returnData = 0) const; int pixelMetric(PixelMetric metric, const QStyleOption *option = 0, const QWidget *widget = 0) const; + int layoutSpacing(QSizePolicy::ControlType control1, QSizePolicy::ControlType control2, + Qt::Orientation orientation, const QStyleOption *option = 0, const QWidget *widget = 0) const; + QIcon standardIcon(StandardPixmap standardIcon, const QStyleOption *option = 0, const QWidget *widget = 0) const; QPixmap standardPixmap(StandardPixmap standardPixmap, const QStyleOption *opt, const QWidget *widget = 0) const; QPixmap generatedIconPixmap(QIcon::Mode iconMode, const QPixmap &pixmap, const QStyleOption *opt) const; QPalette standardPalette() const; @@ -95,10 +98,6 @@ public: protected: bool event(QEvent *e); -protected Q_SLOTS: - QIcon standardIconImplementation(StandardPixmap standardIcon, const QStyleOption *option, const QWidget *widget) const; - int layoutSpacingImplementation(QSizePolicy::ControlType control1, QSizePolicy::ControlType control2, - Qt::Orientation orientation, const QStyleOption *option = 0, const QWidget *widget = 0) const; private: Q_DISABLE_COPY(QProxyStyle) Q_DECLARE_PRIVATE(QProxyStyle) |