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>

25 files changed, 127 insertions, 160 deletions

diff --git a/src/widgets/styles/qcdestyle.cpp b/src/widgets/styles/qcdestyle.cpp
index dda0aea148..914ea4666d 100644
--- a/src/widgets/styles/qcdestyle.cpp
+++ b/src/widgets/styles/qcdestyle.cpp
@@ -293,12 +293,12 @@ QPalette QCDEStyle::standardPalette() const
 }
 
 /*!
-    \internal
+    \reimp
 */
-QIcon QCDEStyle::standardIconImplementation(StandardPixmap standardIcon, const QStyleOption *opt,
+QIcon QCDEStyle::standardIcon(StandardPixmap standardIcon, const QStyleOption *opt,
                                             const QWidget *widget) const
 {
-    return QMotifStyle::standardIconImplementation(standardIcon, opt, widget);
+    return QMotifStyle::standardIcon(standardIcon, opt, widget);
 }
 
 QT_END_NAMESPACE
diff --git a/src/widgets/styles/qcdestyle.h b/src/widgets/styles/qcdestyle.h
index fa9ec099d5..4f368b2e39 100644
--- a/src/widgets/styles/qcdestyle.h
+++ b/src/widgets/styles/qcdestyle.h
@@ -66,10 +66,8 @@ public:
     void drawPrimitive(PrimitiveElement pe, const QStyleOption *opt, QPainter *p,
                        const QWidget *w = 0) const;
     QPalette standardPalette() const;
-
-protected Q_SLOTS:
-    QIcon standardIconImplementation(StandardPixmap standardIcon, const QStyleOption *opt = 0,
-                                     const QWidget *widget = 0) const;
+    QIcon standardIcon(StandardPixmap standardIcon, const QStyleOption *opt = 0,
+                       const QWidget *widget = 0) const;
 };
 
 #endif // QT_NO_STYLE_CDE
diff --git a/src/widgets/styles/qcleanlooksstyle.cpp b/src/widgets/styles/qcleanlooksstyle.cpp
index 92ff9f936d..209691afdd 100644
--- a/src/widgets/styles/qcleanlooksstyle.cpp
+++ b/src/widgets/styles/qcleanlooksstyle.cpp
@@ -4376,13 +4376,12 @@ QRect QCleanlooksStyle::subElementRect(SubElement sr, const QStyleOption *opt, c
 }
 
 /*!
-    \internal
+    \reimp
 */
-QIcon QCleanlooksStyle::standardIconImplementation(StandardPixmap standardIcon,
-                                                  const QStyleOption *option,
-                                                  const QWidget *widget) const
+QIcon QCleanlooksStyle::standardIcon(StandardPixmap standardIcon, const QStyleOption *option,
+                                     const QWidget *widget) const
 {
-    return QWindowsStyle::standardIconImplementation(standardIcon, option, widget);
+    return QWindowsStyle::standardIcon(standardIcon, option, widget);
 }
 
 /*!
diff --git a/src/widgets/styles/qcleanlooksstyle.h b/src/widgets/styles/qcleanlooksstyle.h
index cd37eadb1e..26cf38350c 100644
--- a/src/widgets/styles/qcleanlooksstyle.h
+++ b/src/widgets/styles/qcleanlooksstyle.h
@@ -82,6 +82,8 @@ public:
     int styleHint(StyleHint hint, const QStyleOption *option = 0, const QWidget *widget = 0,
                   QStyleHintReturn *returnData = 0) const;
     QRect itemPixmapRect(const QRect &r, int flags, const QPixmap &pixmap) 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;
     void drawItemPixmap(QPainter *painter, const QRect &rect,
@@ -95,10 +97,6 @@ public:
     void unpolish(QWidget *widget);
     void unpolish(QApplication *app);
 
-protected Q_SLOTS:
-    QIcon standardIconImplementation(StandardPixmap standardIcon, const QStyleOption *option,
-                                     const QWidget *widget = 0) const;
-
 protected:
     QCleanlooksStyle(QCleanlooksStylePrivate &dd);
 
diff --git a/src/widgets/styles/qcommonstyle.cpp b/src/widgets/styles/qcommonstyle.cpp
index 8e750735f6..e6080c22c4 100644
--- a/src/widgets/styles/qcommonstyle.cpp
+++ b/src/widgets/styles/qcommonstyle.cpp
@@ -5200,8 +5200,8 @@ QPixmap QCommonStyle::standardPixmap(StandardPixmap sp, const QStyleOption *opti
 /*!
     \internal
 */
