Changeset 561 for trunk/src/gui/styles/qcleanlooksstyle.cpp

Timestamp:

Feb 11, 2010, 11:19:06 PM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.6.1 sources.

Location:

trunk

Files:

• . (modified) (1 prop)
• src/gui/styles/qcleanlooksstyle.cpp (modified) (108 diffs)

trunk/src/gui/styles/qcleanlooksstyle.cpp

@@ -2 +2 @@
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
@@ -21 +22 @@
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
-** In addition, as a special exception, Nokia gives you certain
-** additional rights. These rights are described in the Nokia Qt LGPL
-** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
-** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
@@ -34 +34 @@
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
-** If you are unsure which license is appropriate for your use, please
-** contact the sales department at qt-sales@nokia.com.
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **
@@ -45 +45 @@
 #if !defined(QT_NO_STYLE_CLEANLOOKS) || defined(QT_PLUGIN)
 
+#include <private/qstylehelper_p.h>
 #include "qwindowsstyle_p.h"
 #include <qcombobox.h>
@@ -73 +74 @@
 QT_BEGIN_NAMESPACE
 
-static const bool UsePixmapCache = true;
+using namespace QStyleHelper;
 
 enum Direction {
@@ -84 +85 @@
 // from windows style
 static const int windowsItemFrame        =  2; // menu item frame width
-static const int windowsSepHeight        =  6; // separator item height
 static const int windowsItemHMargin      =  3; // menu item hor text margin
 static const int windowsItemVMargin      =  8; // menu item ver text margin
-static const int windowsArrowHMargin     =  6; // arrow horizontal margin
-static const int windowsTabSpacing       = 12; // space between text and tab
-static const int windowsCheckMarkHMargin =  2; // horiz. margins of check mark
 static const int windowsRightBorder      = 15; // right border on windows
-static const int windowsCheckMarkWidth   = 12; // checkmarks width on windows
 
 /* XPM */
@@ -462 +458 @@
     "             "};
 
-#ifdef Q_WS_X11
-extern "C" {
-    struct GConfClient;
-    struct GError;
-    typedef void (*Ptr_g_type_init)();
-    typedef GConfClient* (*Ptr_gconf_client_get_default)();
-    typedef char* (*Ptr_gconf_client_get_string)(GConfClient*, const char*, GError **);
-    typedef void (*Ptr_g_object_unref)(void *);
-    typedef void (*Ptr_g_error_free)(GError *);
-    typedef void (*Ptr_g_free)(void*);
-}
-
-static Ptr_g_type_init p_g_type_init = 0;
-static Ptr_gconf_client_get_default p_gconf_client_get_default = 0;
-static Ptr_gconf_client_get_string p_gconf_client_get_string = 0;
-static Ptr_g_object_unref p_g_object_unref = 0;
-static Ptr_g_error_free p_g_error_free = 0;
-static Ptr_g_free p_g_free = 0;
-#endif
-
 static void qt_cleanlooks_draw_gradient(QPainter *painter, const QRect &rect, const QColor &gradientStart,
                                         const QColor &gradientStop, Direction direction = TopDown, QBrush bgBrush = QBrush())
@@ -542 +518 @@
         else {
             int size = horizontal ? rect.width() : rect.height() ;
-            if (size < 1)
-                size = 1;
-            float edge = 4.0/(float)size;
-            gradient->setColorAt(0, gradientStart);
-            gradient->setColorAt(edge, gradientMid.lighter(104));
-            gradient->setColorAt(1.0 - edge, gradientMid.darker(100));
-            gradient->setColorAt(1.0, gradientStop);
+            if (size > 4) {
+                float edge = 4.0/(float)size;
+                gradient->setColorAt(0, gradientStart);
+                gradient->setColorAt(edge, gradientMid.lighter(104));
+                gradient->setColorAt(1.0 - edge, gradientMid.darker(100));
+                gradient->setColorAt(1.0, gradientStop);
+            }
         }
         painter->fillRect(rect, *gradient);
         delete gradient;
-}
-
-static QString uniqueName(const QString &key, const QStyleOption *option, const QSize &size)
-{
-    QString tmp;
-    const QStyleOptionComplex *complexOption = qstyleoption_cast<const QStyleOptionComplex *>(option);
-    tmp.sprintf("%s-%d-%d-%lld-%dx%d-%d", key.toLatin1().constData(), uint(option->state),
-                complexOption ? uint(complexOption->activeSubControls) : uint(0),
-                option->palette.cacheKey(), size.width(), size.height(), option->direction);
-#ifndef QT_NO_SPINBOX
-    if (const QStyleOptionSpinBox *spinBox = qstyleoption_cast<const QStyleOptionSpinBox *>(option)) {
-        tmp.append(QLatin1Char('-'));
-        tmp.append(QString::number(spinBox->buttonSymbols));
-        tmp.append(QLatin1Char('-'));
-        tmp.append(QString::number(spinBox->stepEnabled));
-        tmp.append(QLatin1Char('-'));
-        tmp.append(QLatin1Char(spinBox->frame ? '1' : '0'));
-    }
-#endif // QT_NO_SPINBOX
-    return tmp;
 }
 
@@ -606 +562 @@
 
     painter->setPen(QPen(mdiButtonBorderColor, 1));
-    painter->drawLine(tmp.left() + 2, tmp.top(), tmp.right() - 2, tmp.top());
-    painter->drawLine(tmp.left() + 2, tmp.bottom(), tmp.right() - 2, tmp.bottom());
-    painter->drawLine(tmp.left(), tmp.top() + 2, tmp.left(), tmp.bottom() - 2);
-    painter->drawLine(tmp.right(), tmp.top() + 2, tmp.right(), tmp.bottom() - 2);
-    painter->drawPoint(tmp.left() + 1, tmp.top() + 1);
-    painter->drawPoint(tmp.right() - 1, tmp.top() + 1);
-    painter->drawPoint(tmp.left() + 1, tmp.bottom() - 1);
-    painter->drawPoint(tmp.right() - 1, tmp.bottom() - 1);
+    const QLine lines[4] = {
+        QLine(tmp.left() + 2, tmp.top(), tmp.right() - 2, tmp.top()),
+        QLine(tmp.left() + 2, tmp.bottom(), tmp.right() - 2, tmp.bottom()),
+        QLine(tmp.left(), tmp.top() + 2, tmp.left(), tmp.bottom() - 2),
+        QLine(tmp.right(), tmp.top() + 2, tmp.right(), tmp.bottom() - 2)
+    };
+    painter->drawLines(lines, 4);
+    const QPoint points[4] = {
+        QPoint(tmp.left() + 1, tmp.top() + 1),
+        QPoint(tmp.right() - 1, tmp.top() + 1),
+        QPoint(tmp.left() + 1, tmp.bottom() - 1),
+        QPoint(tmp.right() - 1, tmp.bottom() - 1)
+    };
+    painter->drawPoints(points, 4);
 
     painter->setPen(titleBarHighlight);
@@ -783 +745 @@
             button.QStyleOption::operator=(*option);
             button.state &= ~State_MouseOver;
-            drawPrimitive(PE_IndicatorCheckBox, &button, painter, widget);
+            proxy()->drawPrimitive(PE_IndicatorCheckBox, &button, painter, widget);
         }
         return;
@@ -803 +765 @@
         break;
     case PE_IndicatorButtonDropDown:
-        drawPrimitive(PE_PanelButtonCommand, option, painter, widget);
+        proxy()->drawPrimitive(PE_PanelButtonCommand, option, painter, widget);
         break;
     case PE_IndicatorToolBarSeparator:
@@ -888 +850 @@
             if (widget && widget->inherits("QDockWidgetTitleButton")) {
                    if (option->state & State_MouseOver)
-                       drawPrimitive(PE_PanelButtonCommand, option, painter, widget);
+                       proxy()->drawPrimitive(PE_PanelButtonCommand, option, painter, widget);
             } else {
-                drawPrimitive(PE_PanelButtonCommand, option, painter, widget);
+                proxy()->drawPrimitive(PE_PanelButtonCommand, option, painter, widget);
             }
         }
@@ -903 +865 @@
             else
                 dockWidgetHandle.state |= State_Horizontal;
-            drawControl(CE_Splitter, &dockWidgetHandle, painter, widget);
+            proxy()->drawControl(CE_Splitter, &dockWidgetHandle, painter, widget);
         }
         break;
@@ -929 +891 @@
 #ifdef QT3_SUPPORT
         if (widget && widget->inherits("Q3ToolBar")) {
-            drawPrimitive(PE_Q3Separator, option, painter, widget);
+            proxy()->drawPrimitive(PE_Q3Separator, option, painter, widget);
             break;
         }
@@ -945 +907 @@
             painter->setPen(buttonShadowAlpha);
             painter->drawLine(QPoint(r.left() + 2, r.top() - 1), QPoint(r.right() - 2, r.top() - 1));
-            painter->drawPoint(r.right() - 1, r.top());
-            painter->drawPoint(r.right(), r.top() + 1);
-            painter->drawPoint(r.right() - 1, r.bottom());
-            painter->drawPoint(r.right(), r.bottom() - 1);
-            painter->drawPoint(r.left() + 1, r.top() );
-            painter->drawPoint(r.left(), r.top() + 1);
-            painter->drawPoint(r.left() + 1, r.bottom() );
-            painter->drawPoint(r.left(), r.bottom() - 1);
+            const QPoint points[8] = {
+                QPoint(r.right() - 1, r.top()),
+                QPoint(r.right(), r.top() + 1),
+                QPoint(r.right() - 1, r.bottom()),
+                QPoint(r.right(), r.bottom() - 1),
+                QPoint(r.left() + 1, r.top() ),
+                QPoint(r.left(), r.top() + 1),
+                QPoint(r.left() + 1, r.bottom() ),
+                QPoint(r.left(), r.bottom() - 1)
+            };
+            painter->drawPoints(points, 8);
             painter->setPen(QPen(option->palette.background().color(), 1));
             painter->drawLine(QPoint(r.left() + 2, r.top() + 1), QPoint(r.right() - 2, r.top() + 1));
@@ -984 +949 @@
             painter->drawLine(QPoint(r.right(), r.top() + 2), QPoint(r.right(), r.bottom() - 2));
             painter->drawLine(QPoint(r.left() + 2, r.bottom()), QPoint(r.right() - 2, r.bottom()));
-            painter->drawPoint(QPoint(r.right() - 1, r.bottom() - 1));
-            painter->drawPoint(QPoint(r.right() - 1, r.top() + 1));
-            painter->drawPoint(QPoint(r.left() + 1, r.bottom() - 1));
-            painter->drawPoint(QPoint(r.left() + 1, r.top() + 1));
+            const QPoint points2[4] = {
+                QPoint(r.right() - 1, r.bottom() - 1),
+                QPoint(r.right() - 1, r.top() + 1),
+                QPoint(r.left() + 1, r.bottom() - 1),
+                QPoint(r.left() + 1, r.top() + 1)
+            };
+            painter->drawPoints(points2, 4);
             painter->drawLine(QPoint(r.left() + 2, r.top()), QPoint(r.right() - 2, r.top()));
             painter->setPen(oldPen);
@@ -1085 +1053 @@
             painter->setBrushOrigin(rect.topLeft());
             painter->setPen(Qt::NoPen);
