Cleanup of QWindowsVistaStyle.

- Remove the limbowidget, try to obtain HWND from a toplevel or
  the desktop instead.
- Clean up handling of the theme map, avoid operator[] and
  repeated invocation of of map.end()

Change-Id: Ic5ea6186508f37aaff782ca304ce577899f7b41c
Reviewed-by: Oliver Wolff <oliver.wolff@nokia.com>

1 files changed, 3 insertions, 2 deletions

diff --git a/src/widgets/styles/qwindowsxpstyle_p.h b/src/widgets/styles/qwindowsxpstyle_p.h
index 44dc8e8bdb..d3bfff6a4b 100644
--- a/src/widgets/styles/qwindowsxpstyle_p.h
+++ b/src/widgets/styles/qwindowsxpstyle_p.h
@@ -286,6 +286,8 @@ class QWindowsXPStylePrivate : public QWindowsStylePrivate
 {
     Q_DECLARE_PUBLIC(QWindowsXPStyle)
 public:
+    typedef QMap<QString, HTHEME> ThemeHandleMap;
+
     QWindowsXPStylePrivate()
         : QWindowsStylePrivate(), hasInitColors(false), bufferDC(0), bufferBitmap(0), nullBitmap(0),
           bufferPixels(0), bufferW(0), bufferH(0)
@@ -326,7 +328,7 @@ public:
     QRgb sliderTickColor;
     bool hasInitColors;
 
-    static QMap<QString,HTHEME> *handleMap;
+    static ThemeHandleMap *handleMap;
 
     QIcon dockFloat, dockClose;
 
@@ -338,7 +340,6 @@ private:
 
     static QBasicAtomicInt ref;
     static bool use_xp;
-    static QWidget *limboWidget;
     static QPixmap *tabbody;
 
     QHash<ThemeMapKey, ThemeMapData> alphaCache;