-QIcon QCommonStyle::standardIconImplementation(StandardPixmap standardIcon, const QStyleOption *option,
-                                               const QWidget *widget) const
+QIcon QCommonStyle::standardIcon(StandardPixmap standardIcon, const QStyleOption *option,
+                                 const QWidget *widget) const
 {
     QIcon icon;
     const bool rtl = (option && option->direction == Qt::RightToLeft) || (!option && QApplication::isRightToLeft());
@@ -5338,17 +5338,17 @@ QIcon QCommonStyle::standardIconImplementation(StandardPixmap standardIcon, cons
                 break;
         case SP_ArrowForward:
             if (rtl)
-                return standardIconImplementation(SP_ArrowLeft, option, widget);
-            return standardIconImplementation(SP_ArrowRight, option, widget);
+                return QCommonStyle::standardIcon(SP_ArrowLeft, option, widget);
+            return QCommonStyle::standardIcon(SP_ArrowRight, option, widget);
         case SP_ArrowBack:
             if (rtl)
-                return standardIconImplementation(SP_ArrowRight, option, widget);
-            return standardIconImplementation(SP_ArrowLeft, option, widget);
+                return QCommonStyle::standardIcon(SP_ArrowRight, option, widget);
+            return QCommonStyle::standardIcon(SP_ArrowLeft, option, widget);
         case SP_FileLinkIcon:
             {
                 QIcon linkIcon = QIcon::fromTheme(QLatin1String("emblem-symbolic-link"));
                 if (!linkIcon.isNull()) {
-                    QIcon baseIcon = standardIconImplementation(SP_FileIcon, option, widget);
+                    QIcon baseIcon = QCommonStyle::standardIcon(SP_FileIcon, option, widget);
                     const QList<QSize> sizes = baseIcon.availableSizes(QIcon::Normal, QIcon::Off);
                     for (int i = 0 ; i < sizes.size() ; ++i) {
                         int size = sizes[i].width();
@@ -5365,7 +5365,7 @@ QIcon QCommonStyle::standardIconImplementation(StandardPixmap standardIcon, cons
             {
                 QIcon linkIcon = QIcon::fromTheme(QLatin1String("emblem-symbolic-link"));
                 if (!linkIcon.isNull()) {
-                    QIcon baseIcon = standardIconImplementation(SP_DirIcon, option, widget);
+                    QIcon baseIcon = QCommonStyle::standardIcon(SP_DirIcon, option, widget);
                     const QList<QSize> sizes = baseIcon.availableSizes(QIcon::Normal, QIcon::Off);
                     for (int i = 0 ; i < sizes.size() ; ++i) {
                         int size = sizes[i].width();
@@ -5493,9 +5493,9 @@ QIcon QCommonStyle::standardIconImplementation(StandardPixmap standardIcon, cons
         icon.addFile(QLatin1String(":/qt-project.org/styles/commonstyle/images/newdirectory-128.png"), QSize(128, 128));
         break;
     case SP_FileDialogBack:
-        return standardIconImplementation(SP_ArrowBack, option, widget);
+        return QCommonStyle::standardIcon(SP_ArrowBack, option, widget);
     case SP_FileDialogToParent:
-        return standardIconImplementation(SP_ArrowUp, option, widget);
+        return QCommonStyle::standardIcon(SP_ArrowUp, option, widget);
     case SP_FileDialogDetailedView:
         icon.addFile(QLatin1String(":/qt-project.org/styles/commonstyle/images/viewdetailed-16.png"), QSize(16, 16));
         icon.addFile(QLatin1String(":/qt-project.org/styles/commonstyle/images/viewdetailed-32.png"), QSize(32, 32));
@@ -5573,12 +5573,12 @@ QIcon QCommonStyle::standardIconImplementation(StandardPixmap standardIcon, cons
         break;
     case SP_ArrowForward:
         if (rtl)
-            return standardIconImplementation(SP_ArrowLeft, option, widget);
-        return standardIconImplementation(SP_ArrowRight, option, widget);
+            return QCommonStyle::standardIcon(SP_ArrowLeft, option, widget);
+        return QCommonStyle::standardIcon(SP_ArrowRight, option, widget);
     case SP_ArrowBack:
         if (rtl)
-            return standardIconImplementation(SP_ArrowRight, option, widget);
-        return standardIconImplementation(SP_ArrowLeft, option, widget);
+            return QCommonStyle::standardIcon(SP_ArrowRight, option, widget);
+        return QCommonStyle::standardIcon(SP_ArrowLeft, option, widget);
     case SP_ArrowLeft:
         icon.addFile(QLatin1String(":/qt-project.org/styles/commonstyle/images/left-16.png"), QSize(16, 16));
         icon.addFile(QLatin1String(":/qt-project.org/styles/commonstyle/images/left-32.png"), QSize(32, 32));
@@ -5767,6 +5767,16 @@ QPixmap QCommonStyle::generatedIconPixmap(QIcon::Mode iconMode, const QPixmap &p
 /*!
   \reimp
 */
+int QCommonStyle::layoutSpacing(QSizePolicy::ControlType /* control1 */, QSizePolicy::ControlType /* control2 */,
+                          Qt::Orientation /* orientation */, const QStyleOption * /* option */,
+                          const QWidget * /* widget */) const
+{
+    return -1;
+}
+
+/*!
+  \reimp
+*/
 void QCommonStyle::polish(QPalette &pal)
 {
     QStyle::polish(pal);
diff --git a/src/widgets/styles/qcommonstyle.h b/src/widgets/styles/qcommonstyle.h
index 6fe7411413..29fd6f9aed 100644
--- a/src/widgets/styles/qcommonstyle.h
+++ b/src/widgets/styles/qcommonstyle.h
@@ -77,11 +77,16 @@ public:
     int styleHint(StyleHint sh, const QStyleOption *opt = 0, const QWidget *w = 0,
                   QStyleHintReturn *shret = 0) const;
 
+    QIcon standardIcon(StandardPixmap standardIcon, const QStyleOption *opt = 0,
+                       const QWidget *widget = 0) const;
     QPixmap standardPixmap(StandardPixmap sp, const QStyleOption *opt = 0,
                            const QWidget *widget = 0) const;
 
     QPixmap generatedIconPixmap(QIcon::Mode iconMode, const QPixmap &pixmap,
                                 const QStyleOption *opt) const;
+    int layoutSpacing(QSizePolicy::ControlType control1, QSizePolicy::ControlType control2,
+                      Qt::Orientation orientation, const QStyleOption *option = 0,
+                      const QWidget *widget = 0) const;
 
     void polish(QPalette &);
     void polish(QApplication *app);
@@ -89,10 +94,6 @@ public:
     void unpolish(QWidget *widget);
     void unpolish(QApplication *application);
 
-protected Q_SLOTS:
-    QIcon standardIconImplementation(StandardPixmap standardIcon, const QStyleOption *opt = 0,
-                                     const QWidget *widget = 0) const;
-
 protected:
     QCommonStyle(QCommonStylePrivate &dd);
 
diff --git a/src/widgets/styles/qgtkstyle.cpp b/src/widgets/styles/qgtkstyle.cpp
index 265d233231..4f9bd03c4a 100644
--- a/src/widgets/styles/qgtkstyle.cpp
+++ b/src/widgets/styles/qgtkstyle.cpp
@@ -3441,16 +3441,16 @@ QPixmap QGtkStyle::standardPixmap(StandardPixmap sp, const QStyleOption *option,
 }
 
 /*!
-    \internal
+    \reimp
 */
-QIcon QGtkStyle::standardIconImplementation(StandardPixmap standardIcon,
-                                                  const QStyleOption *option,
-                                                  const QWidget *widget) const
+QIcon QGtkStyle::standardIcon(StandardPixmap standardIcon,
+                              const QStyleOption *option,
+                              const QWidget *widget) const
 {
     Q_D(const QGtkStyle);
 
     if (!d->isThemeAvailable())
-        return QCleanlooksStyle::standardIconImplementation(standardIcon, option, widget);
+        return QCleanlooksStyle::standardIcon(standardIcon, option, widget);
     switch (standardIcon) {
     case SP_DialogDiscardButton:
         return QGtkPainter::getIcon(GTK_STOCK_DELETE);
@@ -3479,7 +3479,7 @@ QIcon QGtkStyle::standardIconImplementation(StandardPixmap standardIcon,
     case SP_MessageBoxCritical:
         return QGtkPainter::getIcon(GTK_STOCK_DIALOG_ERROR, GTK_ICON_SIZE_DIALOG);
     default:
-        return QCleanlooksStyle::standardIconImplementation(standardIcon, option, widget);
+        return QCleanlooksStyle::standardIcon(standardIcon, option, widget);
     }
 }
 
diff --git a/src/widgets/styles/qgtkstyle.h b/src/widgets/styles/qgtkstyle.h
index 38a6e15db2..b3b6be5974 100644
--- a/src/widgets/styles/qgtkstyle.h
+++ b/src/widgets/styles/qgtkstyle.h
@@ -97,6 +97,8 @@ public:
 
     QSize sizeFromContents(ContentsType type, const QStyleOption *option,
                            const QSize &size, const QWidget *widget) const;
+    QIcon standardIcon(StandardPixmap standardIcon, const QStyleOption *option = 0,
+                       const QWidget *widget = 0) const;
     QPixmap standardPixmap(StandardPixmap sp, const QStyleOption *option,
                            const QWidget *widget) const;
     QPixmap generatedIconPixmap(QIcon::Mode iconMode, const QPixmap &pixmap,
@@ -111,11 +113,6 @@ public:
 
     static bool getGConfBool(const QString &key, bool fallback = 0);
     static QString getGConfString(const QString &key, const QString &fallback = QString());
-
-
-protected Q_SLOTS:
-    QIcon standardIconImplementation(StandardPixmap standardIcon, const QStyleOption *option,
-                                     const QWidget *widget = 0) const;
 };
 
 #endif //!defined(QT_NO_STYLE_QGTK)
diff --git a/src/widgets/styles/qmacstyle.qdoc b/src/widgets/styles/qmacstyle.qdoc
index 89c67d9809..b1f7b24e2e 100644
--- a/src/widgets/styles/qmacstyle.qdoc
+++ b/src/widgets/styles/qmacstyle.qdoc
@@ -235,12 +235,11 @@
     \reimp 
 */
 
-/*! \fn QIcon QMacStyle::standardIconImplementation(StandardPixmap standardIcon, const QStyleOption *opt, const QWidget *widget) const
-    \internal
+/*! \fn QIcon QMacStyle::standardIcon(StandardPixmap standardIcon, const QStyleOption *opt, const QWidget *widget) const
+    \reimp
 */
 
-/*! \fn int QMacStyle::layoutSpacingImplementation(QSizePolicy::ControlType control1, QSizePolicy::ControlType control2, Qt::Orientation orientation, const QStyleOption *option, const QWidget *widget) const
-
-  \internal
+/*! \fn int QMacStyle::layoutSpacing(QSizePolicy::ControlType control1, QSizePolicy::ControlType control2, Qt::Orientation orientation, const QStyleOption *option, const QWidget *widget) const
+    \reimp
 */
 
diff --git a/src/widgets/styles/qmacstyle_mac.h b/src/widgets/styles/qmacstyle_mac.h
index b42f0e36f2..4ec57351e4 100644
--- a/src/widgets/styles/qmacstyle_mac.h
+++ b/src/widgets/styles/qmacstyle_mac.h
@@ -118,14 +118,11 @@ public:
 
     bool event(QEvent *e);
 
-protected Q_SLOTS:
-    QIcon standardIconImplementation(StandardPixmap standardIcon, const QStyleOption *opt = 0,
-                                     const QWidget *widget = 0) const;
-    int layoutSpacingImplementation(QSizePolicy::ControlType control1,
-                                    QSizePolicy::ControlType control2, 
-                                    Qt::Orientation orientation,
-                                    const QStyleOption *option = 0, 
-                                    const QWidget *widget = 0) const;
+    QIcon standardIcon(StandardPixmap standardIcon, const QStyleOption *opt = 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;
 
 private:
     Q_DISABLE_COPY(QMacStyle)
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));
diff --git a/src/widgets/styles/qmotifstyle.cpp b/src/widgets/styles/qmotifstyle.cpp
index 5492632cde..6655f0c12f 100644
--- a/src/widgets/styles/qmotifstyle.cpp
+++ b/src/widgets/styles/qmotifstyle.cpp
@@ -181,12 +181,12 @@ bool QMotifStyle::eventFilter(QObject *o, QEvent *e)
 }
 
 /*!
-    \internal
+    \reimp
 */
-QIcon QMotifStyle::standardIconImplementation(StandardPixmap standardIcon, const QStyleOption *opt,
-                                              const QWidget *widget) const
+QIcon QMotifStyle::standardIcon(StandardPixmap standardIcon, const QStyleOption *opt,
+                                const QWidget *widget) const
 {
-    return QCommonStyle::standardIconImplementation(standardIcon, opt, widget);
+    return QCommonStyle::standardIcon(standardIcon, opt, widget);
 }
 
 /*!
diff --git a/src/widgets/styles/qmotifstyle.h b/src/widgets/styles/qmotifstyle.h
index fa957f392a..7ff46ef398 100644
--- a/src/widgets/styles/qmotifstyle.h
+++ b/src/widgets/styles/qmotifstyle.h
@@ -100,10 +100,8 @@ public:
 
     bool event(QEvent *);
     QPalette standardPalette() const;
-
-protected Q_SLOTS:
-    QIcon standardIconImplementation(StandardPixmap standardIcon, const QStyleOption *opt = 0,
-                                     const QWidget *widget = 0) const;
+    QIcon standardIcon(StandardPixmap standardIcon, const QStyleOption *opt = 0,
+                       const QWidget *widget = 0) const;
 
 protected:
     QPointer<QFocusFrame> focus;
diff --git a/src/widgets/styles/qplastiquestyle.cpp b/src/widgets/styles/qplastiquestyle.cpp
index 5abf669a48..9aef73eb19 100644
--- a/src/widgets/styles/qplastiquestyle.cpp
+++ b/src/widgets/styles/qplastiquestyle.cpp
@@ -5747,12 +5747,12 @@ void QPlastiqueStyle::unpolish(QApplication *app)
 }
 
 /*!
-    \internal
+    \reimp
 */
-QIcon QPlastiqueStyle::standardIconImplementation(StandardPixmap standardIcon, const QStyleOption *option,
-                                                  const QWidget *widget) const
+QIcon QPlastiqueStyle::standardIcon(StandardPixmap standardIcon, const QStyleOption *option,
+                                    const QWidget *widget) const
 {
-    return QWindowsStyle::standardIconImplementation(standardIcon, option, widget);
+    return QWindowsStyle::standardIcon(standardIcon, option, widget);
 }
 
 /*!
@@ -5769,13 +5769,13 @@ QPixmap QPlastiqueStyle::standardPixmap(StandardPixmap standardPixmap, const QSt
 #define CT2(c1, c2) (((uint)c1 << 16) | (uint)c2)
 
 /*!
-    \internal
+    \reimp
 */
-int QPlastiqueStyle::layoutSpacingImplementation(QSizePolicy::ControlType control1,
-                                                 QSizePolicy::ControlType control2,
-                                                 Qt::Orientation orientation,
-                                                 const QStyleOption * /* option */,
-                                                 const QWidget * /* widget */) const
+int QPlastiqueStyle::layoutSpacing(QSizePolicy::ControlType control1,
+                                   QSizePolicy::ControlType control2,
+                                   Qt::Orientation orientation,
+                                   const QStyleOption * /* option */,
+                                   const QWidget * /* widget */) const
 {
     const int ButtonMask = QSizePolicy::ButtonBox | QSizePolicy::PushButton;
 
diff --git a/src/widgets/styles/qplastiquestyle.h b/src/widgets/styles/qplastiquestyle.h
index 3247f66811..cacab6cabd 100644
--- a/src/widgets/styles/qplastiquestyle.h
+++ b/src/widgets/styles/qplastiquestyle.h
@@ -91,14 +91,13 @@ public:
 
     QPalette standardPalette() const;
 
-protected Q_SLOTS:
-    QIcon standardIconImplementation(StandardPixmap standardIcon, const QStyleOption *opt = 0,
-                                     const QWidget *widget = 0) const;
-    int layoutSpacingImplementation(QSizePolicy::ControlType control1,
-                                    QSizePolicy::ControlType control2, 
-                                    Qt::Orientation orientation,
-                                    const QStyleOption *option = 0, 
-                                    const QWidget *widget = 0) const;
+    QIcon standardIcon(StandardPixmap standardIcon, const QStyleOption *opt = 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;
 
 protected:
     bool eventFilter(QObject *watched, QEvent *event);
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();
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)
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
 {
diff --git a/src/widgets/styles/qstylesheetstyle_p.h b/src/widgets/styles/qstylesheetstyle_p.h
index 42a29b82f2..42e1424ff2 100644
--- a/src/widgets/styles/qstylesheetstyle_p.h
+++ b/src/widgets/styles/qstylesheetstyle_p.h
@@ -104,6 +104,8 @@ public:
     QSize sizeFromContents(ContentsType ct, const QStyleOption *opt,
                            const QSize &contentsSize, const QWidget *widget = 0) const;
     QPalette standardPalette() const;
+    QIcon standardIcon(StandardPixmap standardIcon, const QStyleOption *opt = 0,
+                       const QWidget *widget = 0) const;
     QPixmap standardPixmap(StandardPixmap standardPixmap, const QStyleOption *option = 0,
                            const QWidget *w = 0 ) const;
     int layoutSpacing(QSizePolicy::ControlType control1, QSizePolicy::ControlType control2,
@@ -133,15 +135,6 @@ public:
 
     bool styleSheetPalette(const QWidget* w, const QStyleOption* opt, QPalette* pal);
 
-protected Q_SLOTS:
-    QIcon standardIconImplementation(StandardPixmap standardIcon, const QStyleOption *opt = 0,
-                                     const QWidget *widget = 0) const;
-    int layoutSpacingImplementation(QSizePolicy::ControlType control1,
-                                    QSizePolicy::ControlType control2,
-                                    Qt::Orientation orientation,
-                                    const QStyleOption *option = 0,
-                                    const QWidget *widget = 0) const;
-
 protected:
     bool event(QEvent *e);
 
diff --git a/src/widgets/styles/qwindowsstyle.cpp b/src/widgets/styles/qwindowsstyle.cpp
index 51f93fb292..648d60848a 100644
--- a/src/widgets/styles/qwindowsstyle.cpp
+++ b/src/widgets/styles/qwindowsstyle.cpp
@@ -3079,10 +3079,10 @@ QSize QWindowsStyle::sizeFromContents(ContentsType ct, const QStyleOption *opt,
 }
 
 /*!
-    \internal
+    \reimp
 */
-QIcon QWindowsStyle::standardIconImplementation(StandardPixmap standardIcon, const QStyleOption *option,
-                                                const QWidget *widget) const
+QIcon QWindowsStyle::standardIcon(StandardPixmap standardIcon, const QStyleOption *option,
+                                  const QWidget *widget) const
 {
     QIcon icon;
     QPixmap pixmap;
@@ -3209,7 +3209,7 @@ QIcon QWindowsStyle::standardIconImplementation(StandardPixmap standardIcon, con
 #endif
 
     if (icon.isNull())
-        icon = QCommonStyle::standardIconImplementation(standardIcon, option, widget);
+        icon = QCommonStyle::standardIcon(standardIcon, option, widget);
     return icon;
 }
 
diff --git a/src/widgets/styles/qwindowsstyle.h b/src/widgets/styles/qwindowsstyle.h
index 3f0f99dee6..0e0aae1f84 100644
--- a/src/widgets/styles/qwindowsstyle.h
+++ b/src/widgets/styles/qwindowsstyle.h
@@ -86,9 +86,8 @@ public:
     QPixmap standardPixmap(StandardPixmap standardPixmap, const QStyleOption *opt,
                            const QWidget *widget = 0) const;
 
-protected Q_SLOTS:
-    QIcon standardIconImplementation(StandardPixmap standardIcon, const QStyleOption *option,
-                                     const QWidget *widget = 0) const;
+    QIcon standardIcon(StandardPixmap standardIcon, const QStyleOption *option = 0,
+                       const QWidget *widget = 0) const;
 
 protected:
     bool eventFilter(QObject *o, QEvent *e);
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
diff --git a/src/widgets/styles/qwindowsvistastyle.h b/src/widgets/styles/qwindowsvistastyle.h
index 139a125a52..7ca728a50b 100644
--- a/src/widgets/styles/qwindowsvistastyle.h
+++ b/src/widgets/styles/qwindowsvistastyle.h
@@ -74,6 +74,8 @@ public:
     SubControl hitTestComplexControl(ComplexControl control, const QStyleOptionComplex *option,
                                      const QPoint &pos, 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;
     int pixelMetric(PixelMetric metric, const QStyleOption *option = 0, const QWidget *widget = 0) const;
@@ -89,10 +91,6 @@ public:
     bool event(QEvent *event);
     QPalette standardPalette() const;
 
-protected Q_SLOTS:
-    QIcon standardIconImplementation(StandardPixmap standardIcon, const QStyleOption *option,
-                                     const QWidget *widget = 0) const;
-
 private:
     Q_DISABLE_COPY(QWindowsVistaStyle)
     Q_DECLARE_PRIVATE(QWindowsVistaStyle)
diff --git a/src/widgets/styles/qwindowsxpstyle.cpp b/src/widgets/styles/qwindowsxpstyle.cpp
index 599d93e99a..179f28fb99 100644
--- a/src/widgets/styles/qwindowsxpstyle.cpp
+++ b/src/widgets/styles/qwindowsxpstyle.cpp
@@ -3881,14 +3881,14 @@ QPixmap QWindowsXPStyle::standardPixmap(StandardPixmap standardPixmap, const QSt
 }
 
 /*!
-    \internal
+    \reimp
 */
-QIcon QWindowsXPStyle::standardIconImplementation(StandardPixmap standardIcon,
-                                                  const QStyleOption *option,
-                                                  const QWidget *widget) const
+QIcon QWindowsXPStyle::standardIcon(StandardPixmap standardIcon,
+                                    const QStyleOption *option,
+                                    const QWidget *widget) const
 {
     if (!QWindowsXPStylePrivate::useXP()) {
-        return QWindowsStyle::standardIconImplementation(standardIcon, option, widget);
+        return QWindowsStyle::standardIcon(standardIcon, option, widget);
     }
 
     QWindowsXPStylePrivate *d = const_cast<QWindowsXPStylePrivate*>(d_func());
@@ -4006,7 +4006,7 @@ QIcon QWindowsXPStyle::standardIconImplementation(StandardPixmap standardIcon,
         break;
     }
 
-    return QWindowsStyle::standardIconImplementation(standardIcon, option, widget);
+    return QWindowsStyle::standardIcon(standardIcon, option, widget);
 }
 
 /*!
diff --git a/src/widgets/styles/qwindowsxpstyle.h b/src/widgets/styles/qwindowsxpstyle.h
index 6e0eb57688..3de7598df7 100644
--- a/src/widgets/styles/qwindowsxpstyle.h
+++ b/src/widgets/styles/qwindowsxpstyle.h
@@ -85,10 +85,8 @@ public:
     QPalette standardPalette() const;
     QPixmap standardPixmap(StandardPixmap standardIcon, const QStyleOption *option,
                            const QWidget *widget = 0) const;
-
-protected Q_SLOTS:
-    QIcon standardIconImplementation(StandardPixmap standardIcon, const QStyleOption *option,
-                                     const QWidget *widget = 0) const;
+    QIcon standardIcon(StandardPixmap standardIcon, const QStyleOption *option = 0,
+                       const QWidget *widget = 0) const;
 
 private:
     Q_DISABLE_COPY(QWindowsXPStyle)