Merge remote-tracking branch 'origin/5.15' into dev

Change-Id: Ia24cc8b86def0d9d9c17d6775cc519e491b860b1

10 files changed, 73 insertions, 73 deletions

diff --git a/src/widgets/util/qcolormap.cpp b/src/widgets/util/qcolormap.cpp
index 6dacc97261..57e61690e9 100644
--- a/src/widgets/util/qcolormap.cpp
+++ b/src/widgets/util/qcolormap.cpp
@@ -59,7 +59,7 @@ public:
     int numcolors;
 };
 
-static QColormapPrivate *screenMap = 0;
+static QColormapPrivate *screenMap = nullptr;
 
 void QColormap::initialize()
 {
@@ -83,7 +83,7 @@ void QColormap::initialize()
 void QColormap::cleanup()
 {
     delete screenMap;
-    screenMap = 0;
+    screenMap = nullptr;
 }
 
 QColormap QColormap::instance(int /*screen*/)
diff --git a/src/widgets/util/qcompleter.cpp b/src/widgets/util/qcompleter.cpp
index 3c0271e7c2..72fa557790 100644
--- a/src/widgets/util/qcompleter.cpp
+++ b/src/widgets/util/qcompleter.cpp
@@ -1262,7 +1262,7 @@ Qt::MatchFlags QCompleter::filterMode() const
 void QCompleter::setPopup(QAbstractItemView *popup)
 {
     Q_D(QCompleter);
-    Q_ASSERT(popup != 0);
+    Q_ASSERT(popup != nullptr);
     if (d->popup) {
         QObject::disconnect(d->popup->selectionModel(), nullptr, this, nullptr);
         QObject::disconnect(d->popup, nullptr, this, nullptr);
diff --git a/src/widgets/util/qflickgesture.cpp b/src/widgets/util/qflickgesture.cpp
index 03df937938..064be873b9 100644
--- a/src/widgets/util/qflickgesture.cpp
+++ b/src/widgets/util/qflickgesture.cpp
@@ -114,19 +114,19 @@ static QMouseEvent *copyMouseEvent(QEvent *e)
     }
 #endif // QT_CONFIG(graphicsview)
     default:
-        return 0;
+        return nullptr;
     }
 }
 
 class PressDelayHandler : public QObject
 {
 private:
-    PressDelayHandler(QObject *parent = 0)
+    PressDelayHandler(QObject *parent = nullptr)
         : QObject(parent)
         , pressDelayTimer(0)
         , sendingEvent(false)
         , mouseButton(Qt::NoButton)
-        , mouseTarget(0)
+        , mouseTarget(nullptr)
         , mouseEventSource(Qt::MouseEventNotSynthesized)
     { }
 
@@ -138,7 +138,7 @@ public:
 
     static PressDelayHandler *instance()
     {
-        static PressDelayHandler *inst = 0;
+        static PressDelayHandler *inst = nullptr;
         if (!inst)
             inst = new PressDelayHandler(QCoreApplication::instance());
         return inst;
@@ -192,10 +192,10 @@ public:
             result = true; // consume this event
         } else if (mouseTarget && scrollerIsActive) {
             // we grabbed the mouse expicitly when the scroller became active, so undo that now
-            sendMouseEvent(0, UngrabMouseBefore);
+            sendMouseEvent(nullptr, UngrabMouseBefore);
         }
-        pressDelayEvent.reset(0);
-        mouseTarget = 0;
+        pressDelayEvent.reset(nullptr);
+        mouseTarget = nullptr;
         return result;
     }
 
@@ -208,9 +208,9 @@ public:
                 killTimer(pressDelayTimer);
                 pressDelayTimer = 0;
             }
-            pressDelayEvent.reset(0);
+            pressDelayEvent.reset(nullptr);
         }
-        mouseTarget = 0;
+        mouseTarget = nullptr;
     }
 
     void scrollerBecameActive()
@@ -222,8 +222,8 @@ public:
                 killTimer(pressDelayTimer);
                 pressDelayTimer = 0;
             }
-            pressDelayEvent.reset(0);
-            mouseTarget = 0;
+            pressDelayEvent.reset(nullptr);
+            mouseTarget = nullptr;
         } else if (mouseTarget) {
             // we did send a press, so we need to fake a release now
 
@@ -261,7 +261,7 @@ protected:
                 qFGDebug() << "QFG: timer event: re-sending mouse press to " << mouseTarget;
                 sendMouseEvent(pressDelayEvent.data(), UngrabMouseBefore);
             }
