Move away from using 0 as a pointer constant

Cleans up most of corelib to use nullptr or default enums
where appropriate.

Change-Id: Ifcaac14ecdaaee730f87f10941db3ce407d71ef9
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
 
 

14 files changed, 56 insertions, 56 deletions

diff --git a/src/corelib/tools/qarraydata.cpp b/src/corelib/tools/qarraydata.cpp
index 88d8b8244d..844cde5563 100644
--- a/src/corelib/tools/qarraydata.cpp
+++ b/src/corelib/tools/qarraydata.cpp
@@ -215,7 +215,7 @@ QArrayData *QArrayData::allocate(size_t objectSize, size_t alignment,
         headerSize += (alignment - Q_ALIGNOF(QArrayData));
 
     if (headerSize > size_t(MaxAllocSize))
-        return 0;
+        return nullptr;
 
     size_t allocSize = calculateBlockSize(capacity, objectSize, headerSize, options);
     QArrayData *header = static_cast<QArrayData *>(::malloc(allocSize));
diff --git a/src/corelib/tools/qbytearray.cpp b/src/corelib/tools/qbytearray.cpp
index 9526350126..c25d39461f 100644
--- a/src/corelib/tools/qbytearray.cpp
+++ b/src/corelib/tools/qbytearray.cpp
@@ -2072,7 +2072,7 @@ static inline QByteArray &qbytearray_insert(QByteArray *ba,
 {
     Q_ASSERT(pos >= 0);
 
-    if (pos < 0 || len <= 0 || arr == 0)
+    if (pos < 0 || len <= 0 || arr == nullptr)
         return *ba;
 
     int oldsize = ba->size();
@@ -4775,7 +4775,7 @@ static void q_toPercentEncoding(QByteArray *ba, const char *dontEncode, const ch
     QByteArray input = *ba;
     int len = input.count();
     const char *inputData = input.constData();
-    char *output = 0;
+    char *output = nullptr;
     int length = 0;
 
     for (int i = 0; i < len; ++i) {
@@ -4815,7 +4815,7 @@ void q_toPercentEncoding(QByteArray *ba, const char *exclude, const char *includ
 void q_normalizePercentEncoding(QByteArray *ba, const char *exclude)
 {
     q_fromPercentEncoding(ba, '%');
-    q_toPercentEncoding(ba, exclude, 0, '%');
+    q_toPercentEncoding(ba, exclude, nullptr, '%');
 }
 
 /*!
diff --git a/src/corelib/tools/qbytearraymatcher.cpp b/src/corelib/tools/qbytearraymatcher.cpp
index d2eb4e0e3c..72e09226af 100644
--- a/src/corelib/tools/qbytearraymatcher.cpp
+++ b/src/corelib/tools/qbytearraymatcher.cpp
@@ -116,9 +116,9 @@ static inline int bm_find(const uchar *cc, int l, int index, const uchar *puc, u
     Call setPattern() to give it a pattern to match.
 */
 QByteArrayMatcher::QByteArrayMatcher()
-    : d(0)
+    : d(nullptr)
 {
-    p.p = 0;
+    p.p = nullptr;
     p.l = 0;
     memset(p.q_skiptable, 0, sizeof(p.q_skiptable));
 }
@@ -129,7 +129,7 @@ QByteArrayMatcher::QByteArrayMatcher()
   the destructor does not delete \a pattern.
  */
 QByteArrayMatcher::QByteArrayMatcher(const char *pattern, int length)
-    : d(0)
+    : d(nullptr)
 {
     p.p = reinterpret_cast<const uchar *>(pattern);
     p.l = length;
@@ -141,7 +141,7 @@ QByteArrayMatcher::QByteArrayMatcher(const char *pattern, int length)
     Call indexIn() to perform a search.
 */
 QByteArrayMatcher::QByteArrayMatcher(const QByteArray &pattern)
-    : d(0), q_pattern(pattern)
+    : d(nullptr), q_pattern(pattern)
 {
     p.p = reinterpret_cast<const uchar *>(pattern.constData());
     p.l = pattern.size();
@@ -152,7 +152,7 @@ QByteArrayMatcher::QByteArrayMatcher(const QByteArray &pattern)
     Copies the \a other byte array matcher to this byte array matcher.
 */
 QByteArrayMatcher::QByteArrayMatcher(const QByteArrayMatcher &other)
-    : d(0)
+    : d(nullptr)
 {
     operator=(other);
 }
diff --git a/src/corelib/tools/qchar.cpp b/src/corelib/tools/qchar.cpp
index d6061defc3..e097e4a5fe 100644
--- a/src/corelib/tools/qchar.cpp
+++ b/src/corelib/tools/qchar.cpp
@@ -1339,7 +1339,7 @@ static const unsigned short * QT_FASTCALL decompositionHelper
     if (index == 0xffff) {
         *length = 0;
         *tag = QChar::NoDecomposition;
-        return 0;
+        return nullptr;
     }
 
     const unsigned short *decomposition = uc_decomposition_map+index;
diff --git a/src/corelib/tools/qhash.cpp b/src/corelib/tools/qhash.cpp
index 85a3456d71..6b003fe739 100644
--- a/src/corelib/tools/qhash.cpp
+++ b/src/corelib/tools/qhash.cpp
@@ -471,7 +471,7 @@ static int countBits(int hint)
 const int MinNumBits = 4;
 
 const QHashData QHashData::shared_null = {
-    0, 0, Q_REFCOUNT_INITIALIZE_STATIC, 0, 0, MinNumBits, 0, 0, 0, true, false, 0
+    nullptr, nullptr, Q_REFCOUNT_INITIALIZE_STATIC, 0, 0, MinNumBits, 0, 0, 0, true, false, 0
 };
 
 void *QHashData::allocateNode(int nodeAlign)
@@ -501,8 +501,8 @@ QHashData *QHashData::detach_helper(void (*node_duplicate)(Node *, void *),
     if (this == &shared_null)
         qt_initialize_qhash_seed(); // may throw
     d = new QHashData;
-    d->fakeNext = 0;
-    d->buckets = 0;
+    d->fakeNext = nullptr;
+    d->buckets = nullptr;
     d->ref.initializeOwned();
     d->size = size;
     d->nodeSize = nodeSize;
diff --git a/src/corelib/tools/qlist.cpp b/src/corelib/tools/qlist.cpp
index 48617f0539..dfebd57e34 100644
--- a/src/corelib/tools/qlist.cpp
+++ b/src/corelib/tools/qlist.cpp
@@ -75,7 +75,7 @@ template class Q_CORE_EXPORT QVector<QPoint>;
     the number of elements in the list.
 */
 
-const QListData::Data QListData::shared_null = { Q_REFCOUNT_INITIALIZE_STATIC, 0, 0, 0, { 0 } };
+const QListData::Data QListData::shared_null = { Q_REFCOUNT_INITIALIZE_STATIC, 0, 0, 0, { nullptr } };
 
 /*!
  *  Detaches the QListData by allocating new memory for a list which will be bigger
diff --git a/src/corelib/tools/qlocale.cpp b/src/corelib/tools/qlocale.cpp
index c8740e55f3..939f8eb34d 100644
--- a/src/corelib/tools/qlocale.cpp
+++ b/src/corelib/tools/qlocale.cpp
@@ -301,9 +301,9 @@ QByteArray QLocaleId::name(char separator) const
 
     const unsigned char *lang = language_code_list + 3 * language_id;
     const unsigned char *script =
-            (script_id != QLocale::AnyScript ? script_code_list + 4 * script_id : 0);
+            (script_id != QLocale::AnyScript ? script_code_list + 4 * script_id : nullptr);
     const unsigned char *country =
-            (country_id != QLocale::AnyCountry ? country_code_list + 3 * country_id : 0);
+            (country_id != QLocale::AnyCountry ? country_code_list + 3 * country_id : nullptr);
     char len = (lang[2] != 0 ? 3 : 2) + (script ? 4+1 : 0) + (country ? (country[2] != 0 ? 3 : 2)+1 : 0);
     QByteArray name(len, Qt::Uninitialized);
     char *uc = name.data();
@@ -373,7 +373,7 @@ static const QLocaleData *findLocaleDataById(const QLocaleId &localeId)
         } while (data->m_language_id && data->m_language_id == localeId.language_id);
     }
 
-    return 0;
+    return nullptr;
 }
 
 const QLocaleData *QLocaleData::findLocaleData(QLocale::Language language, QLocale::Script script, QLocale::Country country)
@@ -604,7 +604,7 @@ int qt_repeatCount(QStringView s)
     return int(j);
 }
 
-static const QLocaleData *default_data = 0;
+static const QLocaleData *default_data = nullptr;
 static QLocale::NumberOptions default_number_options = QLocale::DefaultNumberOptions;
 
 static const QLocaleData *const c_data = locale_data;
diff --git a/src/corelib/tools/qlocale_p.h b/src/corelib/tools/qlocale_p.h
index 15398ded32..59cc33700d 100644
--- a/src/corelib/tools/qlocale_p.h
+++ b/src/corelib/tools/qlocale_p.h
@@ -250,14 +250,14 @@ public:
         if (qIsInf(d))
             return float(d);
         if (std::fabs(d) > std::numeric_limits<float>::max()) {
-            if (ok != nullptr)
+            if (ok)
                 *ok = false;
             const float huge = std::numeric_limits<float>::infinity();
             return d < 0 ? -huge : huge;
         }
         if (d != 0 && float(d) == 0) {
             // Values that underflow double already failed. Match them:
-            if (ok != 0)
+            if (ok)
                 *ok = false;
             return 0;
         }
diff --git a/src/corelib/tools/qlocale_tools.cpp b/src/corelib/tools/qlocale_tools.cpp
index 53258bec3e..db8c8cd12f 100644
--- a/src/corelib/tools/qlocale_tools.cpp
+++ b/src/corelib/tools/qlocale_tools.cpp
@@ -398,7 +398,7 @@ qstrtoull(const char * nptr, const char **endptr, int base, bool *ok)
 
     *ok = true;
     errno = 0;
-    char *endptr2 = 0;
+    char *endptr2 = nullptr;
     unsigned long long result = qt_strtoull(nptr, &endptr2, base);
     if (endptr)
         *endptr = endptr2;
@@ -415,7 +415,7 @@ qstrtoll(const char * nptr, const char **endptr, int base, bool *ok)
 {
     *ok = true;
     errno = 0;
-    char *endptr2 = 0;
+    char *endptr2 = nullptr;
     long long result = qt_strtoll(nptr, &endptr2, base);
     if (endptr)
         *endptr = endptr2;
diff --git a/src/corelib/tools/qmap.cpp b/src/corelib/tools/qmap.cpp
index 5f7275c5f8..a0ec372f9a 100644
--- a/src/corelib/tools/qmap.cpp
+++ b/src/corelib/tools/qmap.cpp
@@ -48,7 +48,7 @@
 
 QT_BEGIN_NAMESPACE
 
-const QMapDataBase QMapDataBase::shared_null = { Q_REFCOUNT_INITIALIZE_STATIC, 0, { 0, 0, 0 }, 0 };
+const QMapDataBase QMapDataBase::shared_null = { Q_REFCOUNT_INITIALIZE_STATIC, 0, { 0, nullptr, nullptr }, nullptr };
 
 const QMapNodeBase *QMapNodeBase::nextNode() const
 {
@@ -92,7 +92,7 @@ void QMapDataBase::rotateLeft(QMapNodeBase *x)
     QMapNodeBase *&root = header.left;
     QMapNodeBase *y = x->right;
     x->right = y->left;
-    if (y->left != 0)
+    if (y->left != nullptr)
         y->left->setParent(x);
     y->setParent(x->parent());
     if (x == root)
@@ -111,7 +111,7 @@ void QMapDataBase::rotateRight(QMapNodeBase *x)
     QMapNodeBase *&root = header.left;
     QMapNodeBase *y = x->left;
     x->left = y->right;
-    if (y->right != 0)
+    if (y->right != nullptr)
         y->right->setParent(x);
     y->setParent(x->parent());
     if (x == root)
@@ -173,7 +173,7 @@ void QMapDataBase::freeNodeAndRebalance(QMapNodeBase *z)
     QMapNodeBase *y = z;
     QMapNodeBase *x;
     QMapNodeBase *x_parent;
-    if (y->left == 0) {
+    if (y->left == nullptr) {
         x = y->right;
         if (y == mostLeftNode) {
             if (x)
@@ -182,11 +182,11 @@ void QMapDataBase::freeNodeAndRebalance(QMapNodeBase *z)
                 mostLeftNode = y->parent();
         }
     } else {
-        if (y->right == 0) {
+        if (y->right == nullptr) {
             x = y->left;
         } else {
             y = y->right;
-            while (y->left != 0)
+            while (y->left != nullptr)
                 y = y->left;
             x = y->right;
         }
@@ -228,7 +228,7 @@ void QMapDataBase::freeNodeAndRebalance(QMapNodeBase *z)
             z->parent()->right = x;
     }
     if (y->color() != QMapNodeBase::Red) {
-        while (x != root && (x == 0 || x->color() == QMapNodeBase::Black)) {
+        while (x != root && (x == nullptr || x->color() == QMapNodeBase::Black)) {
             if (x == x_parent->left) {
                 QMapNodeBase *w = x_parent->right;
                 if (w->color() == QMapNodeBase::Red) {
@@ -237,13 +237,13 @@ void QMapDataBase::freeNodeAndRebalance(QMapNodeBase *z)
                     rotateLeft(x_parent);
                     w = x_parent->right;
                 }
-                if ((w->left == 0 || w->left->color() == QMapNodeBase::Black) &&
-                    (w->right == 0 || w->right->color() == QMapNodeBase::Black)) {
+                if ((w->left == nullptr || w->left->color() == QMapNodeBase::Black) &&
+                    (w->right == nullptr || w->right->color() == QMapNodeBase::Black)) {
                     w->setColor(QMapNodeBase::Red);
                     x = x_parent;
                     x_parent = x_parent->parent();
                 } else {
-                    if (w->right == 0 || w->right->color() == QMapNodeBase::Black) {
+                    if (w->right == nullptr || w->right->color() == QMapNodeBase::Black) {
                         if (w->left)
                             w->left->setColor(QMapNodeBase::Black);
                         w->setColor(QMapNodeBase::Red);
@@ -265,13 +265,13 @@ void QMapDataBase::freeNodeAndRebalance(QMapNodeBase *z)
                 rotateRight(x_parent);
                 w = x_parent->left;
             }
-            if ((w->right == 0 || w->right->color() == QMapNodeBase::Black) &&
-                (w->left == 0 || w->left->color() == QMapNodeBase::Black)) {
+            if ((w->right == nullptr || w->right->color() == QMapNodeBase::Black) &&
+                (w->left == nullptr|| w->left->color() == QMapNodeBase::Black)) {
                 w->setColor(QMapNodeBase::Red);
                 x = x_parent;
                 x_parent = x_parent->parent();
             } else {
-                if (w->left == 0 || w->left->color() == QMapNodeBase::Black) {
+                if (w->left == nullptr || w->left->color() == QMapNodeBase::Black) {
                     if (w->right)
                         w->right->setColor(QMapNodeBase::Black);
                     w->setColor(QMapNodeBase::Red);
@@ -363,8 +363,8 @@ QMapDataBase *QMapDataBase::createData()
     d->size = 0;
 
     d->header.p = 0;
-    d->header.left = 0;
-    d->header.right = 0;
+    d->header.left = nullptr;
+    d->header.right = nullptr;
     d->mostLeftNode = &(d->header);
 
     return d;
diff --git a/src/corelib/tools/qregexp.cpp b/src/corelib/tools/qregexp.cpp
index d970843dea..132ff48846 100644
--- a/src/corelib/tools/qregexp.cpp
+++ b/src/corelib/tools/qregexp.cpp
@@ -937,10 +937,10 @@ struct QRegExpMatchState
 
     const QRegExpEngine *eng;
 
-    inline QRegExpMatchState() : bigArray(0), captured(0) {}
+    inline QRegExpMatchState() : bigArray(nullptr), captured(nullptr) {}
     inline ~QRegExpMatchState() { free(bigArray); }
 
-    void drain() { free(bigArray); bigArray = 0; captured = 0; } // to save memory
+    void drain() { free(bigArray); bigArray = nullptr; captured = nullptr; } // to save memory
     void prepareForMatch(QRegExpEngine *eng);
     void match(const QChar *str, int len, int pos, bool minimal,
         bool oneTest, int caretIndex);
@@ -1428,7 +1428,7 @@ void QRegExpMatchState::match(const QChar *str0, int len0, int pos0,
 #endif
     {
         in = str0;
-        if (in == 0)
+        if (in == nullptr)
             in = &char_null;
         pos = pos0;
         caretPos = caretIndex;
@@ -2910,7 +2910,7 @@ int QRegExpEngine::getEscape()
 #ifndef QT_NO_REGEXP_ESCAPE
     if ((prevCh & ~0xff) == 0) {
         const char *p = strchr(tab, prevCh);
-        if (p != 0)
+        if (p != nullptr)
             return Tok_Char | backTab[p - tab];
     }
 #endif
@@ -3530,7 +3530,7 @@ int QRegExpEngine::parse(const QChar *pattern, int len)
 #endif
     box.cat(middleBox);
     box.cat(rightBox);
-    yyCharClass.reset(0);
+    yyCharClass.reset();
 
 #ifndef QT_NO_REGEXP_CAPTURE
     for (int i = 0; i < nf; ++i) {
@@ -3608,7 +3608,7 @@ int QRegExpEngine::parse(const QChar *pattern, int len)
 void QRegExpEngine::parseAtom(Box *box)
 {
 #ifndef QT_NO_REGEXP_LOOKAHEAD
-    QRegExpEngine *eng = 0;
+    QRegExpEngine *eng = nullptr;
     bool neg;
     int len;
 #endif
@@ -3805,9 +3805,9 @@ struct QRegExpPrivate
     QRegExpMatchState matchState;
 
     inline QRegExpPrivate()
-        : eng(0), engineKey(QString(), QRegExp::RegExp, Qt::CaseSensitive), minimal(false) { }
+        : eng(nullptr), engineKey(QString(), QRegExp::RegExp, Qt::CaseSensitive), minimal(false) { }
     inline QRegExpPrivate(const QRegExpEngineKey &key)
-        : eng(0), engineKey(key), minimal(false) {}
+        : eng(nullptr), engineKey(key), minimal(false) {}
 };
 
 #if !defined(QT_NO_REGEXP_OPTIM)
@@ -3886,9 +3886,9 @@ static void prepareEngineForMatch(QRegExpPrivate *priv, const QString &str)
 
 static void invalidateEngine(QRegExpPrivate *priv)
 {
-    if (priv->eng != 0) {
+    if (priv->eng) {
         derefEngine(priv->eng, priv->engineKey);
-        priv->eng = 0;
+        priv->eng = nullptr;
         priv->matchState.drain();
     }
 }
diff --git a/src/corelib/tools/qringbuffer.cpp b/src/corelib/tools/qringbuffer.cpp
index 67cce57d01..311058a776 100644
--- a/src/corelib/tools/qringbuffer.cpp
+++ b/src/corelib/tools/qringbuffer.cpp
@@ -105,7 +105,7 @@ const char *QRingBuffer::readPointerAtPosition(qint64 pos, qint64 &length) const
     }
 
     length = 0;
-    return 0;
+    return nullptr;
 }
 
 void QRingBuffer::free(qint64 bytes)
diff --git a/src/corelib/tools/qstring.cpp b/src/corelib/tools/qstring.cpp
index 963c2a4d34..345a786df4 100644
--- a/src/corelib/tools/qstring.cpp
+++ b/src/corelib/tools/qstring.cpp
@@ -3044,7 +3044,7 @@ void QString::replace_helper(uint *indices, int nIndices, int blen, const QChar
 {
     // Copy after if it lies inside our own d->data() area (which we could
     // possibly invalidate via a realloc or modify by replacement).
-    QChar *afterBuffer = 0;
+    QChar *afterBuffer = nullptr;
     if (pointsIntoRange(after, d->data(), d->size)) // Use copy in place of vulnerable original:
         after = afterBuffer = textCopy(after, alen);
 
@@ -3129,7 +3129,7 @@ QString &QString::replace(const QChar *before, int blen,
         return *this;
 
     QStringMatcher matcher(before, blen, cs);
-    QChar *beforeBuffer = 0, *afterBuffer = 0;
+    QChar *beforeBuffer = nullptr, *afterBuffer = nullptr;
 
     int index = 0;
     while (1) {
@@ -5591,7 +5591,7 @@ QString QString::fromUtf16(const ushort *unicode, int size)
         while (unicode[size] != 0)
             ++size;
     }
-    return QUtf16::convertToUnicode((const char *)unicode, size*2, 0);
+    return QUtf16::convertToUnicode((const char *)unicode, size*2, nullptr);
 }
 
 /*!
@@ -5645,7 +5645,7 @@ QString QString::fromUcs4(const uint *unicode, int size)
         while (unicode[size] != 0)
             ++size;
     }
-    return QUtf32::convertToUnicode((const char *)unicode, size*4, 0);
+    return QUtf32::convertToUnicode((const char *)unicode, size*4, nullptr);
 }
 
 
@@ -8060,7 +8060,7 @@ void qt_string_normalize(QString *data, QString::NormalizationForm mode, QChar::
         version = QChar::currentUnicodeVersion();
     } else if (int(version) <= NormalizationCorrectionsVersionMax) {
         const QString &s = *data;
-        QChar *d = 0;
+        QChar *d = nullptr;
         for (int i = 0; i < NumNormalizationCorrections; ++i) {
             const NormalizationCorrection &n = uc_normalization_corrections[i];
             if (n.version > version) {
diff --git a/src/corelib/tools/qstringmatcher.cpp b/src/corelib/tools/qstringmatcher.cpp
index 2e2ae18b9a..167a467480 100644
--- a/src/corelib/tools/qstringmatcher.cpp
+++ b/src/corelib/tools/qstringmatcher.cpp
@@ -149,7 +149,7 @@ static inline qsizetype bm_find(const ushort *uc, qsizetype l, qsizetype index,
     Call setPattern() to give it a pattern to match.
 */
 QStringMatcher::QStringMatcher()
-    : d_ptr(0), q_cs(Qt::CaseSensitive)
+    : d_ptr(nullptr), q_cs(Qt::CaseSensitive)
 {
     memset(q_data, 0, sizeof(q_data));
 }
@@ -161,7 +161,7 @@ QStringMatcher::QStringMatcher()
     Call indexIn() to perform a search.
 */
 QStringMatcher::QStringMatcher(const QString &pattern, Qt::CaseSensitivity cs)
-    : d_ptr(0), q_pattern(pattern), q_cs(cs)
+    : d_ptr(nullptr), q_pattern(pattern), q_cs(cs)
 {
     p.uc = pattern.unicode();
     p.len = pattern.size();
@@ -200,7 +200,7 @@ QStringMatcher::QStringMatcher(QStringView str, Qt::CaseSensitivity cs)
     Copies the \a other string matcher to this string matcher.
 */
 QStringMatcher::QStringMatcher(const QStringMatcher &other)
-    : d_ptr(0)
+    : d_ptr(nullptr)
 {
     operator=(other);
 }