-            painter->drawRect(rect.left(), rect.top(), rect.width(), 1);    // Top
-            painter->drawRect(rect.left(), rect.bottom(), rect.width(), 1); // Bottom
-            painter->drawRect(rect.left(), rect.top(), 1, rect.height());   // Left
-            painter->drawRect(rect.right(), rect.top(), 1, rect.height());  // Right
+            const QRect rects[4] = {
+                QRect(rect.left(), rect.top(), rect.width(), 1),    // Top
+                QRect(rect.left(), rect.bottom(), rect.width(), 1), // Bottom
+                QRect(rect.left(), rect.top(), 1, rect.height()),   // Left
+                QRect(rect.right(), rect.top(), 1, rect.height())   // Right
+            };
+            painter->drawRects(rects, 4);
             painter->restore();
         }
@@ -1110 +1081 @@
                     r = option->rect.adjusted(0, 1, 0, -1);
                     painter->setPen(QPen(Qt::black, 0));
-                    painter->drawLine(QPoint(r.left() + 2, r.top()),
-                                    QPoint(r.right() - 2, r.top()));
-                    painter->drawLine(QPoint(r.left(), r.top() + 2),
-                                    QPoint(r.left(), r.bottom() - 2));
-                    painter->drawLine(QPoint(r.right(), r.top() + 2),
-                                    QPoint(r.right(), r.bottom() - 2));
-                    painter->drawLine(QPoint(r.left() + 2, r.bottom()),
-                                    QPoint(r.right() - 2, r.bottom()));
-                    painter->drawPoint(QPoint(r.right() - 1, r.bottom() - 1));
-                    painter->drawPoint(QPoint(r.right() - 1, r.top() + 1));
-                    painter->drawPoint(QPoint(r.left() + 1, r.bottom() - 1));
-                    painter->drawPoint(QPoint(r.left() + 1, r.top() + 1));
+                    const QLine lines[4] = {
+                        QLine(QPoint(r.left() + 2, r.top()),
+                              QPoint(r.right() - 2, r.top())),
+                        QLine(QPoint(r.left(), r.top() + 2),
+                              QPoint(r.left(), r.bottom() - 2)),
+                        QLine(QPoint(r.right(), r.top() + 2),
+                              QPoint(r.right(), r.bottom() - 2)),
+                        QLine(QPoint(r.left() + 2, r.bottom()),
+                              QPoint(r.right() - 2, r.bottom()))
+                    };
+                    painter->drawLines(lines, 4);
+                    const QPoint points[4] = {
+                        QPoint(r.right() - 1, r.bottom() - 1),
+                        QPoint(r.right() - 1, r.top() + 1),
+                        QPoint(r.left() + 1, r.bottom() - 1),
+                        QPoint(r.left() + 1, r.top() + 1)
+                    };
+                    painter->drawPoints(points, 4);
                     painter->setPen(oldPen);
                 }
@@ -1185 +1162 @@
             p->drawLine(QPoint(r.left() + 2, r.bottom()),
                               QPoint(r.right() - 2, r.bottom()));
-            p->drawPoint(QPoint(r.right() - 1, r.bottom() - 1));
-            p->drawPoint(QPoint(r.right() - 1, r.top() + 1));
-            p->drawPoint(QPoint(r.left() + 1, r.bottom() - 1));
-            p->drawPoint(QPoint(r.left() + 1, r.top() + 1));
+            const QPoint points[4] = {
+                QPoint(r.right() - 1, r.bottom() - 1),
+                QPoint(r.right() - 1, r.top() + 1),
+                QPoint(r.left() + 1, r.bottom() - 1),
+                QPoint(r.left() + 1, r.top() + 1)
+            };
+            p->drawPoints(points, 4);
 
             if (!isDefault && !hasFocus && isEnabled)
@@ -1208 +1188 @@
 
             p->setPen(topShadow);
-            p->drawPoint(QPoint(r.right(), r.top() + 1));
-            p->drawPoint(QPoint(r.right() - 1, r.top() ));
-            p->drawPoint(QPoint(r.right(), r.bottom() - 1));
-            p->drawPoint(QPoint(r.right() - 1, r.bottom() ));
-            p->drawPoint(QPoint(r.left() + 1, r.bottom()));
-            p->drawPoint(QPoint(r.left(), r.bottom() - 1));
-            p->drawPoint(QPoint(r.left() + 1, r.top()));
-            p->drawPoint(QPoint(r.left(), r.top() + 1));
+            const QPoint points2[8] = {
+                QPoint(r.right(), r.top() + 1),
+                QPoint(r.right() - 1, r.top() ),
+                QPoint(r.right(), r.bottom() - 1),
+                QPoint(r.right() - 1, r.bottom() ),
+                QPoint(r.left() + 1, r.bottom()),
+                QPoint(r.left(), r.bottom() - 1),
+                QPoint(r.left() + 1, r.top()),
+                QPoint(r.left(), r.top() + 1)
+            };
+            p->drawPoints(points2, 8);
 
             topShadow.setAlpha(30);
@@ -1228 +1211 @@
                 r.adjust(-1, -1, 1, 1);
                 p->setPen(buttonShadowAlpha.darker(120));
-                p->drawLine(r.topLeft() + QPoint(3, 0), r.topRight() - QPoint(3, 0));
-                p->drawLine(r.bottomLeft() + QPoint(3, 0), r.bottomRight() - QPoint(3, 0));
-                p->drawLine(r.topLeft() + QPoint(0, 3), r.bottomLeft() - QPoint(0, 3));
-                p->drawLine(r.topRight() + QPoint(0, 3), r.bottomRight() - QPoint(0, 3));
-                p->drawPoint(r.topRight() + QPoint(-2, 1));
-                p->drawPoint(r.topRight() + QPoint(-1, 2));
-                p->drawPoint(r.bottomRight() + QPoint(-1, -2));
-                p->drawPoint(r.bottomRight() + QPoint(-2, -1));
-                p->drawPoint(r.topLeft() + QPoint(1, 2));
-                p->drawPoint(r.topLeft() + QPoint(2, 1));
-                p->drawPoint(r.bottomLeft() + QPoint(1, -2));
-                p->drawPoint(r.bottomLeft() + QPoint(2, -1));
+                const QLine lines[4] = {
+                    QLine(r.topLeft() + QPoint(3, 0), r.topRight() - QPoint(3, 0)),
+                    QLine(r.bottomLeft() + QPoint(3, 0), r.bottomRight() - QPoint(3, 0)),
+                    QLine(r.topLeft() + QPoint(0, 3), r.bottomLeft() - QPoint(0, 3)),
+                    QLine(r.topRight() + QPoint(0, 3), r.bottomRight() - QPoint(0, 3))
+                };
+                p->drawLines(lines, 4);
+                const QPoint points3[8] = {
+                    r.topRight() + QPoint(-2, 1),
+                    r.topRight() + QPoint(-1, 2),
+                    r.bottomRight() + QPoint(-1, -2),
+                    r.bottomRight() + QPoint(-2, -1),
+                    r.topLeft() + QPoint(1, 2),
+                    r.topLeft() + QPoint(2, 1),
+                    r.bottomLeft() + QPoint(1, -2),
+                    r.bottomLeft() + QPoint(2, -1)
+                };
+                p->drawPoints(points3, 8);
             }
             painter->setPen(oldPen);
@@ -1258 +1247 @@
             QColor innerShadow = mergedColors(borderColor, option->palette.base().color());
 
-            int borderThickness = pixelMetric(PM_TabBarBaseOverlap, twf, widget);
+            int borderThickness = proxy()->pixelMetric(PM_TabBarBaseOverlap, twf, widget);
             bool reverse = (twf->direction == Qt::RightToLeft);
             QRect tabBarRect;
@@ -1352 +1341 @@
 
             painter->setPen(alphaCornerColor);
-            painter->drawPoint(leftBottomInnerCorner1);
-            painter->drawPoint(leftBottomInnerCorner2);
-            painter->drawPoint(rightBottomInnerCorner1);
-            painter->drawPoint(rightBottomInnerCorner2);
-            painter->drawPoint(leftTopInnerCorner1);
-            painter->drawPoint(leftTopInnerCorner2);
+            const QPoint points[6] = {
+                leftBottomInnerCorner1,
+                leftBottomInnerCorner2,
+                rightBottomInnerCorner1,
+                rightBottomInnerCorner2,
+                leftTopInnerCorner1,
+                leftTopInnerCorner2
+            };
+            painter->drawPoints(points, 6);
         }
 #endif // QT_NO_TABWIDGET
@@ -1371 +1363 @@
                 d->tabBarcloseButtonIcon = standardIcon(SP_DialogCloseButton, option, widget);
             if ((option->state & State_Enabled) && (option->state & State_MouseOver))
-                drawPrimitive(PE_PanelButtonCommand, option, painter, widget);
+                proxy()->drawPrimitive(PE_PanelButtonCommand, option, painter, widget);
             QPixmap pixmap = d->tabBarcloseButtonIcon.pixmap(QSize(16, 16), QIcon::Normal, QIcon::On);
-            drawItemPixmap(painter, option->rect, Qt::AlignCenter, pixmap);
+            proxy()->drawItemPixmap(painter, option->rect, Qt::AlignCenter, pixmap);
         }
         break;
@@ -1544 +1536 @@
                     break;
                 }