-            pressDelayEvent.reset(0);
+            pressDelayEvent.reset(nullptr);
 
             if (pressDelayTimer) {
                 killTimer(pressDelayTimer);
@@ -276,7 +276,7 @@ protected:
             sendingEvent = true;
 
 #if QT_CONFIG(graphicsview)
-            QGraphicsItem *grabber = 0;
+            QGraphicsItem *grabber = nullptr;
             if (mouseTarget->parentWidget()) {
                 if (QGraphicsView *gv = qobject_cast<QGraphicsView *>(mouseTarget->parentWidget())) {
                     if (gv->scene())
@@ -350,7 +350,7 @@ QFlickGesture::QFlickGesture(QObject *receiver, Qt::MouseButton button, QObject
 {
     d_func()->q_ptr = this;
     d_func()->receiver = receiver;
-    d_func()->receiverScroller = (receiver && QScroller::hasScroller(receiver)) ? QScroller::scroller(receiver) : 0;
+    d_func()->receiverScroller = (receiver && QScroller::hasScroller(receiver)) ? QScroller::scroller(receiver) : nullptr;
     d_func()->button = button;
 }
 
@@ -358,7 +358,7 @@ QFlickGesture::~QFlickGesture()
 { }
 
 QFlickGesturePrivate::QFlickGesturePrivate()
-    : receiverScroller(0), button(Qt::NoButton), macIgnoreWheel(false)
+    : receiverScroller(nullptr), button(Qt::NoButton), macIgnoreWheel(false)
 { }
 
 
@@ -420,11 +420,11 @@ QGestureRecognizer::Result QFlickGestureRecognizer::recognize(QGesture *state,
         return Ignore;
     }
 
-    const QMouseEvent *me = 0;
+    const QMouseEvent *me = nullptr;
 #if QT_CONFIG(graphicsview)
-    const QGraphicsSceneMouseEvent *gsme = 0;
+    const QGraphicsSceneMouseEvent *gsme = nullptr;
 #endif
-    const QTouchEvent *te = 0;
+    const QTouchEvent *te = nullptr;
     QPoint globalPos;
 
     // qFGDebug() << "FlickGesture "<<state<<"watched:"<<watched<<"receiver"<<d->receiver<<"event"<<event->type()<<"button"<<button;
diff --git a/src/widgets/util/qscroller.cpp b/src/widgets/util/qscroller.cpp
index df05bbf71c..fec373d45c 100644
--- a/src/widgets/util/qscroller.cpp
+++ b/src/widgets/util/qscroller.cpp
@@ -300,7 +300,7 @@ QScroller *QScroller::scroller(QObject *target)
 {
     if (!target) {
         qWarning("QScroller::scroller() was called with a null target.");
-        return 0;
+        return nullptr;
     }
 
     if (qt_allScrollers()->contains(target))
@@ -476,7 +476,7 @@ void QScroller::ungrabGesture(QObject *target)
 
     QGestureRecognizer::unregisterRecognizer(sp->recognizerType);
     // do not delete the recognizer. The QGestureManager is doing this.
-    sp->recognizer = 0;
+    sp->recognizer = nullptr;
 }
 
 #endif // QT_NO_GESTURES
@@ -502,7 +502,7 @@ QScroller::~QScroller()
 #ifndef QT_NO_GESTURES
     QGestureRecognizer::unregisterRecognizer(d->recognizerType);
     // do not delete the recognizer. The QGestureManager is doing this.
-    d->recognizer = 0;
+    d->recognizer = nullptr;
 #endif
     qt_allScrollers()->remove(d->target);
     qt_activeScrollers()->removeOne(this);
@@ -879,7 +879,7 @@ void QScroller::setSnapPositionsY(qreal first, qreal interval)
 QScrollerPrivate::QScrollerPrivate(QScroller *q, QObject *_target)
     : target(_target)
 #ifndef QT_NO_GESTURES
-    , recognizer(0)
+    , recognizer(nullptr)
     , recognizerType(Qt::CustomGesture)
 #endif
     , state(QScroller::Inactive)
@@ -900,7 +900,7 @@ QScrollerPrivate::QScrollerPrivate(QScroller *q, QObject *_target)
 
 void QScrollerPrivate::init()
 {
-    setDpiFromWidget(0);
+    setDpiFromWidget(nullptr);
     monotonicTimer.start();
 }
 
diff --git a/src/widgets/util/qscrollerproperties.cpp b/src/widgets/util/qscrollerproperties.cpp
index df6b899fe4..0306f54faa 100644
--- a/src/widgets/util/qscrollerproperties.cpp
+++ b/src/widgets/util/qscrollerproperties.cpp
@@ -46,8 +46,8 @@
 
 QT_BEGIN_NAMESPACE
 
-static QScrollerPropertiesPrivate *userDefaults = 0;
-static QScrollerPropertiesPrivate *systemDefaults = 0;
+static QScrollerPropertiesPrivate *userDefaults = nullptr;
+static QScrollerPropertiesPrivate *systemDefaults = nullptr;
 
 QScrollerPropertiesPrivate *QScrollerPropertiesPrivate::defaults()
 {
@@ -200,7 +200,7 @@ void QScrollerProperties::setDefaultScrollerProperties(const QScrollerProperties
 void QScrollerProperties::unsetDefaultScrollerProperties()
 {
     delete userDefaults;
-    userDefaults = 0;
+    userDefaults = nullptr;
 }
 
 /*!
diff --git a/src/widgets/util/qsystemtrayicon.cpp b/src/widgets/util/qsystemtrayicon.cpp
index ae81cc5661..ee52139913 100644
--- a/src/widgets/util/qsystemtrayicon.cpp
+++ b/src/widgets/util/qsystemtrayicon.cpp
@@ -453,7 +453,7 @@ void QSystemTrayIconPrivate::_q_emitActivated(QPlatformSystemTrayIcon::Activatio
 }
 
 //////////////////////////////////////////////////////////////////////
-static QBalloonTip *theSolitaryBalloonTip = 0;
+static QBalloonTip *theSolitaryBalloonTip = nullptr;
 
 void QBalloonTip::showBalloon(const QIcon &icon, const QString &title,
                               const QString &message, QSystemTrayIcon *trayIcon,
@@ -475,7 +475,7 @@ void QBalloonTip::hideBalloon()
         return;
     theSolitaryBalloonTip->hide();
     delete theSolitaryBalloonTip;
-    theSolitaryBalloonTip = 0;
+    theSolitaryBalloonTip = nullptr;
 }
 
 void QBalloonTip::updateBalloonPosition(const QPoint& pos)
@@ -493,7 +493,7 @@ bool QBalloonTip::isBalloonVisible()
 
 QBalloonTip::QBalloonTip(const QIcon &icon, const QString &title,
                          const QString &message, QSystemTrayIcon *ti)
-    : QWidget(0, Qt::ToolTip),
+    : QWidget(nullptr, Qt::ToolTip),
       trayIcon(ti),
       timerId(-1),
       showArrow(true)
@@ -583,7 +583,7 @@ QBalloonTip::QBalloonTip(const QIcon &icon, const QString &title,
 
 QBalloonTip::~QBalloonTip()
 {
-    theSolitaryBalloonTip = 0;
+    theSolitaryBalloonTip = nullptr;
 }
 
 void QBalloonTip::paintEvent(QPaintEvent *)
diff --git a/src/widgets/util/qsystemtrayicon_x11.cpp b/src/widgets/util/qsystemtrayicon_x11.cpp
index 0c7bb94a91..86c11f98ed 100644
--- a/src/widgets/util/qsystemtrayicon_x11.cpp
+++ b/src/widgets/util/qsystemtrayicon_x11.cpp
@@ -97,7 +97,7 @@ private:
 };
 
 QSystemTrayIconSys::QSystemTrayIconSys(QSystemTrayIcon *qIn)
-    : QWidget(0, Qt::Window | Qt::FramelessWindowHint | Qt::BypassWindowManagerHint)
+    : QWidget(nullptr, Qt::Window | Qt::FramelessWindowHint | Qt::BypassWindowManagerHint)
     , q(qIn)
 {
     setObjectName(QStringLiteral("QSystemTrayIconSys"));
@@ -218,7 +218,7 @@ private:
 ////////////////////////////////////////////////////////////////////////////
 
 QSystemTrayIconPrivate::QSystemTrayIconPrivate()
-    : sys(0),
+    : sys(nullptr),
       qpa_sys(QGuiApplicationPrivate::platformTheme()->createPlatformSystemTrayIcon()),
       visible(false),
       trayWatcher(nullptr)
diff --git a/src/widgets/util/qundogroup.cpp b/src/widgets/util/qundogroup.cpp
index 9bd63d4232..ae439743bc 100644
--- a/src/widgets/util/qundogroup.cpp
+++ b/src/widgets/util/qundogroup.cpp
@@ -47,7 +47,7 @@ class QUndoGroupPrivate : public QObjectPrivate
 {
     Q_DECLARE_PUBLIC(QUndoGroup)
 public:
-    QUndoGroupPrivate() : active(0) {}
+    QUndoGroupPrivate() : active(nullptr) {}
 
     QUndoStack *active;
     QList<QUndoStack*> stack_list;
@@ -113,7 +113,7 @@ QUndoGroup::~QUndoGroup()
     QList<QUndoStack *>::iterator it = d->stack_list.begin();
     QList<QUndoStack *>::iterator end = d->stack_list.end();
     while (it != end) {
-        (*it)->d_func()->group = 0;
+        (*it)->d_func()->group = nullptr;
         ++it;
     }
 }
@@ -154,8 +154,8 @@ void QUndoGroup::removeStack(QUndoStack *stack)
     if (d->stack_list.removeAll(stack) == 0)
         return;
     if (stack == d->active)
-        setActiveStack(0);
-    stack->d_func()->group = 0;
+        setActiveStack(nullptr);
+    stack->d_func()->group = nullptr;
 }
 
 /*!
@@ -190,7 +190,7 @@ void QUndoGroup::setActiveStack(QUndoStack *stack)
     if (d->active == stack)
         return;
 
-    if (d->active != 0) {
+    if (d->active != nullptr) {
         disconnect(d->active, SIGNAL(canUndoChanged(bool)),
                     this, SIGNAL(canUndoChanged(bool)));
         disconnect(d->active, SIGNAL(undoTextChanged(QString)),
@@ -207,7 +207,7 @@ void QUndoGroup::setActiveStack(QUndoStack *stack)
 
     d->active = stack;
 
-    if (d->active == 0) {
+    if (d->active == nullptr) {
         emit canUndoChanged(false);
         emit undoTextChanged(QString());
         emit canRedoChanged(false);
@@ -265,7 +265,7 @@ QUndoStack *QUndoGroup::activeStack() const
 void QUndoGroup::undo()
 {
     Q_D(QUndoGroup);
-    if (d->active != 0)
+    if (d->active != nullptr)
         d->active->undo();
 }
 
@@ -282,7 +282,7 @@ void QUndoGroup::undo()
 void QUndoGroup::redo()
 {
     Q_D(QUndoGroup);
-    if (d->active != 0)
+    if (d->active != nullptr)
         d->active->redo();
 }
 
@@ -298,7 +298,7 @@ void QUndoGroup::redo()
 bool QUndoGroup::canUndo() const
 {
     Q_D(const QUndoGroup);
-    return d->active != 0 && d->active->canUndo();
+    return d->active != nullptr && d->active->canUndo();
 }
 
 /*!
@@ -313,7 +313,7 @@ bool QUndoGroup::canUndo() const
 bool QUndoGroup::canRedo() const
 {
     Q_D(const QUndoGroup);
-    return d->active != 0 && d->active->canRedo();
+    return d->active != nullptr && d->active->canRedo();
 }
 
 /*!
@@ -328,7 +328,7 @@ bool QUndoGroup::canRedo() const
 QString QUndoGroup::undoText() const
 {
     Q_D(const QUndoGroup);
-    return d->active == 0 ? QString() : d->active->undoText();
+    return d->active == nullptr ? QString() : d->active->undoText();
 }
 
 /*!
@@ -343,7 +343,7 @@ QString QUndoGroup::undoText() const
 QString QUndoGroup::redoText() const
 {
     Q_D(const QUndoGroup);
-    return d->active == 0 ? QString() : d->active->redoText();
+    return d->active == nullptr ? QString() : d->active->redoText();
 }
 
 /*!
@@ -358,7 +358,7 @@ QString QUndoGroup::redoText() const
 bool QUndoGroup::isClean() const
 {
     Q_D(const QUndoGroup);
-    return d->active == 0 || d->active->isClean();
+    return d->active == nullptr || d->active->isClean();
 }
 
 #ifndef QT_NO_ACTION
diff --git a/src/widgets/util/qundostack.cpp b/src/widgets/util/qundostack.cpp
index dbe01e4ad8..8974f11a13 100644
--- a/src/widgets/util/qundostack.cpp
+++ b/src/widgets/util/qundostack.cpp
@@ -128,7 +128,7 @@ QUndoCommand::QUndoCommand(const QString &text, QUndoCommand *parent)
 QUndoCommand::QUndoCommand(QUndoCommand *parent)
 {
     d = new QUndoCommandPrivate;
-    if (parent != 0)
+    if (parent != nullptr)
         parent->d->child_list.append(this);
 }
 
@@ -336,7 +336,7 @@ int QUndoCommand::childCount() const
 const QUndoCommand *QUndoCommand::child(int index) const
 {
     if (index < 0 || index >= d->child_list.count())
-        return 0;
+        return nullptr;
     return d->child_list.at(index);
 }
 
@@ -559,7 +559,7 @@ QUndoStack::~QUndoStack()
 {
 #if QT_CONFIG(undogroup)
     Q_D(QUndoStack);
-    if (d->group != 0)
+    if (d->group != nullptr)
         d->group->removeStack(this);
 #endif
     clear();
@@ -640,7 +640,7 @@ void QUndoStack::push(QUndoCommand *cmd)
 
     bool macro = !d->macro_stack.isEmpty();
 
-    QUndoCommand *cur = 0;
+    QUndoCommand *cur = nullptr;
     if (macro) {
         QUndoCommand *macro_cmd = d->macro_stack.constLast();
         if (!macro_cmd->d->child_list.isEmpty())
@@ -654,7 +654,7 @@ void QUndoStack::push(QUndoCommand *cmd)
             d->clean_index = -1; // we've deleted the clean state
     }
 
-    bool try_merge = cur != 0
+    bool try_merge = cur != nullptr
                         && cur->id() != -1
                         && cur->id() == cmd->id()
                         && (macro || d->index != d->clean_index);
@@ -1225,7 +1225,7 @@ const QUndoCommand *QUndoStack::command(int index) const
     Q_D(const QUndoStack);
 
     if (index < 0 || index >= d->command_list.count())
-        return 0;
+        return nullptr;
     return d->command_list.at(index);
 }
 
@@ -1305,11 +1305,11 @@ void QUndoStack::setActive(bool active)
 #else
     Q_D(QUndoStack);
 
-    if (d->group != 0) {
+    if (d->group != nullptr) {
         if (active)
             d->group->setActiveStack(this);
         else if (d->group->activeStack() == this)
-            d->group->setActiveStack(0);
+            d->group->setActiveStack(nullptr);
     }
 #endif
 }
@@ -1320,7 +1320,7 @@ bool QUndoStack::isActive() const
     return true;
 #else
     Q_D(const QUndoStack);
-    return d->group == 0 || d->group->activeStack() == this;
+    return d->group == nullptr || d->group->activeStack() == this;
 #endif
 }
 
diff --git a/src/widgets/util/qundoview.cpp b/src/widgets/util/qundoview.cpp
index f59d87fb9d..9ca83a1da2 100644
--- a/src/widgets/util/qundoview.cpp
+++ b/src/widgets/util/qundoview.cpp
@@ -54,7 +54,7 @@ class QUndoModel : public QAbstractItemModel
 {
     Q_OBJECT
 public:
-    QUndoModel(QObject *parent = 0);
+    QUndoModel(QObject *parent = nullptr);
 
     QUndoStack *stack() const;
 
@@ -92,7 +92,7 @@ private:
 QUndoModel::QUndoModel(QObject *parent)
     : QAbstractItemModel(parent)
 {
-    m_stack = 0;
+    m_stack = nullptr;
     m_sel_model = new QItemSelectionModel(this, this);
     connect(m_sel_model, SIGNAL(currentChanged(QModelIndex,QModelIndex)),
             this, SLOT(setStackCurrentIndex(QModelIndex)));
@@ -114,13 +114,13 @@ void QUndoModel::setStack(QUndoStack *stack)
     if (m_stack == stack)
         return;
 
-    if (m_stack != 0) {
+    if (m_stack != nullptr) {
         disconnect(m_stack, SIGNAL(cleanChanged(bool)), this, SLOT(stackChanged()));
         disconnect(m_stack, SIGNAL(indexChanged(int)), this, SLOT(stackChanged()));
         disconnect(m_stack, SIGNAL(destroyed(QObject*)), this, SLOT(stackDestroyed(QObject*)));
     }
     m_stack = stack;
-    if (m_stack != 0) {
+    if (m_stack != nullptr) {
         connect(m_stack, SIGNAL(cleanChanged(bool)), this, SLOT(stackChanged()));
         connect(m_stack, SIGNAL(indexChanged(int)), this, SLOT(stackChanged()));
         connect(m_stack, SIGNAL(destroyed(QObject*)), this, SLOT(stackDestroyed(QObject*)));
@@ -133,7 +133,7 @@ void QUndoModel::stackDestroyed(QObject *obj)
 {
     if (obj != m_stack)
         return;
-    m_stack = 0;
+    m_stack = nullptr;
 
     stackChanged();
 }
@@ -147,7 +147,7 @@ void QUndoModel::stackChanged()
 
 void QUndoModel::setStackCurrentIndex(const QModelIndex &index)
 {
-    if (m_stack == 0)
+    if (m_stack == nullptr)
         return;
 
     if (index == selectedIndex())
@@ -161,12 +161,12 @@ void QUndoModel::setStackCurrentIndex(const QModelIndex &index)
 
 QModelIndex QUndoModel::selectedIndex() const
 {
-    return m_stack == 0 ? QModelIndex() : createIndex(m_stack->index(), 0);
+    return m_stack == nullptr ? QModelIndex() : createIndex(m_stack->index(), 0);
 }
 
 QModelIndex QUndoModel::index(int row, int column, const QModelIndex &parent) const
 {
-    if (m_stack == 0)
+    if (m_stack == nullptr)
         return QModelIndex();
 
     if (parent.isValid())
@@ -188,7 +188,7 @@ QModelIndex QUndoModel::parent(const QModelIndex&) const
 
 int QUndoModel::rowCount(const QModelIndex &parent) const
 {
-    if (m_stack == 0)
+    if (m_stack == nullptr)
         return 0;
 
     if (parent.isValid())
@@ -204,7 +204,7 @@ int QUndoModel::columnCount(const QModelIndex&) const
 
 QVariant QUndoModel::data(const QModelIndex &index, int role) const
 {
-    if (m_stack == 0)
+    if (m_stack == nullptr)
         return QVariant();
 
     if (index.column() != 0)
@@ -274,9 +274,9 @@ class QUndoViewPrivate : public QListViewPrivate
 public:
     QUndoViewPrivate() :
 #if QT_CONFIG(undogroup)
-        group(0),
+        group(nullptr),
 #endif
-        model(0) {}
+        model(nullptr) {}
 
 #if QT_CONFIG(undogroup)
     QPointer<QUndoGroup> group;
@@ -370,7 +370,7 @@ void QUndoView::setStack(QUndoStack *stack)
 {
     Q_D(QUndoView);
 #if QT_CONFIG(undogroup)
-    setGroup(0);
+    setGroup(nullptr);
 #endif
     d->model->setStack(stack);
 }
@@ -393,19 +393,19 @@ void QUndoView::setGroup(QUndoGroup *group)
     if (d->group == group)
         return;
 
-    if (d->group != 0) {
+    if (d->group != nullptr) {
         disconnect(d->group, SIGNAL(activeStackChanged(QUndoStack*)),
                 d->model, SLOT(setStack(QUndoStack*)));
     }
 
     d->group = group;
 
-    if (d->group != 0) {
+    if (d->group != nullptr) {
         connect(d->group, SIGNAL(activeStackChanged(QUndoStack*)),
                 d->model, SLOT(setStack(QUndoStack*)));
         d->model->setStack(d->group->activeStack());
     } else {
-        d->model->setStack(0);
+        d->model->setStack(nullptr);
     }
 }