diff options
| author | Anna Gadomska <ext-anna.2.gadomska@nokia.com> | 2010-08-09 15:01:10 +0300 |
|---|---|---|
| committer | Dominik Kapusta <dominik.kapusta@teleca.com> | 2010-08-09 14:14:08 +0200 |
| commit | 97b0923517529967f6ea97ad7cbd127f4a07a4db (patch) | |
| tree | 6e6c1ad4382194e28c4195bcb795b09edda5a094 | |
| parent | 3e629a7693feddca0632ccef2fb30d29bdcd3aca (diff) | |
Changes: fixing coverity errors: CID#1096, CID#1095, CID#1094, CID#1045
RevBy: Dominik
| -rw-r--r-- | src/corelib/widgets/mbubbleitem.cpp | 4 | ||||
| -rw-r--r-- | src/views/mprogressindicatorbarview.cpp | 1 | ||||
| -rw-r--r-- | tests/ut_allwidgets/ut_allwidgets.h | 1 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/corelib/widgets/mbubbleitem.cpp b/src/corelib/widgets/mbubbleitem.cpp index c4b0b8be..d295a0a1 100644 --- a/src/corelib/widgets/mbubbleitem.cpp +++ b/src/corelib/widgets/mbubbleitem.cpp @@ -277,7 +277,7 @@ void MBubbleItem::setCommentsString(const QString &comments) if (!d->commentsLabel || !d->commentsIcon) d->createCommentsInfo(); d->commentsLabel->setText(comments); - } else if (d->commentsLabel || d->commentsIcon) + } else if (d->commentsLabel != NULL || d->commentsIcon) d->destroyCommentsInfo(); model()->setCommentsString(comments); @@ -301,7 +301,7 @@ void MBubbleItem::setThumbsUpString(const QString &thumbsUp) if (!d->thumbsUpLabel || !d->thumbsUpIcon) d->createThumbsUpInfo(); d->thumbsUpLabel->setText(thumbsUp); - } else if (d->thumbsUpLabel || d->thumbsUpIcon) + } else if (d->thumbsUpLabel != NULL || d->thumbsUpIcon) d->destroyThumbsUpInfo(); model()->setThumbsUpString(thumbsUp); diff --git a/src/views/mprogressindicatorbarview.cpp b/src/views/mprogressindicatorbarview.cpp index fd87e334..ee6ff568 100644 --- a/src/views/mprogressindicatorbarview.cpp +++ b/src/views/mprogressindicatorbarview.cpp @@ -45,6 +45,7 @@ MProgressIndicatorBarViewPrivate::MProgressIndicatorBarViewPrivate() position(0), width(0), paused(true), + timer(0), animationCacheSize(0) { backgroundPainter = new QPainter; diff --git a/tests/ut_allwidgets/ut_allwidgets.h b/tests/ut_allwidgets/ut_allwidgets.h index 6b0cdc7f..ef778c6c 100644 --- a/tests/ut_allwidgets/ut_allwidgets.h +++ b/tests/ut_allwidgets/ut_allwidgets.h @@ -56,7 +56,6 @@ private: bool checkChildrenBoundingRect(const QGraphicsWidget *widget) const; QList< QPointer<QGraphicsObject> > getAllLayoutItemObjects(QGraphicsLayoutItem *item); QList< QPointer<QGraphicsObject> > getAllSubWidgets(QGraphicsItem *widget); - QGraphicsWidget *m_form; QGraphicsScene *m_scene; }; |