-                if (QApplication::layoutDirection() == Qt::RightToLeft) { //reverse layout changes the order of Beginning/end
+                if (toolbar->direction == Qt::RightToLeft) { //reverse layout changes the order of Beginning/end
                     bool tmp = paintLeftBorder;
                     paintRightBorder=paintLeftBorder;
@@ -1650 +1642 @@
                     = painter->fontMetrics().elidedText(dwOpt->title,
                                             Qt::ElideRight, titleRect.width());
-                drawItemText(painter,
+                proxy()->drawItemText(painter,
                              titleRect,
                              Qt::AlignLeft | Qt::AlignVCenter | Qt::TextShowMnemonic, dwOpt->palette,
@@ -1665 +1657 @@
         if (const QStyleOptionHeader *header = qstyleoption_cast<const QStyleOptionHeader *>(option)) {
             QPixmap cache;
-            QString pixmapName = uniqueName(QLatin1String("headersection"), option, option->rect.size());
-            pixmapName += QLatin1String("-") + QString::number(int(header->position));
-            pixmapName += QLatin1String("-") + QString::number(int(header->orientation));
+            QString pixmapName = QStyleHelper::uniqueName(QLatin1String("headersection"), option, option->rect.size());
+            pixmapName += QString::number(- int(header->position));
+            pixmapName += QString::number(- int(header->orientation));
             QRect r = option->rect;
             QColor gradientStopColor;
@@ -1684 +1676 @@
             painter->fillRect(r, gradient);
 
-            if (!UsePixmapCache || !QPixmapCache::find(pixmapName, cache)) {
+            if (!QPixmapCache::find(pixmapName, cache)) {
                 cache = QPixmap(r.size());
                 cache.fill(Qt::transparent);
@@ -1703 +1695 @@
                     cachePainter.drawLine(pixmapRect.topRight() + QPoint(0, 3), pixmapRect.bottomRight() + QPoint(0, -3));                                }
                 cachePainter.end();
-                if (UsePixmapCache)
-                    QPixmapCache::insert(pixmapName, cache);
+                QPixmapCache::insert(pixmapName, cache);
             }
             painter->drawPixmap(r.topLeft(), cache);
@@ -1716 +1707 @@
             QColor borderColor = dark.lighter(110);
             painter->setPen(QPen(borderColor, 0));
-            painter->drawLine(QPoint(rect.left() + 1, rect.top()), QPoint(rect.right() - 1, rect.top()));
-            painter->drawLine(QPoint(rect.left() + 1, rect.bottom()), QPoint(rect.right() - 1, rect.bottom()));
-            painter->drawLine(QPoint(rect.left(), rect.top() + 1), QPoint(rect.left(), rect.bottom() - 1));
-            painter->drawLine(QPoint(rect.right(), rect.top() + 1), QPoint(rect.right(), rect.bottom() - 1));
+            const QLine lines[4] = {
+                QLine(QPoint(rect.left() + 1, rect.top()), QPoint(rect.right() - 1, rect.top())),
+                QLine(QPoint(rect.left() + 1, rect.bottom()), QPoint(rect.right() - 1, rect.bottom())),
+                QLine(QPoint(rect.left(), rect.top() + 1), QPoint(rect.left(), rect.bottom() - 1)),
+                QLine(QPoint(rect.right(), rect.top() + 1), QPoint(rect.right(), rect.bottom() - 1))
+            };
+            painter->drawLines(lines, 4);
             QColor alphaCorner = mergedColors(borderColor, option->palette.background().color());
             QColor innerShadow = mergedColors(borderColor, option->palette.base().color());
@@ -1725 +1719 @@
             //corner smoothing
             painter->setPen(alphaCorner);
-            painter->drawPoint(rect.topRight());
-            painter->drawPoint(rect.topLeft());
-            painter->drawPoint(rect.bottomRight());
-            painter->drawPoint(rect.bottomLeft());
+            const QPoint points[4] = {
+                rect.topRight(),
+                rect.topLeft(),
+                rect.bottomRight(),
+                rect.bottomLeft()
+            };
+            painter->drawPoints(points, 4);
 
             //inner shadow
@@ -1759 +1756 @@
             if (vertical) {
                 rect = QRect(rect.left(), rect.top(), rect.height(), rect.width()); // flip width and height
-                QTransform m;
-                m.translate(rect.height()-1, -1.0);
+                QTransform m = QTransform::fromTranslate(rect.height()-1, -1.0);
                 m.rotate(90.0);
                 painter->setTransform(m, true);
@@ -1767 +1763 @@
             int maxWidth = rect.width() - 4;
             int minWidth = 4;
-                        qint64 progress = (qint64)qMax(bar->progress, bar->minimum); // workaround for bug in QProgressBar
-                        double vc6_workaround = ((progress - qint64(bar->minimum)) / qMax(double(1.0), double(qint64(bar->maximum) - qint64(bar->minimum))) * maxWidth);
-                        int progressBarWidth = (int(vc6_workaround) > minWidth ) ? int(vc6_workaround) : minWidth;
-                        int width = indeterminate ? maxWidth : progressBarWidth;
+            qreal progress = qMax(bar->progress, bar->minimum); // workaround for bug in QProgressBar
+            int progressBarWidth = (progress - bar->minimum) * qreal(maxWidth) / qMax(qreal(1.0), qreal(bar->maximum) - bar->minimum);
+            int width = indeterminate ? maxWidth : qMax(minWidth, progressBarWidth);
 
             bool reverse = (!vertical && (bar->direction == Qt::RightToLeft)) || vertical;
@@ -1855 +1850 @@
 
                 painter->setPen(QPen(highlightOutline, 0));
-                painter->drawLine(QPoint(r.left(), r.top() + 1), QPoint(r.left(), r.bottom()));
-                painter->drawLine(QPoint(r.right(), r.top() + 1), QPoint(r.right(), r.bottom()));
-                painter->drawLine(QPoint(r.left() + 1, r.bottom()), QPoint(r.right() - 1, r.bottom()));
-                painter->drawLine(QPoint(r.left() + 1, r.top()), QPoint(r.right() - 1, r.top()));
+                const QLine lines[4] = {
+                    QLine(QPoint(r.left(), r.top() + 1), QPoint(r.left(), r.bottom())),
+                    QLine(QPoint(r.right(), r.top() + 1), QPoint(r.right(), r.bottom())),
+                    QLine(QPoint(r.left() + 1, r.bottom()), QPoint(r.right() - 1, r.bottom())),
+                    QLine(QPoint(r.left() + 1, r.top()), QPoint(r.right() - 1, r.top()))
+                };
+                painter->drawLines(lines, 4);
 
                 //draw text
@@ -1865 +1863 @@
                 if (!styleHint(SH_UnderlineShortcut, mbi, widget))
                     alignment |= Qt::TextHideMnemonic;
-                drawItemText(painter, item.rect, alignment, mbi->palette, mbi->state & State_Enabled, mbi->text, textRole);
+                proxy()->drawItemText(painter, item.rect, alignment, mbi->palette, mbi->state & State_Enabled, mbi->text, textRole);
             }
 
@@ -1892 +1890 @@
                 if (!menuItem->text.isEmpty()) {
                     painter->setFont(menuItem->font);
-                    drawItemText(painter, menuItem->rect.adjusted(5, 0, -5, 0), Qt::AlignLeft | Qt::AlignVCenter,
+                    proxy()->drawItemText(painter, menuItem->rect.adjusted(5, 0, -5, 0), Qt::AlignLeft | Qt::AlignVCenter,
                                  menuItem->palette, menuItem->state & State_Enabled, menuItem->text,
                                  QPalette::Text);
@@ -1912 +1910 @@
                 r = r.adjusted(-1, 0, 1, 0);
                 painter->setPen(QPen(highlightOutline, 0));
-                painter->drawLine(QPoint(r.left(), r.top() + 1), QPoint(r.left(), r.bottom() - 1));
-                painter->drawLine(QPoint(r.right(), r.top() + 1), QPoint(r.right(), r.bottom() - 1));
-                painter->drawLine(QPoint(r.left() + 1, r.bottom()), QPoint(r.right() - 1, r.bottom()));
-                painter->drawLine(QPoint(r.left() + 1, r.top()), QPoint(r.right() - 1, r.top()));
+                const QLine lines[4] = {
+                    QLine(QPoint(r.left(), r.top() + 1), QPoint(r.left(), r.bottom() - 1)),
+                    QLine(QPoint(r.right(), r.top() + 1), QPoint(r.right(), r.bottom() - 1)),
+                    QLine(QPoint(r.left() + 1, r.bottom()), QPoint(r.right() - 1, r.bottom())),
+                    QLine(QPoint(r.left() + 1, r.top()), QPoint(r.right() - 1, r.top()))
+                };
+                painter->drawLines(lines, 4);
             } else {
                 painter->fillRect(option->rect, menuBackground);
@@ -1996 +1997 @@
                 QPixmap pixmap;
 
-                int smallIconSize = pixelMetric(PM_SmallIconSize, option, widget);
+                int smallIconSize = proxy()->pixelMetric(PM_SmallIconSize, option, widget);
                 QSize iconSize(smallIconSize, smallIconSize);
 #ifndef QT_NO_COMBOBOX
@@ -2022 +2023 @@
                     opt.state |= State_Sunken;
                     opt.rect = vCheckRect;
-                    drawPrimitive(PE_PanelButtonCommand, &opt, painter, widget);
+                    proxy()->drawPrimitive(PE_PanelButtonCommand, &opt, painter, widget);
                 }
                 painter->drawPixmap(pmr.topLeft(), pixmap);
@@ -2055 +2056 @@
                     QRect vShortcutRect = visualRect(opt->direction, menuitem->rect,
                                                      QRect(textRect.topRight(), QPoint(menuitem->rect.right(), textRect.bottom())));
-                    if (dis && !act && styleHint(SH_EtchDisabledText, option, widget)) {
+                    if (dis && !act && proxy()->styleHint(SH_EtchDisabledText, option, widget)) {
                         p->setPen(menuitem->palette.light().color());
                         p->drawText(vShortcutRect.adjusted(1, 1, 1, 1), text_flags, s.mid(t + 1));
@@ -2064 +2065 @@
                 }
                 QFont font = menuitem->font;
+                // font may not have any "hard" flags set. We override
+                // the point size so that when it is resolved against the device, this font will win.
+                // This is mainly to handle cases where someone sets the font on the window
+                // and then the combo inherits it and passes it onward. At that point the resolve mask
+                // is very, very weak. This makes it stonger.
+                font.setPointSizeF(QFontInfo(menuItem->font).pointSizeF());
 
                 if (menuitem->menuItemType == QStyleOptionMenuItem::DefaultItem)
@@ -2069 +2076 @@
 
                 p->setFont(font);
-                if (dis && !act && styleHint(SH_EtchDisabledText, option, widget)) {
+                if (dis && !act && proxy()->styleHint(SH_EtchDisabledText, option, widget)) {
                     p->setPen(menuitem->palette.light().color());
                     p->drawText(vTextRect.adjusted(1, 1, 1, 1), text_flags, s.left(t));
@@ -2092 +2099 @@
                     newMI.palette.setColor(QPalette::ButtonText,
                                            newMI.palette.highlightedText().color());
-                drawPrimitive(arrow, &newMI, painter, widget);
+                proxy()->drawPrimitive(arrow, &newMI, painter, widget);
             }
         }
@@ -2153 +2160 @@
             if (button->features & QStyleOptionButton::HasMenu)
                 ir = ir.adjusted(0, 0, -pixelMetric(PM_MenuButtonIndicator, button, widget), 0);
-            drawItemText(painter, ir, tf, button->palette, (button->state & State_Enabled),
+            proxy()->drawItemText(painter, ir, tf, button->palette, (button->state & State_Enabled),
                          button->text, QPalette::ButtonText);
         }
@@ -2208 +2215 @@
                      && tab->selectedPosition
                      == QStyleOptionTab::PreviousIsSelected));
-            int tabBarAlignment = styleHint(SH_TabBar_Alignment, tab, widget);
+            int tabBarAlignment = proxy()->styleHint(SH_TabBar_Alignment, tab, widget);
             bool leftAligned = (!rtlHorTabs && tabBarAlignment == Qt::AlignLeft)
                                || (rtlHorTabs
@@ -2221 +2228 @@
 
             QColor background = tab->palette.background().color();
-            int borderThinkness = pixelMetric(PM_TabBarBaseOverlap, tab, widget);
+            int borderThinkness = proxy()->pixelMetric(PM_TabBarBaseOverlap, tab, widget);
             if (selected)
                 borderThinkness /= 2;
@@ -2457 +2464 @@
         if (const QStyleOptionSpinBox *spinBox = qstyleoption_cast<const QStyleOptionSpinBox *>(option)) {
             QPixmap cache;
-            QString pixmapName = uniqueName(QLatin1String("spinbox"), spinBox, spinBox->rect.size());
-            if (!UsePixmapCache || !QPixmapCache::find(pixmapName, cache)) {
+            QString pixmapName = QStyleHelper::uniqueName(QLatin1String("spinbox"), spinBox, spinBox->rect.size());
+            if (!QPixmapCache::find(pixmapName, cache)) {
                 cache = QPixmap(spinBox->rect.size());
                 cache.fill(Qt::transparent);
@@ -2474 +2481 @@
                 QStyleOptionSpinBox spinBoxCopy = *spinBox;
                 spinBoxCopy.rect = pixmapRect;
-                QRect upRect = subControlRect(CC_SpinBox, &spinBoxCopy, SC_SpinBoxUp, widget);
-                QRect downRect = subControlRect(CC_SpinBox, &spinBoxCopy, SC_SpinBoxDown, widget);
-
-                int fw = spinBoxCopy.frame ? pixelMetric(PM_SpinBoxFrameWidth, &spinBoxCopy, widget) : 0;
+                QRect upRect = proxy()->subControlRect(CC_SpinBox, &spinBoxCopy, SC_SpinBoxUp, widget);
+                QRect downRect = proxy()->subControlRect(CC_SpinBox, &spinBoxCopy, SC_SpinBoxDown, widget);
+
+                int fw = spinBoxCopy.frame ? proxy()->pixelMetric(PM_SpinBoxFrameWidth, &spinBoxCopy, widget) : 0;
                 cachePainter.fillRect(rect.adjusted(1, qMax(fw - 1, 0), -1, -fw),
                                       option->palette.base());
@@ -2489 +2496 @@
 
                     // antialias corners
-                    cachePainter.drawPoint(QPoint(r.right(), r.top() + 1));
-                    cachePainter.drawPoint(QPoint(r.right() - 1, r.top() ));
-                    cachePainter.drawPoint(QPoint(r.right(), r.bottom() - 1));
-                    cachePainter.drawPoint(QPoint(r.right() - 1, r.bottom() ));
-                    cachePainter.drawPoint(QPoint(r.left() + 1, r.bottom()));
-                    cachePainter.drawPoint(QPoint(r.left(), r.bottom() - 1));
-                    cachePainter.drawPoint(QPoint(r.left() + 1, r.top()));
-                    cachePainter.drawPoint(QPoint(r.left(), r.top() + 1));
+                    const QPoint points[8] = {
+                        QPoint(r.right(), r.top() + 1),
+                        QPoint(r.right() - 1, r.top() ),
+                        QPoint(r.right(), r.bottom() - 1),
+                        QPoint(r.right() - 1, r.bottom() ),
+                        QPoint(r.left() + 1, r.bottom()),
+                        QPoint(r.left(), r.bottom() - 1),
+                        QPoint(r.left() + 1, r.top()),
+                        QPoint(r.left(), r.top() + 1)
+                    };
+                    cachePainter.drawPoints(points, 8);
 
                     // draw frame
@@ -2524 +2534 @@
 
                     // top and bottom lines
-                    cachePainter.drawLine(QPoint(r.left() + 2, r.bottom()), QPoint(r.right()- 2, r.bottom()));
-                    cachePainter.drawLine(QPoint(r.left() + 2, r.top()), QPoint(r.right() - 2, r.top()));
-                    cachePainter.drawLine(QPoint(r.right(), r.top() + 2), QPoint(r.right(), r.bottom() - 2));
-                    cachePainter.drawLine(QPoint(r.left(), r.top() + 2), QPoint(r.left(), r.bottom() - 2));
+                    const QLine lines[4] = {
+                        QLine(QPoint(r.left() + 2, r.bottom()), QPoint(r.right()- 2, r.bottom())),
+                        QLine(QPoint(r.left() + 2, r.top()), QPoint(r.right() - 2, r.top())),
+                        QLine(QPoint(r.right(), r.top() + 2), QPoint(r.right(), r.bottom() - 2)),
+                        QLine(QPoint(r.left(), r.top() + 2), QPoint(r.left(), r.bottom() - 2))
+                    };
+                    cachePainter.drawLines(lines, 4);
                 }
 
@@ -2561 +2574 @@
                 if (spinBox->frame) {
                     // rounded corners
-                    cachePainter.drawPoint(QPoint(r.left() + 1, r.bottom() - 1));
-                    cachePainter.drawPoint(QPoint(r.left() + 1, r.top() + 1));
-                    cachePainter.drawPoint(QPoint(r.right() - 1, r.bottom() - 1));
-                    cachePainter.drawPoint(QPoint(r.right() - 1, r.top() + 1));
+                    const QPoint points[4] = {
+                        QPoint(r.left() + 1, r.bottom() - 1),
+                        QPoint(r.left() + 1, r.top() + 1),
+                        QPoint(r.right() - 1, r.bottom() - 1),
+                        QPoint(r.right() - 1, r.top() + 1)
+                    };
+                    cachePainter.drawPoints(points, 4);
 
                     if (option->state & State_HasFocus) {
@@ -2573 +2589 @@
                             cachePainter.drawRect(rect.adjusted(1, 2, -3 -downRect.width(), -3));
                             cachePainter.setPen(QPen(darkoutline, 0));
-                            cachePainter.drawLine(QPoint(r.left() + 2, r.bottom()), QPoint(r.right()- downRect.width() - 1, r.bottom()));
-                            cachePainter.drawLine(QPoint(r.left() + 2, r.top()), QPoint(r.right() - downRect.width() - 1, r.top()));
-                            cachePainter.drawLine(QPoint(r.right() - downRect.width() - 1, r.top() + 1), QPoint(r.right()- downRect.width() - 1, r.bottom() - 1));
-                            cachePainter.drawLine(QPoint(r.left(), r.top() + 2), QPoint(r.left(), r.bottom() - 2));
+                            const QLine lines[4] = {
+                                QLine(QPoint(r.left() + 2, r.bottom()), QPoint(r.right()- downRect.width() - 1, r.bottom())),
+                                QLine(QPoint(r.left() + 2, r.top()), QPoint(r.right() - downRect.width() - 1, r.top())),
+                                QLine(QPoint(r.right() - downRect.width() - 1, r.top() + 1), QPoint(r.right()- downRect.width() - 1, r.bottom() - 1)),
+                                QLine(QPoint(r.left(), r.top() + 2), QPoint(r.left(), r.bottom() - 2))
+                            };
+                            cachePainter.drawLines(lines, 4);
                             cachePainter.drawPoint(QPoint(r.left() + 1, r.bottom() - 1));
                             cachePainter.drawPoint(QPoint(r.left() + 1, r.top() + 1));
@@ -2675 +2694 @@
                 }
                 cachePainter.end();
-                if (UsePixmapCache)
-                    QPixmapCache::insert(pixmapName, cache);
+                QPixmapCache::insert(pixmapName, cache);
             }
             painter->drawPixmap(spinBox->rect.topLeft(), cache);
@@ -2700 +2718 @@
                 QStyleOptionDockWidgetV2 dockwidget;
                 dockwidget.QStyleOption::operator=(*option);
-                drawControl(CE_DockWidgetTitle, &dockwidget, painter, widget);
+                proxy()->drawControl(CE_DockWidgetTitle, &dockwidget, painter, widget);
             } else
 #endif // QT3_SUPPORT
@@ -2722 +2740 @@
                 painter->drawLine(fullRect.left() + 5, fullRect.top(), fullRect.right() - 5, fullRect.top());
                 painter->drawLine(fullRect.left(), fullRect.top() + 4, fullRect.left(), fullRect.bottom());
-                painter->drawPoint(fullRect.left() + 4, fullRect.top() + 1);
-                painter->drawPoint(fullRect.left() + 3, fullRect.top() + 1);
-                painter->drawPoint(fullRect.left() + 2, fullRect.top() + 2);
-                painter->drawPoint(fullRect.left() + 1, fullRect.top() + 3);
-                painter->drawPoint(fullRect.left() + 1, fullRect.top() + 4);
+                const QPoint points[5] = {
+                    QPoint(fullRect.left() + 4, fullRect.top() + 1),
+                    QPoint(fullRect.left() + 3, fullRect.top() + 1),
+                    QPoint(fullRect.left() + 2, fullRect.top() + 2),
+                    QPoint(fullRect.left() + 1, fullRect.top() + 3),
+                    QPoint(fullRect.left() + 1, fullRect.top() + 4)
+                };
+                painter->drawPoints(points, 5);
 
                 painter->drawLine(fullRect.right(), fullRect.top() + 4, fullRect.right(), fullRect.bottom());
-                painter->drawPoint(fullRect.right() - 3, fullRect.top() + 1);
-                painter->drawPoint(fullRect.right() - 4, fullRect.top() + 1);
-                painter->drawPoint(fullRect.right() - 2, fullRect.top() + 2);
-                painter->drawPoint(fullRect.right() - 1, fullRect.top() + 3);
-                painter->drawPoint(fullRect.right() - 1, fullRect.top() + 4);
+                const QPoint points2[5] = {
+                    QPoint(fullRect.right() - 3, fullRect.top() + 1),
+                    QPoint(fullRect.right() - 4, fullRect.top() + 1),
+                    QPoint(fullRect.right() - 2, fullRect.top() + 2),
+                    QPoint(fullRect.right() - 1, fullRect.top() + 3),
+                    QPoint(fullRect.right() - 1, fullRect.top() + 4)
+                };
+                painter->drawPoints(points2, 5);
 
                 // draw bottomline
@@ -2743 +2767 @@
             }
             // draw title
-            QRect textRect = subControlRect(CC_TitleBar, titleBar, SC_TitleBarLabel, widget);
+            QRect textRect = proxy()->subControlRect(CC_TitleBar, titleBar, SC_TitleBarLabel, widget);
             QFont font = painter->font();
             font.setBold(true);
@@ -2758 +2782 @@
             if ((titleBar->subControls & SC_TitleBarMinButton) && (titleBar->titleBarFlags & Qt::WindowMinimizeButtonHint) &&
                 !(titleBar->titleBarState& Qt::WindowMinimized)) {
-                QRect minButtonRect = subControlRect(CC_TitleBar, titleBar, SC_TitleBarMinButton, widget);
+                QRect minButtonRect = proxy()->subControlRect(CC_TitleBar, titleBar, SC_TitleBarMinButton, widget);
                 if (minButtonRect.isValid()) {
                     bool hover = (titleBar->activeSubControls & SC_TitleBarMinButton) && (titleBar->state & State_MouseOver);
@@ -2779 +2803 @@
             if ((titleBar->subControls & SC_TitleBarMaxButton) && (titleBar->titleBarFlags & Qt::WindowMaximizeButtonHint) &&
                 !(titleBar->titleBarState & Qt::WindowMaximized)) {
-                QRect maxButtonRect = subControlRect(CC_TitleBar, titleBar, SC_TitleBarMaxButton, widget);
+                QRect maxButtonRect = proxy()->subControlRect(CC_TitleBar, titleBar, SC_TitleBarMaxButton, widget);
                 if (maxButtonRect.isValid()) {
                     bool hover = (titleBar->activeSubControls & SC_TitleBarMaxButton) && (titleBar->state & State_MouseOver);
@@ -2792 +2816 @@
                                     maxButtonIconRect.right() - 1, maxButtonIconRect.top() + 1);
                     painter->setPen(textAlphaColor);
-                    painter->drawPoint(maxButtonIconRect.topLeft());
-                    painter->drawPoint(maxButtonIconRect.topRight());
-                    painter->drawPoint(maxButtonIconRect.bottomLeft());
-                    painter->drawPoint(maxButtonIconRect.bottomRight());
+                    const QPoint points[4] = {
+                        maxButtonIconRect.topLeft(),
+                        maxButtonIconRect.topRight(),
+                        maxButtonIconRect.bottomLeft(),
+                        maxButtonIconRect.bottomRight()
+                    };
+                    painter->drawPoints(points, 4);
                 }
             }
@@ -2801 +2828 @@
             // close button
             if ((titleBar->subControls & SC_TitleBarCloseButton) && (titleBar->titleBarFlags & Qt::WindowSystemMenuHint)) {
-                QRect closeButtonRect = subControlRect(CC_TitleBar, titleBar, SC_TitleBarCloseButton, widget);
+                QRect closeButtonRect = proxy()->subControlRect(CC_TitleBar, titleBar, SC_TitleBarCloseButton, widget);
                 if (closeButtonRect.isValid()) {
                     bool hover = (titleBar->activeSubControls & SC_TitleBarCloseButton) && (titleBar->state & State_MouseOver);
@@ -2808 +2835 @@
                     QRect closeIconRect = closeButtonRect.adjusted(buttonMargin, buttonMargin, -buttonMargin, -buttonMargin);
                     painter->setPen(textAlphaColor);
-                    painter->drawLine(closeIconRect.left() + 1, closeIconRect.top(),
-                                    closeIconRect.right(), closeIconRect.bottom() - 1);
-                    painter->drawLine(closeIconRect.left(), closeIconRect.top() + 1,
-                                    closeIconRect.right() - 1, closeIconRect.bottom());
-                    painter->drawLine(closeIconRect.right() - 1, closeIconRect.top(),
-                                    closeIconRect.left(), closeIconRect.bottom() - 1);
-                    painter->drawLine(closeIconRect.right(), closeIconRect.top() + 1,
-                                    closeIconRect.left() + 1, closeIconRect.bottom());
-                    painter->drawPoint(closeIconRect.topLeft());
-                    painter->drawPoint(closeIconRect.topRight());
-                    painter->drawPoint(closeIconRect.bottomLeft());
-                    painter->drawPoint(closeIconRect.bottomRight());
+                    const QLine lines[4] = {
+                        QLine(closeIconRect.left() + 1, closeIconRect.top(),
+                              closeIconRect.right(), closeIconRect.bottom() - 1),
+                        QLine(closeIconRect.left(), closeIconRect.top() + 1,
+                              closeIconRect.right() - 1, closeIconRect.bottom()),
+                        QLine(closeIconRect.right() - 1, closeIconRect.top(),
+                              closeIconRect.left(), closeIconRect.bottom() - 1),
+                        QLine(closeIconRect.right(), closeIconRect.top() + 1,
+                              closeIconRect.left() + 1, closeIconRect.bottom())
+                    };
+                    painter->drawLines(lines, 4);
+                    const QPoint points[4] = {
+                        closeIconRect.topLeft(),
+                        closeIconRect.topRight(),
+                        closeIconRect.bottomLeft(),
+                        closeIconRect.bottomRight()
+                    };
+                    painter->drawPoints(points, 4);
 
                     painter->setPen(textColor);
@@ -2835 +2868 @@
                ((titleBar->titleBarFlags & Qt::WindowMaximizeButtonHint) &&
                (titleBar->titleBarState & Qt::WindowMaximized)))) {
-                QRect normalButtonRect = subControlRect(CC_TitleBar, titleBar, SC_TitleBarNormalButton, widget);
+                QRect normalButtonRect = proxy()->subControlRect(CC_TitleBar, titleBar, SC_TitleBarNormalButton, widget);
                 if (normalButtonRect.isValid()) {
 
@@ -2849 +2882 @@
                                     frontWindowRect.right() - 1, frontWindowRect.top() + 1);
                     painter->setPen(textAlphaColor);
-                    painter->drawPoint(frontWindowRect.topLeft());
-                    painter->drawPoint(frontWindowRect.topRight());
-                    painter->drawPoint(frontWindowRect.bottomLeft());
-                    painter->drawPoint(frontWindowRect.bottomRight());
+                    const QPoint points[4] = {
+                        frontWindowRect.topLeft(),
+                        frontWindowRect.topRight(),
+                        frontWindowRect.bottomLeft(),
+                        frontWindowRect.bottomRight()
+                    };
+                    painter->drawPoints(points, 4);
 
                     QRect backWindowRect = normalButtonIconRect.adjusted(3, 0, 0, -3);
@@ -2864 +2900 @@
                                     backWindowRect.right() - 1, backWindowRect.top() + 1);
                     painter->setPen(textAlphaColor);
-                    painter->drawPoint(backWindowRect.topLeft());
-                    painter->drawPoint(backWindowRect.topRight());
-                    painter->drawPoint(backWindowRect.bottomLeft());
-                    painter->drawPoint(backWindowRect.bottomRight());
+                    const QPoint points2[4] = {
+                        backWindowRect.topLeft(),
+                        backWindowRect.topRight(),
+                        backWindowRect.bottomLeft(),
+                        backWindowRect.bottomRight()
+                    };
+                    painter->drawPoints(points2, 4);
                     painter->restore();
                 }
@@ -2875 +2914 @@
             if (titleBar->subControls & SC_TitleBarContextHelpButton
                 && (titleBar->titleBarFlags & Qt::WindowContextHelpButtonHint)) {
-                QRect contextHelpButtonRect = subControlRect(CC_TitleBar, titleBar, SC_TitleBarContextHelpButton, widget);
+                QRect contextHelpButtonRect = proxy()->subControlRect(CC_TitleBar, titleBar, SC_TitleBarContextHelpButton, widget);
                 if (contextHelpButtonRect.isValid()) {
                     bool hover = (titleBar->activeSubControls & SC_TitleBarContextHelpButton) && (titleBar->state & State_MouseOver);
@@ -2894 +2933 @@
             // shade button
             if (titleBar->subControls & SC_TitleBarShadeButton && (titleBar->titleBarFlags & Qt::WindowShadeButtonHint)) {
-                QRect shadeButtonRect = subControlRect(CC_TitleBar, titleBar, SC_TitleBarShadeButton, widget);
+                QRect shadeButtonRect = proxy()->subControlRect(CC_TitleBar, titleBar, SC_TitleBarShadeButton, widget);
                 if (shadeButtonRect.isValid()) {
                     bool hover = (titleBar->activeSubControls & SC_TitleBarShadeButton) && (titleBar->state & State_MouseOver);
@@ -2907 +2946 @@
             // unshade button
             if (titleBar->subControls & SC_TitleBarUnshadeButton && (titleBar->titleBarFlags & Qt::WindowShadeButtonHint)) {
-                QRect unshadeButtonRect = subControlRect(CC_TitleBar, titleBar, SC_TitleBarUnshadeButton, widget);
+                QRect unshadeButtonRect = proxy()->subControlRect(CC_TitleBar, titleBar, SC_TitleBarUnshadeButton, widget);
                 if (unshadeButtonRect.isValid()) {
                     bool hover = (titleBar->activeSubControls & SC_TitleBarUnshadeButton) && (titleBar->state & State_MouseOver);
@@ -2919 +2958 @@
 
             if ((titleBar->subControls & SC_TitleBarSysMenu) && (titleBar->titleBarFlags & Qt::WindowSystemMenuHint)) {
-                QRect iconRect = subControlRect(CC_TitleBar, titleBar, SC_TitleBarSysMenu, widget);
+                QRect iconRect = proxy()->subControlRect(CC_TitleBar, titleBar, SC_TitleBarSysMenu, widget);
                 if (iconRect.isValid()) {
                     if (!titleBar->icon.isNull()) {
@@ -2929 +2968 @@
                         tool.rect = iconRect;
                         painter->save();
-                        drawItemPixmap(painter, iconRect, Qt::AlignCenter, pm);
+                        proxy()->drawItemPixmap(painter, iconRect, Qt::AlignCenter, pm);
                         painter->restore();
                     }
@@ -2949 +2988 @@
 
             QRect rect = scrollBar->rect;
-            QRect scrollBarSubLine = subControlRect(control, scrollBar, SC_ScrollBarSubLine, widget);
-            QRect scrollBarAddLine = subControlRect(control, scrollBar, SC_ScrollBarAddLine, widget);
-            QRect scrollBarSlider = subControlRect(control, scrollBar, SC_ScrollBarSlider, widget);
-            QRect grooveRect = subControlRect(control, scrollBar, SC_ScrollBarGroove, widget);
+            QRect scrollBarSubLine = proxy()->subControlRect(control, scrollBar, SC_ScrollBarSubLine, widget);
+            QRect scrollBarAddLine = proxy()->subControlRect(control, scrollBar, SC_ScrollBarAddLine, widget);
+            QRect scrollBarSlider = proxy()->subControlRect(control, scrollBar, SC_ScrollBarSlider, widget);
+            QRect grooveRect = proxy()->subControlRect(control, scrollBar, SC_ScrollBarGroove, widget);
 
             // paint groove
@@ -3087 +3126 @@
             // The SubLine (up/left) buttons
             if (scrollBar->subControls & SC_ScrollBarSubLine) {
-                //int scrollBarExtent = pixelMetric(PM_ScrollBarExtent, option, widget);
+                //int scrollBarExtent = proxy()->pixelMetric(PM_ScrollBarExtent, option, widget);
                 QRect pixmapRect = scrollBarSubLine;
                 if (isEnabled ) {
@@ -3133 +3172 @@
                 QStyleOption arrowOpt = *option;
                 arrowOpt.rect = scrollBarSubLine.adjusted(3, 3, -2, -2);
-                drawPrimitive(arrow, &arrowOpt, painter, widget);
+                proxy()->drawPrimitive(arrow, &arrowOpt, painter, widget);
 
 
                 // The AddLine (down/right) button
                 if (scrollBar->subControls & SC_ScrollBarAddLine) {
-                    QString addLinePixmapName = uniqueName(QLatin1String("scrollbar_addline"), option, QSize(16, 16));
+                    QString addLinePixmapName = QStyleHelper::uniqueName(QLatin1String("scrollbar_addline"), option, QSize(16, 16));
                     QRect pixmapRect = scrollBarAddLine;
                     if (isEnabled) {
@@ -3184 +3223 @@
                     QStyleOption arrowOpt = *option;
                     arrowOpt.rect = scrollBarAddLine.adjusted(3, 3, -2, -2);
-                    drawPrimitive(arrow, &arrowOpt, painter, widget);
+                    proxy()->drawPrimitive(arrow, &arrowOpt, painter, widget);
                 }
             }
@@ -3199 +3238 @@
             bool focus = isEnabled && (comboBox->state & State_HasFocus);
             QPixmap cache;
-            QString pixmapName = uniqueName(QLatin1String("combobox"), option, comboBox->rect.size());
+            QString pixmapName = QStyleHelper::uniqueName(QLatin1String("combobox"), option, comboBox->rect.size());
             if (sunken)
                 pixmapName += QLatin1String("-sunken");
@@ -3207 +3246 @@
                 pixmapName += QLatin1String("-enabled");
 
-            if (!UsePixmapCache || !QPixmapCache::find(pixmapName, cache)) {
+            if (!QPixmapCache::find(pixmapName, cache)) {
                 cache = QPixmap(comboBox->rect.size());
                 cache.fill(Qt::transparent);
@@ -3216 +3255 @@
 
                 QRect rect = pixmapRect;
-                QRect downArrowRect = subControlRect(CC_ComboBox, &comboBoxCopy,
+                QRect downArrowRect = proxy()->subControlRect(CC_ComboBox, &comboBoxCopy,
                                                      SC_ComboBoxArrow, widget);
-                QRect editRect = subControlRect(CC_ComboBox, &comboBoxCopy,
+                QRect editRect = proxy()->subControlRect(CC_ComboBox, &comboBoxCopy,
                                                      SC_ComboBoxEditField, widget);
                 // Draw a push button
@@ -3232 +3271 @@
                     }
 
-                    drawPrimitive(PE_PanelButtonCommand, &buttonOption, &cachePainter, widget);
+                    proxy()->drawPrimitive(PE_PanelButtonCommand, &buttonOption, &cachePainter, widget);
 
                     //remove shadow from left side of edit field when pressed:
@@ -3274 +3313 @@
                         buttonOption.state &= ~State_MouseOver;
                     }
-                    drawPrimitive(PE_PanelButtonCommand, &buttonOption, &cachePainter, widget);
+                    proxy()->drawPrimitive(PE_PanelButtonCommand, &buttonOption, &cachePainter, widget);
 
                     cachePainter.setPen(buttonShadow.darker(102));
@@ -3327 +3366 @@
                 }
                 // Draw the focus rect
-                if ((focus && (option->state & State_KeyboardFocusChange)) && !comboBox->editable) {
+                if (focus && !comboBox->editable
+                    && ((option->state & State_KeyboardFocusChange) || styleHint(SH_UnderlineShortcut, option, widget))) {
                     QStyleOptionFocusRect focus;
-                    focus.rect = subControlRect(CC_ComboBox, &comboBoxCopy, SC_ComboBoxEditField, widget)
+                    focus.rect = proxy()->subControlRect(CC_ComboBox, &comboBoxCopy, SC_ComboBoxEditField, widget)
                                  .adjusted(0, 2, option->direction == Qt::RightToLeft ? 1 : -1, -2);
-                    drawPrimitive(PE_FrameFocusRect, &focus, &cachePainter, widget);
+                    proxy()->drawPrimitive(PE_FrameFocusRect, &focus, &cachePainter, widget);
                 }
                 cachePainter.end();
-                if (UsePixmapCache)
-                    QPixmapCache::insert(pixmapName, cache);
+                QPixmapCache::insert(pixmapName, cache);
             }
             painter->drawPixmap(comboBox->rect.topLeft(), cache);
@@ -3346 +3385 @@
         painter->save();
         if (const QStyleOptionGroupBox *groupBox = qstyleoption_cast<const QStyleOptionGroupBox *>(option)) {
-            QRect textRect = subControlRect(CC_GroupBox, groupBox, SC_GroupBoxLabel, widget);
-            QRect checkBoxRect = subControlRect(CC_GroupBox, groupBox, SC_GroupBoxCheckBox, widget);
+            QRect textRect = proxy()->subControlRect(CC_GroupBox, groupBox, SC_GroupBoxLabel, widget);
+            QRect checkBoxRect = proxy()->subControlRect(CC_GroupBox, groupBox, SC_GroupBoxCheckBox, widget);
             bool flat = groupBox->features & QStyleOptionFrameV2::Flat;
 
@@ -3357 +3396 @@
                     frame.lineWidth = groupBox->lineWidth;
                     frame.midLineWidth = groupBox->midLineWidth;
-                    frame.rect = subControlRect(CC_GroupBox, option, SC_GroupBoxFrame, widget);
+                    frame.rect = proxy()->subControlRect(CC_GroupBox, option, SC_GroupBoxFrame, widget);
 
                     painter->save();
@@ -3366 +3405 @@
                         painter->setClipRegion(region);
                     frame.palette.setBrush(QPalette::Dark, option->palette.mid().color().lighter(110));
-                    drawPrimitive(PE_FrameGroupBox, &frame, painter);
+                    proxy()->drawPrimitive(PE_FrameGroupBox, &frame, painter);
                     painter->restore();
                 }
@@ -3394 +3433 @@
                 box.QStyleOption::operator=(*groupBox);
                 box.rect = checkBoxRect;
-                drawPrimitive(PE_IndicatorCheckBox, &box, painter, widget);
+                proxy()->drawPrimitive(PE_IndicatorCheckBox, &box, painter, widget);
             }
         }
@@ -3403 +3442 @@
     case CC_Slider:
         if (const QStyleOptionSlider *slider = qstyleoption_cast<const QStyleOptionSlider *>(option)) {
-            QRect groove = subControlRect(CC_Slider, option, SC_SliderGroove, widget);
-            QRect handle = subControlRect(CC_Slider, option, SC_SliderHandle, widget);
-            QRect ticks = subControlRect(CC_Slider, option, SC_SliderTickmarks, widget);
+            QRect groove = proxy()->subControlRect(CC_Slider, option, SC_SliderGroove, widget);
+            QRect handle = proxy()->subControlRect(CC_Slider, option, SC_SliderHandle, widget);
+            QRect ticks = proxy()->subControlRect(CC_Slider, option, SC_SliderTickmarks, widget);
 
             bool horizontal = slider->orientation == Qt::Horizontal;
@@ -3422 +3461 @@
 
             if ((option->subControls & SC_SliderGroove) && groove.isValid()) {
-                QString groovePixmapName = uniqueName(QLatin1String("slider_groove"), option, groove.size());
+                QString groovePixmapName = QStyleHelper::uniqueName(QLatin1String("slider_groove"), option, groove.size());
                 QRect pixmapRect(0, 0, groove.width(), groove.height());
 
                 // draw background groove
-                if (!UsePixmapCache || !QPixmapCache::find(groovePixmapName, cache)) {
+                if (!QPixmapCache::find(groovePixmapName, cache)) {
                     cache = QPixmap(pixmapRect.size());
                     cache.fill(Qt::transparent);
@@ -3453 +3492 @@
                     groovePainter.drawRect(pixmapRect.adjusted(1, 1, -2, -2));
                     groovePainter.end();
-                    if (UsePixmapCache)
-                        QPixmapCache::insert(groovePixmapName, cache);
+                    QPixmapCache::insert(groovePixmapName, cache);
                 }
                 painter->drawPixmap(groove.topLeft(), cache);
@@ -3461 +3499 @@
                 QRect clipRect;
                 groovePixmapName += QLatin1String("_blue");
-                if (!UsePixmapCache || !QPixmapCache::find(groovePixmapName, cache)) {
+                if (!QPixmapCache::find(groovePixmapName, cache)) {
                     cache = QPixmap(pixmapRect.size());
                     cache.fill(Qt::transparent);
@@ -3480 +3518 @@
                     groovePainter.drawRect(pixmapRect.adjusted(1, 1, -2, -2));
                     groovePainter.end();
-                    if (UsePixmapCache)
-                        QPixmapCache::insert(groovePixmapName, cache);
+                    QPixmapCache::insert(groovePixmapName, cache);
                 }
                 if (horizontal) {
@@ -3502 +3539 @@
             // draw handle
             if ((option->subControls & SC_SliderHandle) ) {
-                QString handlePixmapName = uniqueName(QLatin1String("slider_handle"), option, handle.size());
-                if (!UsePixmapCache || !QPixmapCache::find(handlePixmapName, cache)) {
+                QString handlePixmapName = QStyleHelper::uniqueName(QLatin1String("slider_handle"), option, handle.size());
+                if (!QPixmapCache::find(handlePixmapName, cache)) {
                     cache = QPixmap(handle.size());
                     cache.fill(Qt::transparent);
@@ -3543 +3580 @@
                     handlePainter.setRenderHint(QPainter::Antialiasing);
                     handlePainter.translate(0.5, 0.5);
-                    handlePainter.drawLine(QPoint(r.left(), r.bottom() - 2), QPoint(r.left() + 2, r.bottom()));
-                    handlePainter.drawLine(QPoint(r.left(), r.top() + 2), QPoint(r.left() + 2, r.top()));
-                    handlePainter.drawLine(QPoint(r.right(), r.bottom() - 2), QPoint(r.right() - 2, r.bottom()));
-                    handlePainter.drawLine(QPoint(r.right(), r.top() + 2), QPoint(r.right() - 2, r.top()));
+                    const QLine lines[4] = {
+                        QLine(QPoint(r.left(), r.bottom() - 2), QPoint(r.left() + 2, r.bottom())),
+                        QLine(QPoint(r.left(), r.top() + 2), QPoint(r.left() + 2, r.top())),
+                        QLine(QPoint(r.right(), r.bottom() - 2), QPoint(r.right() - 2, r.bottom())),
+                        QLine(QPoint(r.right(), r.top() + 2), QPoint(r.right() - 2, r.top()))
+                    };
+                    handlePainter.drawLines(lines, 4);
                     handlePainter.restore();;
                     handlePainter.setPen(QPen(outline.darker(130), 1));
@@ -3584 +3624 @@
                     }
                     handlePainter.end();
-                    if (UsePixmapCache)
-                        QPixmapCache::insert(handlePixmapName, cache);
+                    QPixmapCache::insert(handlePixmapName, cache);
                 }
 
@@ -3594 +3633 @@
                     fropt.QStyleOption::operator=(*slider);
                     fropt.rect = slider->rect;
-                    drawPrimitive(PE_FrameFocusRect, &fropt, painter, widget);
+                    proxy()->drawPrimitive(PE_FrameFocusRect, &fropt, painter, widget);
                 }
             }
             if (option->subControls & SC_SliderTickmarks) {
                 painter->setPen(darkOutline);
-                int tickSize = pixelMetric(PM_SliderTickmarkOffset, option, widget);
-                int available = pixelMetric(PM_SliderSpaceAvailable, slider, widget);
+                int tickSize = proxy()->pixelMetric(PM_SliderTickmarkOffset, option, widget);
+                int available = proxy()->pixelMetric(PM_SliderSpaceAvailable, slider, widget);
                 int interval = slider->tickInterval;
                 if (interval <= 0) {
@@ -3614 +3653 @@
 
                 int v = slider->minimum;
-                int len = pixelMetric(PM_SliderLength, slider, widget);
+                int len = proxy()->pixelMetric(PM_SliderLength, slider, widget);
                 while (v <= slider->maximum + 1) {
                     if (v == slider->maximum + 1 && interval == 1)
@@ -3657 +3696 @@
         break;
 #endif // QT_NO_SLIDER
+#ifndef QT_NO_DIAL
+    case CC_Dial:
+        if (const QStyleOptionSlider *dial = qstyleoption_cast<const QStyleOptionSlider *>(option))
+            QStyleHelper::drawDial(dial, painter);
+        break;
+#endif // QT_NO_DIAL
         default:
             QWindowsStyle::drawComplexControl(control, option, painter, widget);
@@ -3773 +3818 @@
             if (!btn->icon.isNull() && btn->iconSize.height() > 16)
                 newSize -= QSize(0, 2);
+            newSize += QSize(0, 1);
         }
         if (const QPushButton *button = qobject_cast<const QPushButton *>(widget)) {
@@ -3781 +3827 @@
         }
         break;
+#ifndef QT_NO_GROUPBOX
     case CT_GroupBox:
+        // Since we use a bold font we have to recalculate base width
+        if (const QGroupBox *gb = qobject_cast<const QGroupBox*>(widget)) {
+            QFont font = gb->font();
+            font.setBold(true);
+            QFontMetrics metrics(font);
+            int baseWidth = metrics.width(gb->title()) + metrics.width(QLatin1Char(' '));
+            if (gb->isCheckable()) {
+                baseWidth += proxy()->pixelMetric(QStyle::PM_IndicatorWidth, option, widget);
+                baseWidth += proxy()->pixelMetric(QStyle::PM_CheckBoxLabelSpacing, option, widget);
+            }
+            newSize.setWidth(qMax(baseWidth, newSize.width()));
+        }
+        newSize += QSize(0, 1);
+        break;
+#endif //QT_NO_GROUPBOX
     case CT_RadioButton:
     case CT_CheckBox:
@@ -3808 +3870 @@
             if (menuItem->menuItemType == QStyleOptionMenuItem::Separator) {
                 if (!menuItem->text.isEmpty()) {
-                    newSize.setHeight(menuItem->fontMetrics.lineSpacing());
+                    newSize.setHeight(menuItem->fontMetrics.height());
                 }
             }
@@ -3849 +3911 @@
 {
     QWindowsStyle::polish(app);
-#ifdef Q_WS_X11
-    Q_D(QCleanlooksStyle);
-
-    QString dataDirs = QLatin1String(getenv("XDG_DATA_DIRS"));
-
-    if (dataDirs.isEmpty())
-        dataDirs = QLatin1String("/usr/local/share/:/usr/share/");
-
-    dataDirs.prepend(QDir::homePath() + QLatin1String("/:"));
-    d->iconDirs = dataDirs.split(QLatin1String(":"));
-#endif
 }
 
@@ -3960 +4011 @@
     case CC_Slider:
         if (const QStyleOptionSlider *slider = qstyleoption_cast<const QStyleOptionSlider *>(option)) {
-            int tickSize = pixelMetric(PM_SliderTickmarkOffset, option, widget);
+            int tickSize = proxy()->pixelMetric(PM_SliderTickmarkOffset, option, widget);
             switch (subControl) {
             case SC_SliderHandle: {
@@ -4015 +4066 @@
             QSize bs;
             int center = spinbox->rect.height() / 2;
-            int fw = spinbox->frame ? pixelMetric(PM_SpinBoxFrameWidth, spinbox, widget) : 0;
+            int fw = spinbox->frame ? proxy()->pixelMetric(PM_SpinBoxFrameWidth, spinbox, widget) : 0;
             int y = fw;
             bs.setHeight(qMax(8, spinbox->rect.height()/2 - y));
@@ -4056 +4107 @@
             int topMargin = 0;
             int topHeight = 0;
-            int verticalAlignment = styleHint(SH_GroupBox_TextLabelVerticalAlignment, groupBox, widget);
+            int verticalAlignment = proxy()->styleHint(SH_GroupBox_TextLabelVerticalAlignment, groupBox, widget);
             bool flat = groupBox->features & QStyleOptionFrameV2::Flat;
             if (!groupBox->text.isEmpty()) {
@@ -4087 +4138 @@
                     QSize textRect = fontMetrics.boundingRect(groupBoxWidget->title()).size() + QSize(2, 2);
                     if (subControl == SC_GroupBoxCheckBox) {
-                        int indicatorWidth = pixelMetric(PM_IndicatorWidth, option, widget);
-                        int indicatorHeight = pixelMetric(PM_IndicatorHeight, option, widget);
+                        int indicatorWidth = proxy()->pixelMetric(PM_IndicatorWidth, option, widget);
+                        int indicatorHeight = proxy()->pixelMetric(PM_IndicatorHeight, option, widget);
                         rect.setWidth(indicatorWidth);
                         rect.setHeight(indicatorHeight);
@@ -4109 +4160 @@
             break;
         case SC_ComboBoxEditField: {
-            int frameWidth = pixelMetric(PM_DefaultFrameWidth);
+            int frameWidth = proxy()->pixelMetric(PM_DefaultFrameWidth);
             rect = visualRect(option->direction, option->rect, rect);
             rect.setRect(option->rect.left() + frameWidth, option->rect.top() + frameWidth,
@@ -4360 +4411 @@
             r.adjust(0, 0, 0, -4);
         } else {
-            if (QApplication::layoutDirection() == Qt::LeftToRight)
+            if (opt->direction == Qt::LeftToRight)
                 r.adjust(4, 0, 0, 0);
             else
@@ -4375 +4426 @@
     }
     return r;
-}
-
-void QCleanlooksStylePrivate::lookupIconTheme() const
-{
-#ifdef Q_WS_X11
-
-    if (themeName.isEmpty()) {
-        //resolve glib and gconf functions
-        p_g_type_init =              (Ptr_g_type_init)QLibrary::resolve(QLatin1String("gobject-2.0"), 0, "g_type_init");
-        p_gconf_client_get_default = (Ptr_gconf_client_get_default)QLibrary::resolve(QLatin1String("gconf-2"), 4, "gconf_client_get_default");
-        p_gconf_client_get_string =  (Ptr_gconf_client_get_string)QLibrary::resolve(QLatin1String("gconf-2"), 4, "gconf_client_get_string");
-        p_g_object_unref =           (Ptr_g_object_unref)QLibrary::resolve(QLatin1String("gobject-2.0"), 0, "g_object_unref");
-        p_g_error_free =             (Ptr_g_error_free)QLibrary::resolve(QLatin1String("glib-2.0"), 0, "g_error_free");
-        p_g_free =                   (Ptr_g_free)QLibrary::resolve(QLatin1String("glib-2.0"), 0, "g_free");
-
-        if (p_g_type_init &&
-             p_gconf_client_get_default &&
-             p_gconf_client_get_string &&
-             p_g_object_unref &&
-             p_g_error_free &&
-             p_g_free) {
-
-            p_g_type_init();
-            GConfClient* client = p_gconf_client_get_default();
-            GError *err = 0;
-            char *str = p_gconf_client_get_string(client, "/desktop/gnome/interface/icon_theme", &err);
-            if (!err) {
-                themeName = QString::fromUtf8(str);
-                p_g_free(str);
-            }
-            p_g_object_unref(client);
-            if (err)
-                p_g_error_free (err);
-        }
-        if (themeName.isEmpty())
-            themeName = QLatin1String("gnome");
-    }
-#endif
 }
 
@@ -4422 +4435 @@
                                                   const QWidget *widget) const
 {
-#ifdef Q_WS_X11
-    Q_D(const QCleanlooksStyle);
-    if (!qApp->desktopSettingsAware())
-        return QWindowsStyle::standardIconImplementation(standardIcon, option, widget);
-    QIcon icon;
-    QPixmap pixmap;
-    QPixmap link;
-    d->lookupIconTheme();
-    switch (standardIcon) {
-    case SP_DirIcon: {
-        icon = QIcon(standardPixmap(standardIcon, option, widget));
-        icon.addPixmap(standardPixmap(SP_DirClosedIcon, option, widget),
-                       QIcon::Normal, QIcon::Off);
-        pixmap = d->findIcon(16, QLatin1String("gnome-fs-directory.png"));
-        if (!pixmap.isNull())
-            icon.addPixmap(pixmap, QIcon::Normal, QIcon::Off);
-        pixmap = d->findIcon(48, QLatin1String("gnome-fs-directory.png"));
-        if (!pixmap.isNull())
-            icon.addPixmap(pixmap, QIcon::Normal, QIcon::Off);
-        pixmap = d->findIcon(16, QLatin1String("gnome-fs-directory-accept.png"));
-        if (!pixmap.isNull())
-            icon.addPixmap(pixmap, QIcon::Normal, QIcon::On);
-        pixmap = d->findIcon(16, QLatin1String("gnome-fs-directory-accept.png"));
-        if (!pixmap.isNull())
-            icon.addPixmap(pixmap, QIcon::Normal, QIcon::On);
-    }
-    break;
-    case SP_DirLinkIcon:
-        {
-            icon = QIcon(standardPixmap(standardIcon, option, widget));
-            QPixmap link = d->findIcon(12, QLatin1String("emblem-symbolic-link.png"));
-            if (!link.isNull()) {
-                icon.addPixmap(standardPixmap(SP_DirLinkIcon, option, widget));
-                pixmap = d->findIcon(16, QLatin1String("gnome-fs-directory.png"));
-                if (!pixmap.isNull()) {
-                    QPainter painter(&pixmap);
-                    painter.drawPixmap(8, 8, 8, 8, link);
-                    painter.end();
-                    icon.addPixmap(pixmap);
-                }
-            }
-            break;
-        }
-    case SP_FileIcon:
-        {
-            icon = d->createIcon(QLatin1String("unknown.png"));
-            if (icon.isNull())
-                icon = d->createIcon(QLatin1String("gnome-fs-regular.png"));
-            if (icon.isNull())
-                icon = d->createIcon(QLatin1String("stock_new.png"));
-            break;
-        }
-    case SP_DialogCloseButton:
-        {
-            icon  = d->createIcon(QLatin1String("gtk-close.png"));
-            if (icon.isNull())
-                icon = d->createIcon(QLatin1String("stock-close.png"));
-            break;
-        }
-    case SP_DirHomeIcon:
-        {
-            icon = d->createIcon(QLatin1String("folder_home.png"));
-            if (icon.isNull())
-                icon = d->createIcon(QLatin1String("gnome_home.png"));
-            break;
-        }
-    case SP_DriveFDIcon:
-        {
-            icon = d->createIcon(QLatin1String("gnome-dev-floppy.png"));
-            break;
-        }
-    case SP_ComputerIcon:
-        {
-            icon = d->createIcon(QLatin1String("gnome-fs-client.png"));
-            break;
-        }
-    case SP_DesktopIcon:
-        {
-            icon = d->createIcon(QLatin1String("gnome-fs-desktop.png"));
-            break;
-        }
-    case SP_TrashIcon:
-        {
-            icon = d->createIcon(QLatin1String("gnome-fs-trash-empty.png"));
-            break;
-        }
-    case SP_DriveCDIcon:
-    case SP_DriveDVDIcon:
-        {
-            icon = d->createIcon(QLatin1String("gnome-dev-cdrom.png"));
-            break;
-        }
-    case SP_DriveHDIcon:
-        {
-            icon = d->createIcon(QLatin1String("gnome-dev-harddisk.png"));
-            break;
-        }
-    case SP_ArrowUp:
-        {
-            icon = d->createIcon(QLatin1String("stock_up.png"));
-            break;
-        }
-    case SP_ArrowDown:
-        {
-            icon = d->createIcon(QLatin1String("stock_down.png"));
-            break;
-        }
-    case SP_ArrowRight:
-        {
-            icon = d->createIcon(QLatin1String("stock_right.png"));
-            break;
-        }
-    case SP_ArrowLeft:
-        {
-            icon = d->createIcon(QLatin1String("stock_left.png"));
-            break;
-        }
-    case SP_BrowserReload:
-        {
-            icon = d->createIcon(QLatin1String("view-refresh.png"));
-            break;
-        }
-    case SP_BrowserStop:
-        {
-            pixmap = d->findIcon(24, QLatin1String("stop.png"));
-            break;
-        }
-    case SP_FileLinkIcon:
-        {
-            icon = QIcon(standardPixmap(standardIcon, option, widget));
-            QPixmap link = d->findIcon(12, QLatin1String("emblem-symbolic-link.png"));
-            if (!link.isNull()) {
-                icon.addPixmap(standardPixmap(SP_FileLinkIcon,option, widget));
-                pixmap = d->findIcon(16, QLatin1String("unknown.png"));
-                if (pixmap.isNull())
-                    pixmap = d->findIcon(16, QLatin1String("stock_new.png"));
-                if (!pixmap.isNull()) {
-                    QPainter painter(&pixmap);
-                    painter.drawPixmap(8, 8, 8, 8, link);
-                    painter.end();
-                    icon.addPixmap(pixmap);
-                }
-            }
-            break;
-        }
-    case SP_ArrowForward:
-        if (QApplication::layoutDirection() == Qt::RightToLeft)
-            return standardIconImplementation(SP_ArrowLeft, option, widget);
-        return standardIconImplementation(SP_ArrowRight, option, widget);
-    case SP_ArrowBack:
-        if (QApplication::layoutDirection() == Qt::RightToLeft)
-            return standardIconImplementation(SP_ArrowRight, option, widget);
-        return standardIconImplementation(SP_ArrowLeft, option, widget);
-    default:
-        icon = QIcon(standardPixmap(standardIcon, option, widget));
-    }
-    if (!icon.isNull())
-        return icon;
-#endif // Q_WS_X11
     return QWindowsStyle::standardIconImplementation(standardIcon, option, widget);
 }
@@ -4590 +4444 @@
                                       const QWidget *widget) const
 {
-#ifdef Q_WS_X11
-    Q_D(const QCleanlooksStyle);
     QPixmap pixmap;
-    if (!qApp->desktopSettingsAware())
-        return QWindowsStyle::standardPixmap(standardPixmap, opt, widget);
-    d->lookupIconTheme();
+
 #ifndef QT_NO_IMAGEFORMAT_XPM
     switch (standardPixmap) {
-    case SP_MessageBoxInformation:
-        {
-            pixmap = d->findIcon(48, QLatin1String("dialog-info.png"));
-            if (pixmap.isNull())
-                pixmap = d->findIcon(48, QLatin1String("stock_dialog-info.png"));
-            if (!pixmap.isNull())
-                return pixmap;
-            break;
-        }
-    case SP_MessageBoxWarning:
-        {
-            pixmap = d->findIcon(48, QLatin1String("dialog-warning.png"));
-            if (pixmap.isNull())
-                pixmap = d->findIcon(48, QLatin1String("stock_dialog-warning.png"));
-            if (!pixmap.isNull())
-                return pixmap;
-            break;
-        }
-    case SP_MessageBoxCritical:
-        {
-            pixmap = d->findIcon(48, QLatin1String("dialog-error.png"));
-            if (pixmap.isNull())
-                pixmap = d->findIcon(48, QLatin1String("stock_dialog-error.png"));
-            if (!pixmap.isNull())
-                return pixmap;
-            break;
-        }
-    case SP_MessageBoxQuestion:
-        {
-            pixmap = d->findIcon(48, QLatin1String("dialog-question.png"));
-            if (!pixmap.isNull())
-                return pixmap;
-            break;
-        }
-    case SP_DirHomeIcon:
-        {
-            pixmap = d->findIcon(16, QLatin1String("folder_home.png"));
-            if (pixmap.isNull())
-                pixmap = d->findIcon(16, QLatin1String("gnome_home.png"));
-            if (!pixmap.isNull())
-                return pixmap;
-            break;
-        }
-    case SP_DialogOpenButton:
-    case SP_DirOpenIcon:
-        {
-            pixmap = d->findIcon(24, QLatin1String("stock_open.png"));
-            if (!pixmap.isNull())
-                return pixmap;
-            break;
-        }
-    case SP_FileIcon:
-        {
-            pixmap = d->findIcon(24, QLatin1String("unknown.png"));
-            if (pixmap.isNull())
-                pixmap = d->findIcon(24, QLatin1String("gnome-fs-regular.png"));
-            if (pixmap.isNull())
-                pixmap = d->findIcon(24, QLatin1String("stock_new.png"));
-            if (!pixmap.isNull())
-                return pixmap;
-            break;
-        }
-    case SP_FileLinkIcon:
-        {
-            pixmap = d->findIcon(24, QLatin1String("emblem-symbolic-link.png"));
-            if (!pixmap.isNull()) {
-                QPixmap fileIcon = d->findIcon(24, QLatin1String("unknown.png"));
-                if (fileIcon.isNull())
-                    fileIcon = d->findIcon(24, QLatin1String("stock_new.png"));
-                if (!fileIcon.isNull()) {
-                    QPainter painter(&fileIcon);
-                    painter.setRenderHint(QPainter::SmoothPixmapTransform);
-                    painter.drawPixmap(12, 12, 12, 12, pixmap);
-                    return fileIcon;
-                }
-            }
-            break;
-       }
-    case SP_DirClosedIcon:
-    case SP_DirIcon:
-        {
-            pixmap = d->findIcon(24, QLatin1String("gnome-fs-directory.png"));
-            if (!pixmap.isNull())
-                return pixmap;
-            break;
-        }
-    case SP_DirLinkIcon:
-        {
-            pixmap = d->findIcon(24, QLatin1String("emblem-symbolic-link.png"));
-            if (!pixmap.isNull()) {
-                QPixmap dirIcon = d->findIcon(24, QLatin1String("gnome-fs-directory.png"));
-                if (!dirIcon.isNull()) {
-                    QPainter painter(&dirIcon);
-                    painter.setRenderHint(QPainter::SmoothPixmapTransform);
-                    painter.drawPixmap(12, 12, 12, 12, pixmap);
-                    return dirIcon;
-                }
-            }
-            break;
-       }
-    case SP_DriveFDIcon:
-        {
-            pixmap = d->findIcon(24, QLatin1String("gnome-dev-floppy.png"));
-            if (!pixmap.isNull())
-                return pixmap;
-            break;
-        }
-    case SP_ComputerIcon:
-        {
-            pixmap = d->findIcon(24, QLatin1String("gnome-fs-client.png"));
-            if (!pixmap.isNull())
-                return pixmap;
-            break;
-        }
-    case SP_DesktopIcon:
-        {
-            pixmap = d->findIcon(24, QLatin1String("gnome-fs-desktop.png"));
-            if (!pixmap.isNull())
-                return pixmap;
-            break;
-        }
-    case SP_TrashIcon:
-        {
-            pixmap = d->findIcon(24, QLatin1String("gnome-fs-trash-empty.png"));
-            if (!pixmap.isNull())
-                return pixmap;
-            break;
-        }
-    case SP_DriveCDIcon:
-    case SP_DriveDVDIcon:
-        {
-            pixmap = d->findIcon(24, QLatin1String("gnome-dev-cdrom.png"));
-            if (!pixmap.isNull())
-                return pixmap;
-            break;
-        }
-    case SP_DriveHDIcon:
-        {
-            pixmap = d->findIcon(24, QLatin1String("gnome-dev-harddisk.png"));
-            if (!pixmap.isNull())
-                return pixmap;
-            break;
-        }
-    case SP_FileDialogToParent:
-        {
-            pixmap = d->findIcon(16, QLatin1String("stock_up.png"));
-            if (!pixmap.isNull())
-                return pixmap;
-            break;
-        }
-    case SP_FileDialogNewFolder:
-        {
-            pixmap = d->findIcon(16, QLatin1String("stock_new-dir.png"));
-            if (!pixmap.isNull())
-                return pixmap;
-            break;
-        }
-    case SP_ArrowUp:
-        {
-            pixmap = d->findIcon(16, QLatin1String("stock_up.png"));
-            if (!pixmap.isNull())
-                return pixmap;
-            break;
-        }
-    case SP_ArrowDown:
-        {
-            pixmap = d->findIcon(16, QLatin1String("stock_down.png"));
-            if (!pixmap.isNull())
-                return pixmap;
-            break;
-        }
-    case SP_ArrowRight:
-        {
-            pixmap = d->findIcon(16, QLatin1String("stock_right.png"));
-            if (!pixmap.isNull())
-                return pixmap;
-            break;
-        }
-    case SP_ArrowLeft:
-        {
-            pixmap = d->findIcon(16, QLatin1String("stock_left.png"));
-            if (!pixmap.isNull())
-                return pixmap;
-            break;
-        }
-    case SP_DialogCloseButton:
-        {
-            pixmap = d->findIcon(24, QLatin1String("gtk-close.png"));
-            if (pixmap.isNull())
-                pixmap = d->findIcon(24, QLatin1String("stock-close.png"));
-            if (!pixmap.isNull())
-                return pixmap;
-            break;
-        }
-    case SP_DialogApplyButton:
-        {
-            pixmap = d->findIcon(24, QLatin1String("dialog-apply.png"));
-            if (pixmap.isNull())
-                pixmap = d->findIcon(24, QLatin1String("stock-apply.png"));
-            if (!pixmap.isNull())
-                return pixmap;
-            break;
-        }
-    case SP_DialogResetButton:
-        {
-            pixmap = d->findIcon(24, QLatin1String("gtk-clear.png"));
-            if (!pixmap.isNull())
-                return pixmap;
-            break;
-        }
-    case SP_DialogHelpButton:
-        {
-            pixmap = d->findIcon(24, QLatin1String("gtk-help.png"));
-            if (!pixmap.isNull())
-                return pixmap;
-            break;
-        }
-    case SP_DialogOkButton:
-        {
-            pixmap = d->findIcon(24, QLatin1String("dialog-ok.png"));
-            if (pixmap.isNull())
-                pixmap = d->findIcon(24, QLatin1String("stock-ok.png"));
-            if (!pixmap.isNull())
-                return pixmap;
-            break;
-        }
-    case SP_DialogCancelButton:
-        {
-            pixmap = d->findIcon(24, QLatin1String("dialog-cancel.png"));
-            if (pixmap.isNull())
-                pixmap = d->findIcon(24, QLatin1String("stock-cancel.png"));
-            if (pixmap.isNull())
-                pixmap = d->findIcon(24, QLatin1String("process-stop.png"));
-            if (!pixmap.isNull())
-                return pixmap;
-            break;
-        }
-    case SP_DialogSaveButton:
-        {
-            pixmap = d->findIcon(24, QLatin1String("stock_save.png"));
-            if (!pixmap.isNull())
-                return pixmap;
-            break;
-        }
-    case SP_BrowserStop:
-        {
-            pixmap = d->findIcon(16, QLatin1String("process-stop.png"));
-            if (!pixmap.isNull())
-                return pixmap;
-            break;
-        }
-    case SP_BrowserReload:
-        {
-            pixmap = d->findIcon(16, QLatin1String("view-refresh.png"));
-            if (!pixmap.isNull())
-                return pixmap;
-            break;
-        }
-    case SP_MediaPlay:
-        {
-            pixmap = d->findIcon(24, QLatin1String("media-playback-start.png"));
-            if (!pixmap.isNull())
-                return pixmap;
-            break;
-        }
-    case SP_MediaPause:
-        {
-            pixmap = d->findIcon(24, QLatin1String("media-playback-pause.png"));
-            if (!pixmap.isNull())
-                return pixmap;
-            break;
-        }
-    case SP_MediaStop:
-        {
-            pixmap = d->findIcon(24, QLatin1String("media-playback-stop.png"));
-            if (!pixmap.isNull())
-                return pixmap;
-            break;
-        }
-    case SP_MediaVolume:
-        {
-            pixmap = d->findIcon(16, QLatin1String("audio-volume-medium.png"));
-            if (!pixmap.isNull())
-                return pixmap;
-            break;
-        }
-    case SP_MediaVolumeMuted:
-        {
-            pixmap = d->findIcon(16, QLatin1String("audio-volume-muted.png"));
-            if (!pixmap.isNull())
-                return pixmap;
-            break;
-        }
-    case SP_MediaSeekForward:
-        {
-            pixmap = d->findIcon(24, QLatin1String("media-seek-forward.png"));
-            if (!pixmap.isNull())
-                return pixmap;
-            break;
-        }
-    case SP_MediaSeekBackward:
-        {
-            pixmap = d->findIcon(24, QLatin1String("media-seek-backward.png"));
-            if (!pixmap.isNull())
-                return pixmap;
-            break;
-        }
-    case SP_MediaSkipForward:
-        {
-            pixmap = d->findIcon(24, QLatin1String("media-skip-forward.png"));
-            if (!pixmap.isNull())
-                return pixmap;
-            break;
-        }
-    case SP_MediaSkipBackward:
-        {
-            pixmap = d->findIcon(24, QLatin1String("media-skip-backward.png"));
-            if (!pixmap.isNull())
-                return pixmap;
-            break;
-        }
-    case SP_TitleBarMenuButton:
-    case SP_TitleBarShadeButton:
-    case SP_TitleBarUnshadeButton:
-    case SP_TitleBarMaxButton:
-    case SP_TitleBarContextHelpButton:
-        return QWindowsStyle::standardPixmap(standardPixmap, opt, widget);
     case SP_TitleBarNormalButton:
         return QPixmap((const char **)dock_widget_restore_xpm);
@@ -4937 +4460 @@
     }
 #endif //QT_NO_IMAGEFORMAT_XPM
-#endif //Q_WS_X11
+
     return QWindowsStyle::standardPixmap(standardPixmap, opt, widget);
 }