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>
 
 

9 files changed, 56 insertions, 54 deletions

diff --git a/src/corelib/serialization/qdatastream.cpp b/src/corelib/serialization/qdatastream.cpp
index 2c29b81f7c..b3330d6cea 100644
--- a/src/corelib/serialization/qdatastream.cpp
+++ b/src/corelib/serialization/qdatastream.cpp
@@ -277,7 +277,7 @@ QT_BEGIN_NAMESPACE
 
 QDataStream::QDataStream()
 {
-    dev = 0;
+    dev = nullptr;
     owndev = false;
     byteorder = BigEndian;
     ver = Qt_DefaultCompiledVersion;
@@ -433,7 +433,7 @@ bool QDataStream::atEnd() const
 */
 QDataStream::FloatingPointPrecision QDataStream::floatingPointPrecision() const
 {
-    return d == 0 ? QDataStream::DoublePrecision : d->floatingPointPrecision;
+    return d ? d->floatingPointPrecision : QDataStream::DoublePrecision;
 }
 
 /*!
@@ -458,7 +458,7 @@ QDataStream::FloatingPointPrecision QDataStream::floatingPointPrecision() const
 */
 void QDataStream::setFloatingPointPrecision(QDataStream::FloatingPointPrecision precision)
 {
-    if (d == 0)
+    if (!d)
         d.reset(new QDataStreamPrivate());
     d->floatingPointPrecision = precision;
 }
@@ -639,7 +639,7 @@ void QDataStream::startTransaction()
 {
     CHECK_STREAM_PRECOND(Q_VOID)
 
-    if (d == 0)
+    if (!d)
         d.reset(new QDataStreamPrivate());
 
     if (++d->transactionDepth == 1) {
@@ -1043,7 +1043,7 @@ QDataStream &QDataStream::operator>>(char *&s)
 
 QDataStream &QDataStream::readBytes(char *&s, uint &l)
 {
-    s = 0;
+    s = nullptr;
     l = 0;
     CHECK_STREAM_PRECOND(*this)
 
@@ -1054,8 +1054,8 @@ QDataStream &QDataStream::readBytes(char *&s, uint &l)
 
     const quint32 Step = 1024 * 1024;
     quint32 allocated = 0;
-    char *prevBuf = 0;
-    char *curBuf = 0;
+    char *prevBuf = nullptr;
+    char *curBuf = nullptr;
 
     do {
         int blockSize = qMin(Step, len - allocated);
diff --git a/src/corelib/serialization/qjsonarray.cpp b/src/corelib/serialization/qjsonarray.cpp
index 7dfa9b43f0..3a6244f5ac 100644
--- a/src/corelib/serialization/qjsonarray.cpp
+++ b/src/corelib/serialization/qjsonarray.cpp
@@ -132,7 +132,7 @@ QT_BEGIN_NAMESPACE
     Creates an empty array.
  */
 QJsonArray::QJsonArray()
-    : d(0), a(0)
+    : d(nullptr), a(nullptr)
 {
 }
 
@@ -168,8 +168,8 @@ QJsonArray::QJsonArray(QJsonPrivate::Data *data, QJsonPrivate::Array *array)
  */
 void QJsonArray::initialize()
 {
-    d = 0;
-    a = 0;
+    d = nullptr;
+    a = nullptr;
 }
 
 /*!
diff --git a/src/corelib/serialization/qjsondocument.cpp b/src/corelib/serialization/qjsondocument.cpp
index 179a87c699..f8027efb58 100644
--- a/src/corelib/serialization/qjsondocument.cpp
+++ b/src/corelib/serialization/qjsondocument.cpp
@@ -84,7 +84,7 @@ QT_BEGIN_NAMESPACE
  * Constructs an empty and invalid document.
  */
 QJsonDocument::QJsonDocument()
-    : d(0)
+    : d(nullptr)
 {
 }
 
@@ -92,7 +92,7 @@ QJsonDocument::QJsonDocument()
  * Creates a QJsonDocument from \a object.
  */
 QJsonDocument::QJsonDocument(const QJsonObject &object)
-    : d(0)
+    : d(nullptr)
 {
     setObject(object);
 }
@@ -101,7 +101,7 @@ QJsonDocument::QJsonDocument(const QJsonObject &object)
  * Constructs a QJsonDocument from \a array.
  */
 QJsonDocument::QJsonDocument(const QJsonArray &array)
-    : d(0)
+    : d(nullptr)
 {
     setArray(array);
 }
@@ -236,7 +236,7 @@ const char *QJsonDocument::rawData(int *size) const
 {
     if (!d) {
         *size = 0;
-        return 0;
+        return nullptr;
     }
     *size = d->alloc;
     return d->rawData;
@@ -635,7 +635,7 @@ bool QJsonDocument::operator==(const QJsonDocument &other) const
  */
 bool QJsonDocument::isNull() const
 {
-    return (d == 0);
+    return (d == nullptr);
 }
 
 #if !defined(QT_NO_DEBUG_STREAM) && !defined(QT_JSON_READONLY)
diff --git a/src/corelib/serialization/qjsonobject.cpp b/src/corelib/serialization/qjsonobject.cpp
index a9f25a119c..f92bdd0e80 100644
--- a/src/corelib/serialization/qjsonobject.cpp
+++ b/src/corelib/serialization/qjsonobject.cpp
@@ -110,7 +110,7 @@ QT_BEGIN_NAMESPACE
     \sa isEmpty()
  */
 QJsonObject::QJsonObject()
-    : d(0), o(0)
+    : d(nullptr), o(nullptr)
 {
 }
 
@@ -149,8 +149,8 @@ QJsonObject::QJsonObject(QJsonPrivate::Data *data, QJsonPrivate::Object *object)
 
 void QJsonObject::initialize()
 {
-    d = 0;
-    o = 0;
+    d = nullptr;
+    o = nullptr;
 }
 
 /*!
diff --git a/src/corelib/serialization/qjsonparser.cpp b/src/corelib/serialization/qjsonparser.cpp
index f29348d593..cd36bd5a5b 100644
--- a/src/corelib/serialization/qjsonparser.cpp
+++ b/src/corelib/serialization/qjsonparser.cpp
@@ -198,7 +198,9 @@ QString QJsonParseError::errorString() const
 using namespace QJsonPrivate;
 
 Parser::Parser(const char *json, int length)
-    : head(json), json(json), data(0), dataLength(0), current(0), nestingLevel(0), lastError(QJsonParseError::NoError)
+    : head(json), json(json), data(nullptr)
+    , dataLength(0), current(0), nestingLevel(0)
+    , lastError(QJsonParseError::NoError)
 {
     end = json + length;
 }
diff --git a/src/corelib/serialization/qjsonvalue.cpp b/src/corelib/serialization/qjsonvalue.cpp
index 1fc610d7c7..0bd28581f3 100644
--- a/src/corelib/serialization/qjsonvalue.cpp
+++ b/src/corelib/serialization/qjsonvalue.cpp
@@ -112,7 +112,7 @@ QT_BEGIN_NAMESPACE
     The default is to create a Null value.
  */
 QJsonValue::QJsonValue(Type type)
-    : ui(0), d(0), t(type)
+    : ui(0), d(nullptr), t(type)
 {
 }
 
@@ -120,7 +120,7 @@ QJsonValue::QJsonValue(Type type)
     \internal
  */
 QJsonValue::QJsonValue(QJsonPrivate::Data *data, QJsonPrivate::Base *base, const QJsonPrivate::Value &v)
-    : d(0)
+    : d(nullptr)
 {
     t = (Type)(uint)v.type;
     switch (t) {
@@ -154,7 +154,7 @@ QJsonValue::QJsonValue(QJsonPrivate::Data *data, QJsonPrivate::Base *base, const
     Creates a value of type Bool, with value \a b.
  */
 QJsonValue::QJsonValue(bool b)
-    : d(0), t(Bool)
+    : d(nullptr), t(Bool)
 {
     this->b = b;
 }
@@ -163,7 +163,7 @@ QJsonValue::QJsonValue(bool b)
     Creates a value of type Double, with value \a n.
  */
 QJsonValue::QJsonValue(double n)
-    : d(0), t(Double)
+    : d(nullptr), t(Double)
 {
     this->dbl = n;
 }
@@ -173,7 +173,7 @@ QJsonValue::QJsonValue(double n)
     Creates a value of type Double, with value \a n.
  */
 QJsonValue::QJsonValue(int n)
-    : d(0), t(Double)
+    : d(nullptr), t(Double)
 {
     this->dbl = n;
 }
@@ -185,7 +185,7 @@ QJsonValue::QJsonValue(int n)
     If you pass in values outside this range expect a loss of precision to occur.
  */
 QJsonValue::QJsonValue(qint64 n)
-    : d(0), t(Double)
+    : d(nullptr), t(Double)
 {
     this->dbl = double(n);
 }
@@ -194,7 +194,7 @@ QJsonValue::QJsonValue(qint64 n)
     Creates a value of type String, with value \a s.
  */
 QJsonValue::QJsonValue(const QString &s)
-    : d(0), t(String)
+    : d(nullptr), t(String)
 {
     stringDataFromQStringHelper(s);
 }
@@ -221,7 +221,7 @@ void QJsonValue::stringDataFromQStringHelper(const QString &string)
     Creates a value of type String, with value \a s.
  */
 QJsonValue::QJsonValue(QLatin1String s)
-    : d(0), t(String)
+    : d(nullptr), t(String)
 {
     // ### FIXME: Avoid creating the temp QString below
     QString str(s);
diff --git a/src/corelib/serialization/qtextstream.cpp b/src/corelib/serialization/qtextstream.cpp
index ef2a9c97ee..9d4bc223ab 100644
--- a/src/corelib/serialization/qtextstream.cpp
+++ b/src/corelib/serialization/qtextstream.cpp
@@ -327,7 +327,7 @@ QT_BEGIN_NAMESPACE
 QTextStreamPrivate::QTextStreamPrivate(QTextStream *q_ptr)
     :
 #if QT_CONFIG(textcodec)
-    readConverterSavedState(0),
+    readConverterSavedState(nullptr),
 #endif
     readConverterSavedStateOffset(0),
     locale(QLocale::c())
@@ -381,7 +381,7 @@ void QTextStreamPrivate::Params::reset()
     padChar = QLatin1Char(' ');
     fieldAlignment = QTextStream::AlignRight;
     realNumberNotation = QTextStream::SmartNotation;
-    numberFlags = 0;
+    numberFlags = { };
 }
 
 /*!
@@ -391,9 +391,9 @@ void QTextStreamPrivate::reset()
 {
     params.reset();
 
-    device = 0;
+    device = nullptr;
     deleteDevice = false;
-    string = 0;
+    string = nullptr;
     stringOffset = 0;
     stringOpenMode = QIODevice::NotOpen;
 
@@ -406,7 +406,7 @@ void QTextStreamPrivate::reset()
     resetCodecConverterStateHelper(&readConverterState);
     resetCodecConverterStateHelper(&writeConverterState);
     delete readConverterSavedState;
-    readConverterSavedState = 0;
+    readConverterSavedState = nullptr;
     writeConverterState.flags |= QTextCodec::IgnoreHeader;
     autoDetectUnicode = true;
 #endif
@@ -1207,7 +1207,7 @@ bool QTextStream::seek(qint64 pos)
         resetCodecConverterStateHelper(&d->readConverterState);
         resetCodecConverterStateHelper(&d->writeConverterState);
         delete d->readConverterSavedState;
-        d->readConverterSavedState = 0;
+        d->readConverterSavedState = nullptr;
         d->writeConverterState.flags |= QTextCodec::IgnoreHeader;
 #endif
         return true;
@@ -1295,7 +1295,7 @@ void QTextStream::skipWhiteSpace()
 {
     Q_D(QTextStream);
     CHECK_VALID_STREAM(Q_VOID);
-    d->scan(0, 0, 0, QTextStreamPrivate::NotSpace);
+    d->scan(nullptr, nullptr, 0, QTextStreamPrivate::NotSpace);
     d->consumeLastToken();
 }
 
@@ -1751,7 +1751,7 @@ QString QTextStream::read(qint64 maxlen)
 */
 QTextStreamPrivate::NumberParsingStatus QTextStreamPrivate::getNumber(qulonglong *ret)
 {
-    scan(0, 0, 0, NotSpace);
+    scan(nullptr, nullptr, 0, NotSpace);
     consumeLastToken();
 
     // detect int encoding
@@ -1980,7 +1980,7 @@ bool QTextStreamPrivate::getReal(double *f)
     ParserState state = Init;
     InputToken input = None;
 
-    scan(0, 0, 0, NotSpace);
+    scan(nullptr, nullptr, 0, NotSpace);
     consumeLastToken();
 
     const int BufferSize = 128;
@@ -2084,7 +2084,7 @@ QTextStream &QTextStream::operator>>(QChar &c)
 {
     Q_D(QTextStream);
     CHECK_VALID_STREAM(*this);
-    d->scan(0, 0, 0, QTextStreamPrivate::NotSpace);
+    d->scan(nullptr, nullptr, 0, QTextStreamPrivate::NotSpace);
     if (!d->getChar(&c))
         setStatus(ReadPastEnd);
     return *this;
@@ -2245,7 +2245,7 @@ QTextStream &QTextStream::operator>>(QString &str)
     CHECK_VALID_STREAM(*this);
 
     str.clear();
-    d->scan(0, 0, 0, QTextStreamPrivate::NotSpace);
+    d->scan(nullptr, nullptr, 0, QTextStreamPrivate::NotSpace);
     d->consumeLastToken();
 
     const QChar *ptr;
@@ -2273,7 +2273,7 @@ QTextStream &QTextStream::operator>>(QByteArray &array)
     CHECK_VALID_STREAM(*this);
 
     array.clear();
-    d->scan(0, 0, 0, QTextStreamPrivate::NotSpace);
+    d->scan(nullptr, nullptr, 0, QTextStreamPrivate::NotSpace);
     d->consumeLastToken();
 
     const QChar *ptr;
@@ -2308,7 +2308,7 @@ QTextStream &QTextStream::operator>>(char *c)
     Q_D(QTextStream);
     *c = 0;
     CHECK_VALID_STREAM(*this);
-    d->scan(0, 0, 0, QTextStreamPrivate::NotSpace);
+    d->scan(nullptr, nullptr, 0, QTextStreamPrivate::NotSpace);
     d->consumeLastToken();
 
     const QChar *ptr;
diff --git a/src/corelib/serialization/qxmlstream.cpp b/src/corelib/serialization/qxmlstream.cpp
index d43d9c4e14..be3a476cb2 100644
--- a/src/corelib/serialization/qxmlstream.cpp
+++ b/src/corelib/serialization/qxmlstream.cpp
@@ -58,9 +58,9 @@
 // case for most bootstrapped applications.
 #define Q_DECLARE_TR_FUNCTIONS(context) \
 public: \
-    static inline QString tr(const char *sourceText, const char *comment = 0) \
+    static inline QString tr(const char *sourceText, const char *comment = nullptr) \
         { Q_UNUSED(comment); return QString::fromLatin1(sourceText); } \
-    static inline QString trUtf8(const char *sourceText, const char *comment = 0) \
+    static inline QString trUtf8(const char *sourceText, const char *comment = nullptr) \
         { Q_UNUSED(comment); return QString::fromLatin1(sourceText); } \
     static inline QString tr(const char *sourceText, const char*, int) \
         { return QString::fromLatin1(sourceText); } \
@@ -548,7 +548,7 @@ void QXmlStreamReader::clear()
     if (d->device) {
         if (d->deleteDevice)
             delete d->device;
-        d->device = 0;
+        d->device = nullptr;
     }
 }
 
@@ -792,16 +792,16 @@ QXmlStreamPrivateTagStack::QXmlStreamPrivateTagStack()
 QXmlStreamReaderPrivate::QXmlStreamReaderPrivate(QXmlStreamReader *q)
     :q_ptr(q)
 {
-    device = 0;
+    device = nullptr;
     deleteDevice = false;
 #if QT_CONFIG(textcodec)
-    decoder = 0;
+    decoder = nullptr;
 #endif
     stack_size = 64;
-    sym_stack = 0;
-    state_stack = 0;
+    sym_stack = nullptr;
+    state_stack = nullptr;
     reallocateStack();
-    entityResolver = 0;
+    entityResolver = nullptr;
     init();
 #define ADD_PREDEFINED(n, v) \
     do { \
@@ -843,11 +843,11 @@ void QXmlStreamReaderPrivate::init()
 #if QT_CONFIG(textcodec)
     codec = QTextCodec::codecForMib(106); // utf8
     delete decoder;
-    decoder = 0;
+    decoder = nullptr;
 #endif
     attributeStack.clear();
     attributeStack.reserve(16);
-    entityParser = 0;
+    entityParser = nullptr;
     hasCheckedStartDocument = false;
     normalizeLiterals = false;
     hasSeenTag = false;
@@ -3024,8 +3024,8 @@ QXmlStreamWriterPrivate::QXmlStreamWriterPrivate(QXmlStreamWriter *q)
     :autoFormattingIndent(4, ' ')
 {
     q_ptr = q;
-    device = 0;
-    stringDevice = 0;
+    device = nullptr;
+    stringDevice = nullptr;
     deleteDevice = false;
 #if QT_CONFIG(textcodec)
     codec = QTextCodec::codecForMib(106); // utf8
@@ -3315,7 +3315,7 @@ void QXmlStreamWriter::setDevice(QIODevice *device)
     Q_D(QXmlStreamWriter);
     if (device == d->device)
         return;
-    d->stringDevice = 0;
+    d->stringDevice = nullptr;
     if (d->deleteDevice) {
         delete d->device;
         d->deleteDevice = false;
diff --git a/src/corelib/serialization/qxmlstream.g b/src/corelib/serialization/qxmlstream.g
index e6328a11ac..12ecc9bdb2 100644
--- a/src/corelib/serialization/qxmlstream.g
+++ b/src/corelib/serialization/qxmlstream.g
@@ -506,7 +506,7 @@ public:
     int fastScanLiteralContent();
     int fastScanSpace();
     int fastScanContentCharList();
-    int fastScanName(int *prefix = 0);
+    int fastScanName(int *prefix = nullptr);
     inline int fastScanNMTOKEN();