From 7a7a73184b5de3be3bb84df3991ca95461a711cc Mon Sep 17 00:00:00 2001
From: peknurmi <qt-info@nokia.com>
Date: Wed, 3 Jun 2009 08:51:56 +0200
Subject: Some minor correction to qs60style.

Added null check to qs60style::refreshUI method.

Reviewed-by: Jason Barron <jason.barron@nokia.com>

Conflicts:

	src/gui/styles/qs60style.cpp
---
 src/gui/styles/qs60style.cpp | 36 ++++++++++++++++++------------------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/src/gui/styles/qs60style.cpp b/src/gui/styles/qs60style.cpp
index 3aaa839..93a3144 100644
--- a/src/gui/styles/qs60style.cpp
+++ b/src/gui/styles/qs60style.cpp
@@ -119,22 +119,6 @@ static const int frameElementsCount =
 
 const int KNotFound = -1;
 
-static void updateWidgets(const QList<QWidget *>& widgets)
-{
-    // This is based on updateWidgets in qstylesheetstyle.cpp.
-
-    for (int i = 0; i < widgets.size(); ++i) {
-        QWidget *widget = const_cast<QWidget *>(widgets.at(i));
-        if (widget == 0)
-            continue;
-        widget->style()->polish(widget);
-        QEvent event(QEvent::StyleChange);
-        qApp->sendEvent(widget, &event);
-        widget->update();
-        widget->updateGeometry();
-    }
-}
-
 QS60StylePrivate::~QS60StylePrivate()
 {
     clearCaches(); //deletes also background image
@@ -600,8 +584,24 @@ QPixmap QS60StylePrivate::cachedFrame(SkinFrameElements frame, const QSize &size
 }
 
 void QS60StylePrivate::refreshUI()
-{   
-    updateWidgets(QApplication::allWidgets());
+{
+    QList<QWidget *> widgets = QApplication::allWidgets(); 
+
+    // The following is similar to updateWidgets in qstylesheetstyle.cpp.
+
+    for (int i = 0; i < widgets.size(); ++i) {
+        QWidget *widget = widgets.at(i);
+        if (widget == 0)
+            continue;
+
+        if (widget->style()) {
+            widget->style()->polish(widget);
+            QEvent event(QEvent::StyleChange);
+            qApp->sendEvent(widget, &event);
+        }
+        widget->update();
+        widget->updateGeometry();
+    }
 }
 
 void QS60StylePrivate::setFont(QWidget *widget) const
-- 
cgit v0.12