compiler warning fixes

Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>

diff --git a/src/core/thread/qmutexpool.cpp b/src/core/thread/qmutexpool.cpp
index 1806936..3ae2df1 100644 (file)
--- a/src/core/thread/qmutexpool.cpp
+++ b/src/core/thread/qmutexpool.cpp
@@ -104,7 +104,7 @@ QMutexPool::QMutexPool(QMutex::RecursionMode recursionMode)
 */
 QMutexPool::~QMutexPool()
 {
-    for (int index = 0; index < mutexes.size(); ++index) {
+    for (int index = 0; index < QMUTEXPOOL_SIZE; ++index) {
         delete mutexes[index];
         mutexes[index] = Q_NULLPTR;
     }

diff --git a/src/declarative/util/qdeclarativelistmodelworkeragent_p.h b/src/declarative/util/qdeclarativelistmodelworkeragent_p.h
index 0770613..42d473f 100644 (file)
--- a/src/declarative/util/qdeclarativelistmodelworkeragent_p.h
+++ b/src/declarative/util/qdeclarativelistmodelworkeragent_p.h
@@ -96,7 +96,10 @@ public:
 
         VariantRef &operator=(const VariantRef &o) { 
             if (o.a) o.a->addref(); 
-            if (a) a->release(); a = o.a; 
+            if (a) {
+                a->release();
+                a = o.a;
+            }
             return *this; 
         }
 

diff --git a/src/gui/itemviews/qitemdelegate.cpp b/src/gui/itemviews/qitemdelegate.cpp
index 6e708fc..3adfda2 100644 (file)
--- a/src/gui/itemviews/qitemdelegate.cpp
+++ b/src/gui/itemviews/qitemdelegate.cpp
@@ -765,7 +765,6 @@ void QItemDelegate::drawFocus(QPainter *painter,
                               const QStyleOptionViewItem &option,
                               const QRect &rect) const
 {
-    Q_D(const QItemDelegate);
     if ((option.state & QStyle::State_HasFocus) == 0 || !rect.isValid())
         return;
     QStyleOptionFocusRect o;
@@ -791,7 +790,6 @@ void QItemDelegate::drawCheck(QPainter *painter,
                               const QStyleOptionViewItem &option,
                               const QRect &rect, Qt::CheckState state) const
 {
-    Q_D(const QItemDelegate);
     if (!rect.isValid())
         return;
 
@@ -856,7 +854,6 @@ void QItemDelegate::doLayout(const QStyleOptionViewItem &option,
                              bool hint) const
 {
     Q_ASSERT(checkRect && pixmapRect && textRect);
-    Q_D(const QItemDelegate);
     QStyle *style = option.widget ? option.widget->style() : QApplication::style();
     const bool hasCheck = checkRect->isValid();
     const bool hasPixmap = pixmapRect->isValid();
@@ -1110,7 +1107,6 @@ QRect QItemDelegate::check(const QStyleOptionViewItem &option,
                            const QRect &bounding, const QVariant &value) const
 {
     if (value.isValid()) {
-        Q_D(const QItemDelegate);
         QStyleOptionButton opt;
         opt.QStyleOption::operator=(option);
         opt.rect = bounding;

diff --git a/src/gui/widgets/qprintpreviewwidget.cpp b/src/gui/widgets/qprintpreviewwidget.cpp
index b393e5d..7a02990 100644 (file)
--- a/src/gui/widgets/qprintpreviewwidget.cpp
+++ b/src/gui/widgets/qprintpreviewwidget.cpp
@@ -54,7 +54,6 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace {
 class PageItem : public QGraphicsItem
 {
 public:
@@ -170,8 +169,6 @@ protected:
     }
 };
 
-} // anonymous namespace
-
 class QPrintPreviewWidgetPrivate : public QWidgetPrivate
 {
     Q_DECLARE_PUBLIC(QPrintPreviewWidget)

diff --git a/src/plugins/accessible/widgets/itemviews.cpp b/src/plugins/accessible/widgets/itemviews.cpp
index f4c839f..d4ea60c 100644 (file)
--- a/src/plugins/accessible/widgets/itemviews.cpp
+++ b/src/plugins/accessible/widgets/itemviews.cpp
@@ -831,12 +831,12 @@ QRect QAccessibleTable2Cell::rect(int child) const
 {
     Q_ASSERT(child == 0);
 
-    QRect r;
-    r = view->visualRect(m_index);
+    QRect r = view->visualRect(m_index);
 
-    if (!r.isNull())
+    if (!r.isNull()) {
         r.translate(view->viewport()->mapTo(view, QPoint(0,0)));
         r.translate(view->mapToGlobal(QPoint(0, 0)));
+    }
     return r;
 }