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

Change-Id: Ia24cc8b86def0d9d9c17d6775cc519e491b860b1

1 files changed, 3 insertions, 3 deletions

diff --git a/src/widgets/widgets/qlcdnumber.cpp b/src/widgets/widgets/qlcdnumber.cpp
index 282714843c..3ddada4514 100644
--- a/src/widgets/widgets/qlcdnumber.cpp
+++ b/src/widgets/widgets/qlcdnumber.cpp
@@ -51,7 +51,7 @@ class QLCDNumberPrivate : public QFramePrivate
 public:
     void init();
     void internalSetString(const QString& s);
-    void drawString(const QString& s, QPainter &, QBitArray * = 0, bool = true);
+    void drawString(const QString& s, QPainter &, QBitArray * = nullptr, bool = true);
     //void drawString(const QString &, QPainter &, QBitArray * = 0) const;
     void drawDigit(const QPoint &, QPainter &, int, char, char = ' ');
     void drawSegment(const QPoint &, char, QPainter &, int, bool = false);
@@ -212,7 +212,7 @@ static QString double2string(double num, int base, int ndigits, bool *oflow)
                 *oflow = true;
             return s;
         }
-        s = int2string((int)num, base, ndigits, 0);
+        s = int2string((int)num, base, ndigits, nullptr);
     } else {                                    // decimal base
         int nd = ndigits;
         do {
@@ -706,7 +706,7 @@ void QLCDNumber::paintEvent(QPaintEvent *)
     if (d->smallPoint)
         d->drawString(d->digitStr, p, &d->points, false);
     else
-        d->drawString(d->digitStr, p, 0, false);
+        d->drawString(d->digitStr, p, nullptr, false);
 }