1 files changed, 20 insertions, 18 deletions

diff --git a/src/templates/qquickswipeview.cpp b/src/templates/qquickswipeview.cpp
index f807439b..63dc525f 100644
--- a/src/templates/qquickswipeview.cpp
+++ b/src/templates/qquickswipeview.cpp
@@ -48,7 +48,7 @@ QT_BEGIN_NAMESPACE
     \inqmlmodule Qt.labs.controls
     \ingroup qtlabscontrols-navigation
     \ingroup qtlabscontrols-containers
-    \brief A swipe view control.
+    \brief Enables the user to navigate pages by swiping sideways.
 
     SwipeView provides a swipe-based navigation model.
 
@@ -126,7 +126,7 @@ QQuickSwipeViewAttached *QQuickSwipeView::qmlAttachedProperties(QObject *object)
     QQuickItem *item = qobject_cast<QQuickItem *>(object);
     if (!item) {
         qWarning() << "SwipeView: attached properties must be accessed from within a child item";
-        return Q_NULLPTR;
+        return nullptr;
     }
 
     return new QQuickSwipeViewAttached(item);
@@ -180,7 +180,7 @@ class QQuickSwipeViewAttachedPrivate : public QObjectPrivate, public QQuickItemC
 public:
     QQuickSwipeViewAttachedPrivate(QQuickItem *item) :
         item(item),
-        swipeView(Q_NULLPTR),
+        swipeView(nullptr),
         index(-1),
         isCurrent(false)
     {
@@ -191,9 +191,9 @@ public:
 
     void updateView(QQuickItem *parent);
 
-    void itemChildAdded(QQuickItem *, QQuickItem *) Q_DECL_OVERRIDE;
-    void itemChildRemoved(QQuickItem *, QQuickItem *) Q_DECL_OVERRIDE;
-    void itemParentChanged(QQuickItem *, QQuickItem *) Q_DECL_OVERRIDE;
+    void itemChildAdded(QQuickItem *, QQuickItem *) override;
+    void itemChildRemoved(QQuickItem *, QQuickItem *) override;
+    void itemParentChanged(QQuickItem *, QQuickItem *) override;
 
     void updateIndex();
     void updateIsCurrent();
@@ -213,7 +213,7 @@ public:
 
 void QQuickSwipeViewAttachedPrivate::updateIndex()
 {
-    setIndex(swipeView ? QQuickSwipeViewPrivate::get(swipeView)->contentModel->indexOf(item, Q_NULLPTR) : -1);
+    setIndex(swipeView ? QQuickSwipeViewPrivate::get(swipeView)->contentModel->indexOf(item, nullptr) : -1);
 }
 
 void QQuickSwipeViewAttachedPrivate::updateIsCurrent()
@@ -257,20 +257,22 @@ void QQuickSwipeViewAttachedPrivate::setView(QQuickSwipeView *view)
 
 void QQuickSwipeViewAttachedPrivate::setIsCurrent(bool current)
 {
-    if (current != isCurrent) {
-        isCurrent = current;
-        Q_Q(QQuickSwipeViewAttached);
-        emit q->isCurrentItemChanged();
-    }
+    if (current == isCurrent)
+        return;
+
+    isCurrent = current;
+    Q_Q(QQuickSwipeViewAttached);
+    emit q->isCurrentItemChanged();
 }
 
 void QQuickSwipeViewAttachedPrivate::setIndex(int i)
 {
-    if (i != index) {
-        index = i;
-        Q_Q(QQuickSwipeViewAttached);
-        emit q->indexChanged();
-    }
+    if (i == index)
+        return;
+
+    index = i;
+    Q_Q(QQuickSwipeViewAttached);
+    emit q->indexChanged();
 }
 
 void QQuickSwipeViewAttachedPrivate::updateView(QQuickItem *parent)
@@ -280,7 +282,7 @@ void QQuickSwipeViewAttachedPrivate::updateView(QQuickItem *parent)
     // - A non-visual or weird type like TestCase, when child items are created from components
     //   wherein the attached properties are used
     // - null, when the item was removed with removeItem()
-    QQuickSwipeView *view = Q_NULLPTR;
+    QQuickSwipeView *view = nullptr;
     if (parent) {
         view = qobject_cast<QQuickSwipeView*>(parent);
         if (!view) {