Introduce nullptr

Apply Fixits by Qt Creator with some amendments.

Change-Id: Ia47cee2d55432ddc14635aa593c52d80ab39cc82
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
 

27 files changed, 463 insertions, 463 deletions

diff --git a/examples/activeqt/mediaplayer/mediaaxwidget.h b/examples/activeqt/mediaplayer/mediaaxwidget.h
index a57ca05..a6da749 100644
--- a/examples/activeqt/mediaplayer/mediaaxwidget.h
+++ b/examples/activeqt/mediaplayer/mediaaxwidget.h
@@ -59,7 +59,7 @@
 class MediaAxWidget : public QAxWidget
 {
 public:
-    MediaAxWidget(QWidget *parent = nullptr, Qt::WindowFlags f = 0)
+    MediaAxWidget(QWidget *parent = nullptr, Qt::WindowFlags f = {})
         : QAxWidget(parent, f)
     {
     }
diff --git a/examples/activeqt/menus/menus.cpp b/examples/activeqt/menus/menus.cpp
index feb3540..18d1a5b 100644
--- a/examples/activeqt/menus/menus.cpp
+++ b/examples/activeqt/menus/menus.cpp
@@ -60,7 +60,7 @@
 #include "filesave.xpm"
 
 QMenus::QMenus(QWidget *parent)
-    : QMainWindow(parent, 0) // QMainWindow's default flag is WType_TopLevel
+    : QMainWindow(parent, {}) // QMainWindow's default flag is WType_TopLevel
 {
     QAction *action;
 
diff --git a/src/activeqt/container/qaxbase.cpp b/src/activeqt/container/qaxbase.cpp
index 2709fa6..f601648 100644
--- a/src/activeqt/container/qaxbase.cpp
+++ b/src/activeqt/container/qaxbase.cpp
@@ -125,8 +125,8 @@ struct QAxMetaObject : public QMetaObject
 {
     QAxMetaObject()
     {
-        d.data = 0;
-        d.stringdata = 0;
+        d.data = nullptr;
+        d.stringdata = nullptr;
     }
     ~QAxMetaObject()
     {
@@ -135,7 +135,7 @@ struct QAxMetaObject : public QMetaObject
     }
 
     int numParameter(const QByteArray &prototype);
-    QByteArray paramType(const QByteArray &signature, int index, bool *out = 0);
+    QByteArray paramType(const QByteArray &signature, int index, bool *out = nullptr);
     QByteArray propertyType(const QByteArray &propertyName);
     void parsePrototype(const QByteArray &prototype);
     DISPID dispIDofName(const QByteArray &name, IDispatch *disp);
@@ -244,7 +244,7 @@ static const char *const type_conversion[][2] =
     { "QList<bool>", "QVariantList" },
     { "QList<QDateTime>", "QVariantList" },
     { "QList<qlonglong>", "QVariantList" },
-    { 0, 0 }
+    { nullptr, nullptr }
 };
 
 /*
@@ -294,11 +294,11 @@ public:
     // disconnect from all connection points
     void unadvise()
     {
-        combase = 0;
+        combase = nullptr;
         if (cpoint) {
             cpoint->Unadvise(cookie);
             cpoint->Release();
-            cpoint = 0;
+            cpoint = nullptr;
         }
     }
 
@@ -341,7 +341,7 @@ public:
     }
     HRESULT __stdcall QueryInterface(REFIID riid, void **ppvObject) override
     {
-        *ppvObject = 0;
+        *ppvObject = nullptr;
         if (riid == IID_IUnknown)
             *ppvObject = static_cast<IUnknown *>(static_cast<IDispatch *>(this));
         else if (riid == IID_IPropertyNotifySink)
@@ -394,7 +394,7 @@ public:
             Q_ASSERT(index != -1);
 
             QString nameString = QLatin1String(signame);
-            void *argv[] = {0, &nameString, &pDispParams->cArgs, &pDispParams->rgvarg};
+            void *argv[] = {nullptr, &nameString, &pDispParams->cArgs, &pDispParams->rgvarg};
             QAxBase::qt_static_metacall(combase, QMetaObject::InvokeMetaMethod,
                                         index - meta->methodOffset(), argv);
         }
@@ -423,9 +423,9 @@ public:
             void *static_argv_pointer[QAX_NUM_PARAMS + 1];
             QVariant static_varp[QAX_NUM_PARAMS + 1];
 
-            void **argv = 0;
-            void **argv_pointer = 0; // in case we need an additional level of indirection
-            QVariant *varp = 0;
+            void **argv = nullptr;
+            void **argv_pointer = nullptr; // in case we need an additional level of indirection
+            QVariant *varp = nullptr;
 
             if (pcount) {
                 if (pcount <= QAX_NUM_PARAMS) {
@@ -438,8 +438,8 @@ public:
                     varp = new QVariant[pcount + 1];
                 }
 
-                argv[0] = 0;
-                argv_pointer[0] = 0;
+                argv[0] = nullptr;
+                argv_pointer[0] = nullptr;
             }
 
             int p;
@@ -447,7 +447,7 @@ public:
                 // map the VARIANT to the void*
                 QByteArray ptype = axmeta->paramType(signame, p);
                 varp[p + 1] = VARIANTToQVariant(pDispParams->rgvarg[pcount - p - 1], ptype);
-                argv_pointer[p + 1] = 0;
+                argv_pointer[p + 1] = nullptr;
                 if (varp[p + 1].isValid()) {
                     if (varp[p + 1].type() == QVariant::UserType) {
                         argv[p + 1] = varp[p + 1].data();
@@ -517,7 +517,7 @@ public:
         int index = meta->indexOfSignal("propertyChanged(QString)");
         if (index != -1) {
             QString propnameString = QString::fromLatin1(propname);
-            void *argv[] = {0, &propnameString};
+            void *argv[] = {nullptr, &propnameString};
             QAxBase::qt_static_metacall(combase, QMetaObject::InvokeMetaMethod,
                                         index - meta->methodOffset(), argv);
         }
@@ -540,7 +540,7 @@ public:
                 return S_OK;
 
             const QMetaProperty metaProp = meta->property(meta->indexOfProperty(propname));
-            void *argv[] = {0, var.data()};
+            void *argv[] = {nullptr, var.data()};
             if (metaProp.type() == QVariant::Type(QMetaType::QVariant) || metaProp.type() == QVariant::LastType)
                 argv[1] = &var;
 
@@ -666,7 +666,7 @@ QByteArray QAxEventSink::findProperty(DISPID dispID)
         return propname;
 
     IDispatch *dispatch = combase->d->dispatch();
-    ITypeInfo *typeinfo = 0;
+    ITypeInfo *typeinfo = nullptr;
     if (dispatch)
         dispatch->GetTypeInfo(0, LOCALE_USER_DEFAULT, &typeinfo);
     if (!typeinfo)
@@ -900,7 +900,7 @@ QAxBase::~QAxBase()
     clear();
 
     delete d;
-    d = 0;
+    d = nullptr;
 }
 
 /*!
@@ -1149,11 +1149,11 @@ void QAxBase::clear()
     d->eventSink.clear();
     if (d->disp) {
         d->disp->Release();
-        d->disp = 0;
+        d->disp = nullptr;
     }
     if (d->ptr) {
         d->ptr->Release();
-        d->ptr = 0;
+        d->ptr = nullptr;
         d->initialized = false;
     }
 
@@ -1161,7 +1161,7 @@ void QAxBase::clear()
 
     if (!d->cachedMetaObject)
         delete d->metaobj;
-    d->metaobj = 0;
+    d->metaobj = nullptr;
 }
 
 /*!
@@ -1180,10 +1180,10 @@ QStringList QAxBase::verbs() const
         return QStringList();
 
     if (d->verbs.isEmpty()) {
-        IOleObject *ole = 0;
+        IOleObject *ole = nullptr;
         d->ptr->QueryInterface(IID_IOleObject, reinterpret_cast<void **>(&ole));
         if (ole) {
-            IEnumOLEVERB *enumVerbs = 0;
+            IEnumOLEVERB *enumVerbs = nullptr;
             ole->EnumVerbs(&enumVerbs);
             if (enumVerbs) {
                 enumVerbs->Reset();
@@ -1251,7 +1251,7 @@ bool QAxBase::initialize(IUnknown **ptr)
         asyncExposeSet = true;
     }
 
-    *ptr = 0;
+    *ptr = nullptr;
 
     bool res = false;
 
@@ -1266,7 +1266,7 @@ bool QAxBase::initialize(IUnknown **ptr)
         res = initializeFromFile(ptr);
 
     if (!res) { // standard
-        HRESULT hres = CoCreateInstance(QUuid(ctrl), 0, d->classContext, IID_IUnknown,
+        HRESULT hres = CoCreateInstance(QUuid(ctrl), nullptr, d->classContext, IID_IUnknown,
                                         reinterpret_cast<void **>(ptr));
         res = S_OK == hres;
 #ifndef QT_NO_DEBUG
@@ -1275,7 +1275,7 @@ bool QAxBase::initialize(IUnknown **ptr)
 #endif
     }
 
-    return *ptr != 0;
+    return *ptr != nullptr;
 }
 
 /*!
@@ -1295,15 +1295,15 @@ bool QAxBase::initializeLicensed(IUnknown** ptr)
     QString clsid(control().left(at));
     QString key(control().mid(at+2));
 
-    IClassFactory *factory = 0;
-    CoGetClassObject(QUuid(clsid), CLSCTX_SERVER, 0, IID_IClassFactory,
+    IClassFactory *factory = nullptr;
+    CoGetClassObject(QUuid(clsid), CLSCTX_SERVER, nullptr, IID_IClassFactory,
                      reinterpret_cast<void **>(&factory));
     if (!factory)
         return false;
     initializeLicensedHelper(factory, key, ptr);
     factory->Release();
 
-    return *ptr != 0;
+    return *ptr != nullptr;
 }
 
 /* \internal
@@ -1313,11 +1313,11 @@ bool QAxBase::initializeLicensed(IUnknown** ptr)
 bool QAxBase::initializeLicensedHelper(void *f, const QString &key, IUnknown **ptr)
 {
     IClassFactory *factory = reinterpret_cast<IClassFactory *>(f);
-    IClassFactory2 *factory2 = 0;
+    IClassFactory2 *factory2 = nullptr;
     factory->QueryInterface(IID_IClassFactory2, reinterpret_cast<void **>(&factory2));
     if (factory2) {
         BSTR bkey = QStringToBSTR(key);
-        HRESULT hres = factory2->CreateInstanceLic(0, 0, IID_IUnknown, bkey,
+        HRESULT hres = factory2->CreateInstanceLic(nullptr, nullptr, IID_IUnknown, bkey,
                                                    reinterpret_cast<void **>(ptr));
         SysFreeString(bkey);
 #ifdef QT_DEBUG
@@ -1355,9 +1355,9 @@ bool QAxBase::initializeLicensedHelper(void *f, const QString &key, IUnknown **p
 #endif
         factory2->Release();
     } else {  // give it a shot without license
-        factory->CreateInstance(0, IID_IUnknown, reinterpret_cast<void **>(ptr));
+        factory->CreateInstance(nullptr, IID_IUnknown, reinterpret_cast<void **>(ptr));
     }
-    return *ptr != 0;
+    return *ptr != nullptr;
 }
 
 
@@ -1376,9 +1376,9 @@ bool QAxBase::initializeActive(IUnknown** ptr)
     int at = control().lastIndexOf(QLatin1String("}&"));
     QString clsid(control().left(at));
 
-    GetActiveObject(QUuid(clsid), 0, ptr);
+    GetActiveObject(QUuid(clsid), nullptr, ptr);
 
-    return *ptr != 0;
+    return *ptr != nullptr;
 }
 
 #ifdef Q_CC_GNU
@@ -1399,13 +1399,13 @@ bool QAxBase::initializeActive(IUnknown** ptr)
 */
 bool QAxBase::initializeFromFile(IUnknown** ptr)
 {
-    IStorage *storage = 0;
-    ILockBytes * bytes = 0;
-    HRESULT hres = ::CreateILockBytesOnHGlobal(0, TRUE, &bytes);
+    IStorage *storage = nullptr;
+    ILockBytes * bytes = nullptr;
+    HRESULT hres = ::CreateILockBytesOnHGlobal(nullptr, TRUE, &bytes);
     hres = ::StgCreateDocfileOnILockBytes(bytes, STGM_SHARE_EXCLUSIVE|STGM_CREATE|STGM_READWRITE, 0, &storage);
 
     hres = OleCreateFromFile(CLSID_NULL, reinterpret_cast<const wchar_t*>(control().utf16()),
-                             IID_IUnknown, OLERENDER_NONE, 0, 0, storage,
+                             IID_IUnknown, OLERENDER_NONE, nullptr, nullptr, storage,
                              reinterpret_cast<void **>(ptr));
 
     storage->Release();
@@ -1486,7 +1486,7 @@ bool QAxBase::initializeRemote(IUnknown** ptr)
     COAUTHINFO authInfo;
     authInfo.dwAuthnSvc = RPC_C_AUTHN_WINNT;
     authInfo.dwAuthzSvc = RPC_C_AUTHZ_NONE;
-    authInfo.pwszServerPrincName = 0;
+    authInfo.pwszServerPrincName = nullptr;
     authInfo.dwAuthnLevel = RPC_C_AUTHN_LEVEL_DEFAULT;
     authInfo.dwImpersonationLevel = RPC_C_IMP_LEVEL_IMPERSONATE;
     authInfo.pAuthIdentityData = &authIdentity;
@@ -1498,14 +1498,14 @@ bool QAxBase::initializeRemote(IUnknown** ptr)
     serverInfo.pAuthInfo = &authInfo;
     serverInfo.pwszName = reinterpret_cast<wchar_t *>(const_cast<ushort *>(server.utf16()));
 
-    IClassFactory *factory = 0;
+    IClassFactory *factory = nullptr;
     HRESULT res = CoGetClassObject(QUuid(clsid), CLSCTX_REMOTE_SERVER, &serverInfo,
                                    IID_IClassFactory, reinterpret_cast<void **>(&factory));
     if (factory) {
         if (!key.isEmpty())
             initializeLicensedHelper(factory, key, ptr);
         else
-            res = factory->CreateInstance(0, IID_IUnknown, reinterpret_cast<void **>(ptr));
+            res = factory->CreateInstance(nullptr, IID_IUnknown, reinterpret_cast<void **>(ptr));
         factory->Release();
     }
 #ifndef QT_NO_DEBUG
@@ -1527,7 +1527,7 @@ bool QAxBase::initializeRemote(IUnknown** ptr)
 */
 long QAxBase::queryInterface(const QUuid &uuid, void **iface) const
 {
-    *iface = 0;
+    *iface = nullptr;
     if (!d->ptr) {
         const_cast<QAxBase *>(this)->initialize(&d->ptr);
         d->initialized = true;
@@ -1758,7 +1758,7 @@ private:
 
 QMetaObject *qax_readEnumInfo(ITypeLib *typeLib, const QMetaObject *parentObject)
 {
-    MetaObjectGenerator generator(typeLib, 0);
+    MetaObjectGenerator generator(typeLib, nullptr);
 
     generator.readEnumInfo();
     return generator.metaObject(parentObject, "EnumInfo");
@@ -1770,8 +1770,8 @@ QMetaObject *qax_readInterfaceInfo(ITypeLib *typeLib, ITypeInfo *typeInfo, const
 
     QString className;
     BSTR bstr;
-    if (S_OK != typeInfo->GetDocumentation(-1, &bstr, 0, 0, 0))
-        return 0;
+    if (S_OK != typeInfo->GetDocumentation(-1, &bstr, nullptr, nullptr, nullptr))
+        return nullptr;
 
     className = QString::fromWCharArray(bstr);
     SysFreeString(bstr);
@@ -1785,14 +1785,14 @@ QMetaObject *qax_readInterfaceInfo(ITypeLib *typeLib, ITypeInfo *typeInfo, const
 
 QMetaObject *qax_readClassInfo(ITypeLib *typeLib, ITypeInfo *classInfo, const QMetaObject *parentObject)
 {
-    MetaObjectGenerator generator(typeLib, 0);
+    MetaObjectGenerator generator(typeLib, nullptr);
     generator.addSignal("exception(int,QString,QString,QString)", "code,source,disc,help");
     generator.addSignal("propertyChanged(QString)", "name");
 
     QString className;
     BSTR bstr;
-    if (S_OK != classInfo->GetDocumentation(-1, &bstr, 0, 0, 0))
-        return 0;
+    if (S_OK != classInfo->GetDocumentation(-1, &bstr, nullptr, nullptr, nullptr))
+        return nullptr;
 
     className = QString::fromWCharArray(bstr);
     SysFreeString(bstr);
@@ -1815,23 +1815,23 @@ QMetaObject *qax_readClassInfo(ITypeLib *typeLib, ITypeInfo *classInfo, const QM
             if (flags & IMPLTYPEFLAG_FRESTRICTED)
                 continue;
 
-            ITypeInfo *interfaceInfo = 0;
+            ITypeInfo *interfaceInfo = nullptr;
             classInfo->GetRefTypeInfo(refType, &interfaceInfo);
             if (!interfaceInfo)
                 continue;
 
-            interfaceInfo->GetDocumentation(-1, &bstr, 0, 0, 0);
+            interfaceInfo->GetDocumentation(-1, &bstr, nullptr, nullptr, nullptr);
             QString interfaceName = QString::fromWCharArray(bstr);
             SysFreeString(bstr);
             QByteArray key;
 
-            TYPEATTR *typeattr = 0;
+            TYPEATTR *typeattr = nullptr;
             interfaceInfo->GetTypeAttr(&typeattr);
 
             if (flags & IMPLTYPEFLAG_FSOURCE) {
                 if (typeattr && !(typeattr->wTypeFlags & TYPEFLAG_FHIDDEN))
                     key = "Event Interface " + QByteArray::number(index);
-                generator.readEventInterface(interfaceInfo, 0);
+                generator.readEventInterface(interfaceInfo, nullptr);
             } else {
                 if (typeattr && !(typeattr->wTypeFlags & TYPEFLAG_FHIDDEN))
                     key = "Interface " + QByteArray::number(index);
@@ -1873,7 +1873,7 @@ MetaObjectGenerator::MetaObjectGenerator(ITypeLib *tlib, ITypeInfo *tinfo)
     if (typelib) {
         typelib->AddRef();
         BSTR bstr;
-        typelib->GetDocumentation(-1, &bstr, 0, 0, 0);
+        typelib->GetDocumentation(-1, &bstr, nullptr, nullptr, nullptr);
         current_typelib = QString::fromWCharArray(bstr).toLatin1();
         SysFreeString(bstr);
     }
@@ -1909,25 +1909,25 @@ QByteArray MetaObjectGenerator::usertypeToString(const TYPEDESC &tdesc, ITypeInf
 {
     HREFTYPE usertype = tdesc.hreftype;
     if (tdesc.vt != VT_USERDEFINED)
-        return 0;
+        return nullptr;
 
     QByteArray typeName;
-    ITypeInfo *usertypeinfo = 0;
+    ITypeInfo *usertypeinfo = nullptr;
     info->GetRefTypeInfo(usertype, &usertypeinfo);
     if (usertypeinfo) {
-        ITypeLib *usertypelib = 0;
+        ITypeLib *usertypelib = nullptr;
         UINT index;
         usertypeinfo->GetContainingTypeLib(&usertypelib, &index);
         if (usertypelib) {
             // get type library name
-            BSTR typelibname = 0;
-            usertypelib->GetDocumentation(-1, &typelibname, 0, 0, 0);
+            BSTR typelibname = nullptr;
+            usertypelib->GetDocumentation(-1, &typelibname, nullptr, nullptr, nullptr);
             QByteArray typeLibName = QString::fromWCharArray(typelibname).toLatin1();
             SysFreeString(typelibname);
 
             // get type name
-            BSTR usertypename = 0;
-            usertypelib->GetDocumentation(INT(index), &usertypename, 0, 0, 0);
+            BSTR usertypename = nullptr;
+            usertypelib->GetDocumentation(INT(index), &usertypename, nullptr, nullptr, nullptr);
             QByteArray userTypeName = QString::fromWCharArray(usertypename).toLatin1();
             SysFreeString(usertypename);
 
@@ -1941,7 +1941,7 @@ QByteArray MetaObjectGenerator::usertypeToString(const TYPEDESC &tdesc, ITypeInf
                 typeName = "QPixmap";
 
             if (typeName.isEmpty()) {
-                TYPEATTR *typeattr = 0;
+                TYPEATTR *typeattr = nullptr;
                 usertypeinfo->GetTypeAttr(&typeattr);
                 if (typeattr) {
                     switch(typeattr->typekind) {
@@ -2156,12 +2156,12 @@ QByteArray MetaObjectGenerator::guessTypes(const TYPEDESC &tdesc, ITypeInfo *inf
 void MetaObjectGenerator::readClassInfo()
 {
     // Read class information
-    IProvideClassInfo *provideClassInfo = 0;
+    IProvideClassInfo *provideClassInfo = nullptr;
     if (d)
         d->ptr->QueryInterface(IID_IProvideClassInfo, reinterpret_cast<void **>(&provideClassInfo));
     if (provideClassInfo) {
         provideClassInfo->GetClassInfo(&classInfo);
-        TYPEATTR *typeattr = 0;
+        TYPEATTR *typeattr = nullptr;
         if (classInfo)
             classInfo->GetTypeAttr(&typeattr);
 
@@ -2182,7 +2182,7 @@ void MetaObjectGenerator::readClassInfo()
             classInfo->ReleaseTypeAttr(typeattr);
         }
         provideClassInfo->Release();
-        provideClassInfo = 0;
+        provideClassInfo = nullptr;
 
         if (d->tryCache && !coClassID.isEmpty())
             cacheKey = QString::fromLatin1("%1$%2$%3$%4").arg(coClassID)
@@ -2255,7 +2255,7 @@ void MetaObjectGenerator::readClassInfo()
                         break;
                     } else {
                         dispInfo->Release();
-                        dispInfo = 0;
+                        dispInfo = nullptr;
                     }
                 }
             }
@@ -2266,7 +2266,7 @@ void MetaObjectGenerator::readClassInfo()
     if (!d || !dispInfo || !cacheKey.isEmpty() || !d->tryCache)
         return;
 
-    TYPEATTR *typeattr = 0;
+    TYPEATTR *typeattr = nullptr;
     dispInfo->GetTypeAttr(&typeattr);
 
     QString interfaceID;
@@ -2290,7 +2290,7 @@ void MetaObjectGenerator::readEnumInfo()
     QUuid libUuid;
 
     if (d && d->tryCache) {
-        TLIBATTR *libAttr = 0;
+        TLIBATTR *libAttr = nullptr;
         typelib->GetLibAttr(&libAttr);
         if (libAttr) {
             libUuid = QUuid(libAttr->guid);
@@ -2312,7 +2312,7 @@ void MetaObjectGenerator::readEnumInfo()
         typelib->GetTypeInfoType(i, &typekind);
         if (typekind == TKIND_ENUM) {
             // Get the type information for the enum
-            ITypeInfo *enuminfo = 0;
+            ITypeInfo *enuminfo = nullptr;
             typelib->GetTypeInfo(i, &enuminfo);
             if (!enuminfo)
                 continue;
@@ -2320,7 +2320,7 @@ void MetaObjectGenerator::readEnumInfo()
             // Get the name of the enumeration
             BSTR enumname;
             QByteArray enumName;
-            if (typelib->GetDocumentation(INT(i), &enumname, 0, 0, 0) == S_OK) {
+            if (typelib->GetDocumentation(INT(i), &enumname, nullptr, nullptr, nullptr) == S_OK) {
                 enumName = QString::fromWCharArray(enumname).toLatin1();
                 SysFreeString(enumname);
             } else {
@@ -2328,12 +2328,12 @@ void MetaObjectGenerator::readEnumInfo()
             }
 
             // Get the attributes of the enum type
-            TYPEATTR *typeattr = 0;
+            TYPEATTR *typeattr = nullptr;
             enuminfo->GetTypeAttr(&typeattr);
             if (typeattr) {
                 // Get all values of the enumeration
                 for (UINT vd = 0; vd < typeattr->cVars; ++vd) {
-                    VARDESC *vardesc = 0;
+                    VARDESC *vardesc = nullptr;
                     enuminfo->GetVarDesc(vd, &vardesc);
                     if (vardesc && vardesc->varkind == VAR_CONST) {
                         int value = vardesc->lpvarValue->lVal;
@@ -2362,7 +2362,7 @@ void MetaObjectGenerator::readEnumInfo()
 
 void MetaObjectGenerator::addChangedSignal(const QByteArray &function, const QByteArray &type, int memid)
 {
-    QAxEventSink *eventSink = 0;
+    QAxEventSink *eventSink = nullptr;
     if (d) {
         eventSink = d->eventSink.value(iid_propNotifySink);
         if (!eventSink && d->useEventSink) {
@@ -2418,7 +2418,7 @@ QByteArray MetaObjectGenerator::createPrototype(FUNCDESC *funcdesc, ITypeInfo *t
 
     prototype = function + '(';
     if (funcdesc->invkind == INVOKE_FUNC && type == hresult)
-        type = 0;
+        type = nullptr;
 
     int p;
     for (p = 1; p < names.count(); ++p) {
@@ -2475,7 +2475,7 @@ QByteArray MetaObjectGenerator::createPrototype(FUNCDESC *funcdesc, ITypeInfo *t
 void MetaObjectGenerator::readFuncsInfo(ITypeInfo *typeinfo, ushort nFuncs)
 {
     if (!nFuncs) {
-        TYPEATTR *typeattr = 0;
+        TYPEATTR *typeattr = nullptr;
         typeinfo->GetTypeAttr(&typeattr);
         if (typeattr) {
             nFuncs = typeattr->cFuncs;
@@ -2485,7 +2485,7 @@ void MetaObjectGenerator::readFuncsInfo(ITypeInfo *typeinfo, ushort nFuncs)
 
     // get information about all functions
     for (ushort fd = 0; fd < nFuncs ; ++fd) {
-        FUNCDESC *funcdesc = 0;
+        FUNCDESC *funcdesc = nullptr;
         typeinfo->GetFuncDesc(fd, &funcdesc);
         if (!funcdesc)
             break;
@@ -2641,7 +2641,7 @@ void MetaObjectGenerator::readFuncsInfo(ITypeInfo *typeinfo, ushort nFuncs)
 void MetaObjectGenerator::readVarsInfo(ITypeInfo *typeinfo, ushort nVars)
 {
     if (!nVars) {
-        TYPEATTR *typeattr = 0;
+        TYPEATTR *typeattr = nullptr;
         typeinfo->GetTypeAttr(&typeattr);
         if (typeattr) {
             nVars = typeattr->cVars;
@@ -2760,19 +2760,19 @@ void MetaObjectGenerator::readInterfaceInfo()
 
         if (!nImpl) {
             typeinfo->Release();
-            typeinfo = 0;
+            typeinfo = nullptr;
             break;
         }
 
         // go up one base class
         HREFTYPE pRefType;
         typeinfo->GetRefTypeOfImplType(0, &pRefType);
-        ITypeInfo *baseInfo = 0;
+        ITypeInfo *baseInfo = nullptr;
         typeinfo->GetRefTypeInfo(pRefType, &baseInfo);
         typeinfo->Release();
         if (typeinfo == baseInfo) { // IUnknown inherits IUnknown ???
             baseInfo->Release();
-            typeinfo = 0;
+            typeinfo = nullptr;
             break;
         }
         typeinfo = baseInfo;
@@ -2790,7 +2790,7 @@ void MetaObjectGenerator::readEventInterface(ITypeInfo *eventinfo, IConnectionPo
         return;
     }
 
-    QAxEventSink *eventSink = 0;
+    QAxEventSink *eventSink = nullptr;
     if (d) {
         IID conniid;
         cpoint->GetConnectionInterface(&conniid);
@@ -2852,21 +2852,21 @@ void MetaObjectGenerator::readEventInterface(ITypeInfo *eventinfo, IConnectionPo
 void MetaObjectGenerator::readEventInfo()
 {
     int event_serial = 0;
-    IConnectionPointContainer *cpoints = 0;
+    IConnectionPointContainer *cpoints = nullptr;
     if (d && d->useEventSink)
         d->ptr->QueryInterface(IID_IConnectionPointContainer, reinterpret_cast<void **>(&cpoints));
     if (cpoints) {
         // Get connection point enumerator
-        IEnumConnectionPoints *epoints = 0;
+        IEnumConnectionPoints *epoints = nullptr;
         cpoints->EnumConnectionPoints(&epoints);
         if (epoints) {
             ULONG c = 1;
-            IConnectionPoint *cpoint = 0;
+            IConnectionPoint *cpoint = nullptr;
             epoints->Reset();
             QList<QUuid> cpointlist;
             do {
                 if (cpoint) cpoint->Release();
-                cpoint = 0;
+                cpoint = nullptr;
                 HRESULT hr = epoints->Next(c, &cpoint, &c);
                 if (!c || hr != S_OK)
                     break;
@@ -2895,7 +2895,7 @@ void MetaObjectGenerator::readEventInfo()
                     continue;
                 }
 
-                ITypeInfo *eventinfo = 0;
+                ITypeInfo *eventinfo = nullptr;
                 if (typelib)
                     typelib->GetTypeInfoOfGuid(conniid, &eventinfo);
 
@@ -2910,7 +2910,7 @@ void MetaObjectGenerator::readEventInfo()
             if (cpoint) cpoint->Release();
             epoints->Release();
         } else if (classInfo) { // no enumeration - search source interfaces and ask for those
-            TYPEATTR *typeattr = 0;
+            TYPEATTR *typeattr = nullptr;
             classInfo->GetTypeAttr(&typeattr);
             if (typeattr) {
                 for (UINT i = 0; i < typeattr->cImplTypes; ++i) {
@@ -2921,14 +2921,14 @@ void MetaObjectGenerator::readEventInfo()
                     HREFTYPE reference;
                     if (S_OK != classInfo->GetRefTypeOfImplType(i, &reference))
                         continue;
-                    ITypeInfo *eventInfo = 0;
+                    ITypeInfo *eventInfo = nullptr;
                     classInfo->GetRefTypeInfo(reference, &eventInfo);
                     if (!eventInfo)
                         continue;
-                    TYPEATTR *eventattr = 0;
+                    TYPEATTR *eventattr = nullptr;
                     eventInfo->GetTypeAttr(&eventattr);
                     if (eventattr) {
-                        IConnectionPoint *cpoint = 0;
+                        IConnectionPoint *cpoint = nullptr;
                         cpoints->FindConnectionPoint(eventattr->guid, &cpoint);
                         if (cpoint) {
                             if (eventattr->guid == IID_IPropertyNotifySink) {
@@ -2960,11 +2960,11 @@ QMetaObject *MetaObjectGenerator::tryCache()
         if (d->metaobj) {
             d->cachedMetaObject = true;
 
-            IConnectionPointContainer *cpoints = 0;
+            IConnectionPointContainer *cpoints = nullptr;
             d->ptr->QueryInterface(IID_IConnectionPointContainer, reinterpret_cast<void **>(&cpoints));
             if (cpoints) {
                 for (const QUuid &iid : qAsConst(d->metaobj->connectionInterfaces)) {
-                    IConnectionPoint *cpoint = 0;
+                    IConnectionPoint *cpoint = nullptr;
                     cpoints->FindConnectionPoint(iid, &cpoint);
                     if (cpoint) {
                         QAxEventSink *sink = new QAxEventSink(that);
@@ -2982,7 +2982,7 @@ QMetaObject *MetaObjectGenerator::tryCache()
             return d->metaobj;
         }
     }
-    return 0;
+    return nullptr;
 }
 
 static int nameToBuiltinType(const QByteArray &typeName)
@@ -3018,7 +3018,7 @@ QMetaObject *MetaObjectGenerator::metaObject(const QMetaObject *parentObject, co
         readClassInfo();
         if (typelib) {
             BSTR bstr;
-            typelib->GetDocumentation(-1, &bstr, 0, 0, 0);
+            typelib->GetDocumentation(-1, &bstr, nullptr, nullptr, nullptr);
             current_typelib = QString::fromWCharArray(bstr).toLatin1();
             SysFreeString(bstr);
         }
@@ -3176,10 +3176,10 @@ QMetaObject *MetaObjectGenerator::metaObject(const QMetaObject *parentObject, co
 
     // put the metaobject together
     metaobj->d.data = int_data;
-    metaobj->d.extradata = 0;
+    metaobj->d.extradata = nullptr;
     metaobj->d.stringdata = reinterpret_cast<const QByteArrayData *>(string_data);
-    metaobj->d.static_metacall = 0;
-    metaobj->d.relatedMetaObjects = 0;
+    metaobj->d.static_metacall = nullptr;
+    metaobj->d.relatedMetaObjects = nullptr;
     metaobj->d.superdata = parentObject;
 
     if (d)
@@ -3313,9 +3313,9 @@ void QAxBase::connectNotify()
     if (d->eventSink.count()) // already listening
         return;
 
-    IEnumConnectionPoints *epoints = 0;
+    IEnumConnectionPoints *epoints = nullptr;
     if (d->ptr && d->useEventSink) {
-        IConnectionPointContainer *cpoints = 0;
+        IConnectionPointContainer *cpoints = nullptr;
         d->ptr->QueryInterface(IID_IConnectionPointContainer, reinterpret_cast<void **>(&cpoints));
         if (!cpoints)
             return;
@@ -3329,8 +3329,8 @@ void QAxBase::connectNotify()
 
     UINT index;
     IDispatch *disp = d->dispatch();
-    ITypeInfo *typeinfo = 0;
-    ITypeLib  *typelib = 0;
+    ITypeInfo *typeinfo = nullptr;
+    ITypeLib  *typelib = nullptr;
     if (disp)
         disp->GetTypeInfo(0, LOCALE_USER_DEFAULT, &typeinfo);
     if (typeinfo)
@@ -3345,11 +3345,11 @@ void QAxBase::connectNotify()
     bool haveEnumInfo = false;
 
     ULONG c = 1;
-    IConnectionPoint *cpoint = 0;
+    IConnectionPoint *cpoint = nullptr;
     epoints->Reset();
     do {
         if (cpoint) cpoint->Release();
-        cpoint = 0;
+        cpoint = nullptr;
         epoints->Next(c, &cpoint, &c);
         if (!c || !cpoint)
             break;
@@ -3362,7 +3362,7 @@ void QAxBase::connectNotify()
             break;
 
         // Get ITypeInfo for source-interface, and skip if not supporting IDispatch
-        ITypeInfo *eventinfo = 0;
+        ITypeInfo *eventinfo = nullptr;
         typelib->GetTypeInfoOfGuid(conniid, &eventinfo);
         if (eventinfo) {
             TYPEATTR *eventAttr;
@@ -3381,7 +3381,7 @@ void QAxBase::connectNotify()
         }
 
         // always into the cache to avoid recoursion
-        QAxEventSink *eventSink = eventinfo ? new QAxEventSink(this) : 0;
+        QAxEventSink *eventSink = eventinfo ? new QAxEventSink(this) : nullptr;
         d->eventSink.insert(connuuid, eventSink);
 
         if (!eventinfo)
@@ -3451,7 +3451,7 @@ static bool checkHRESULT(HRESULT hres, EXCEPINFO *exc, QAxBase *that, const QStr
                     help += QString::fromLatin1(" [%1]").arg(helpContext);
 
                 if (QAxEventSink::signalHasReceivers(that->qObject(), "exception(int,QString,QString,QString)")) {
-                    void *argv[] = {0, &code, &source, &desc, &help};
+                    void *argv[] = {nullptr, &code, &source, &desc, &help};
                     QAxBase::qt_static_metacall(that, QMetaObject::InvokeMetaMethod,
                                                 exceptionSignal - mo->methodOffset(), argv);
                     printWarning = false;
@@ -3553,10 +3553,10 @@ int QAxBase::internalProperty(QMetaObject::Call call, int index, void **v)
         {
             params.cArgs = 0;
             params.cNamedArgs = 0;
-            params.rgdispidNamedArgs = 0;
-            params.rgvarg = 0;
+            params.rgdispidNamedArgs = nullptr;
+            params.rgvarg = nullptr;
 
-            hres = Invoke(disp, dispid, IID_NULL, LOCALE_USER_DEFAULT, DISPATCH_PROPERTYGET, &params, &arg, &excepinfo, 0);
+            hres = Invoke(disp, dispid, IID_NULL, LOCALE_USER_DEFAULT, DISPATCH_PROPERTYGET, &params, &arg, &excepinfo, nullptr);
 
             // map result VARIANTARG to void*
             uint type = QVariant::Int;
@@ -3583,12 +3583,12 @@ int QAxBase::internalProperty(QMetaObject::Call call, int index, void **v)
             QVariant qvar;
             if (prop.isEnumType()) {
                 qvar = *reinterpret_cast<const int *>(v[0]);
-                proptype = 0;
+                proptype = nullptr;
             } else {
                 int typeId = prop.userType();
                 if (typeId == int(QMetaType::QVariant)) {
                     qvar = *reinterpret_cast<const QVariant *>(v[0]);
-                    proptype = 0;
+                    proptype = nullptr;
                 } else {
                     qvar = QVariant(typeId, v[0]);
                     if (typeId < QMetaType::User)
@@ -3602,7 +3602,7 @@ int QAxBase::internalProperty(QMetaObject::Call call, int index, void **v)
                 break;
             }
         }
-        hres = Invoke(disp, dispid, IID_NULL, LOCALE_USER_DEFAULT, DISPATCH_PROPERTYPUT, &params, 0, &excepinfo, &argerr);
+        hres = Invoke(disp, dispid, IID_NULL, LOCALE_USER_DEFAULT, DISPATCH_PROPERTYPUT, &params, nullptr, &excepinfo, &argerr);
         clearVARIANT(&arg);
         break;
 
@@ -3656,8 +3656,8 @@ int QAxBase::internalInvoke(QMetaObject::Call call, int index, void **v)
     DISPID dispidNamed = DISPID_PROPERTYPUT;
     params.cArgs = UINT(d->metaobj->numParameter(signature));
     params.cNamedArgs = isProperty ? 1 : 0;
-    params.rgdispidNamedArgs = isProperty ? &dispidNamed : 0;
-    params.rgvarg = 0;
+    params.rgdispidNamedArgs = isProperty ? &dispidNamed : nullptr;
+    params.rgvarg = nullptr;
     VARIANTARG static_rgvarg[QAX_NUM_PARAMS];
     if (params.cArgs) {
         if (params.cArgs <= QAX_NUM_PARAMS)
@@ -3743,7 +3743,7 @@ int QAxBase::internalInvoke(QMetaObject::Call call, int index, void **v)
 */
 int QAxBase::qt_static_metacall(QAxBase *_t, QMetaObject::Call _c, int _id, void **_a)
 {
-    Q_ASSERT(_t != 0);
+    Q_ASSERT(_t != nullptr);
     if (_c == QMetaObject::InvokeMetaMethod) {
         const QMetaObject *mo = _t->metaObject();
         switch (mo->method(_id + mo->methodOffset()).methodType()) {
@@ -3854,7 +3854,7 @@ bool QAxBase::dynamicCallHelper(const char *name, void *inout, QList<QVariant> &
     QByteArray normFunction = QMetaObject::normalizedSignature(name);
     QByteArray function(normFunction);
     VARIANT staticarg[QAX_NUM_PARAMS];
-    VARIANT *arg = 0;
+    VARIANT *arg = nullptr;
     VARIANTARG *res = reinterpret_cast<VARIANTARG *>(inout);
 
     unsigned short disptype;
@@ -3970,7 +3970,7 @@ bool QAxBase::dynamicCallHelper(const char *name, void *inout, QList<QVariant> &
             type = prop.typeName();
         }
         if (varc == 1) {
-            res = 0;
+            res = nullptr;
             disptype = DISPATCH_PROPERTYPUT;
         } else {
             disptype = DISPATCH_PROPERTYGET;
@@ -3989,7 +3989,7 @@ bool QAxBase::dynamicCallHelper(const char *name, void *inout, QList<QVariant> &
             if (disptype == DISPATCH_PROPERTYPUT)
                 paramType = type;
             else if (parse || disptype == DISPATCH_PROPERTYGET)
-                paramType = 0;
+                paramType = nullptr;
             else
                 paramType = d->metaobj->paramType(normFunction, i, &out);
 
@@ -4026,7 +4026,7 @@ bool QAxBase::dynamicCallHelper(const char *name, void *inout, QList<QVariant> &
 
     params.cArgs = UINT(varc);
     params.cNamedArgs = (disptype == DISPATCH_PROPERTYPUT) ? 1 : 0;
-    params.rgdispidNamedArgs = (disptype == DISPATCH_PROPERTYPUT) ? &dispidNamed : 0;
+    params.rgdispidNamedArgs = (disptype == DISPATCH_PROPERTYPUT) ? &dispidNamed : nullptr;
     params.rgvarg = arg;
     EXCEPINFO excepinfo;
     memset(&excepinfo, 0, sizeof(excepinfo));
@@ -4236,13 +4236,13 @@ QAxObject *QAxBase::querySubObject(const char *name,
 */
 QAxObject *QAxBase::querySubObject(const char *name, QList<QVariant> &vars)
 {
-    QAxObject *object = 0;
+    QAxObject *object = nullptr;
     VARIANTARG res;
     VariantInit(&res);
 
     QByteArray rettype;
     if (!dynamicCallHelper(name, &res, vars, rettype))
-        return 0;
+        return nullptr;
 
     switch (res.vt) {
     case VT_DISPATCH:
@@ -4306,7 +4306,7 @@ public:
 
     HRESULT __stdcall QueryInterface(REFIID iid, LPVOID *iface) override
     {
-        *iface = 0;
+        *iface = nullptr;
         if (iid == IID_IUnknown)
             *iface = this;
         else if (iid == IID_IPropertyBag)
@@ -4345,7 +4345,7 @@ public:
         if (!var)
             return E_POINTER;
         QString property = QString::fromWCharArray(name);
-        QVariant qvar = VARIANTToQVariant(*var, 0);
+        QVariant qvar = VARIANTToQVariant(*var, nullptr);
         map[property] = qvar;
 
         return S_OK;
@@ -4380,7 +4380,7 @@ QAxBase::PropertyBag QAxBase::propertyBag() const
 
     if (isNull())
         return result;
-    IPersistPropertyBag *persist = 0;
+    IPersistPropertyBag *persist = nullptr;
     d->ptr->QueryInterface(IID_IPersistPropertyBag, reinterpret_cast<void **>(&persist));
     if (persist) {
         QtPropertyBag *pbag = new QtPropertyBag();
@@ -4421,13 +4421,13 @@ void QAxBase::setPropertyBag(const PropertyBag &bag)
 
     if (isNull())
         return;
-    IPersistPropertyBag *persist = 0;
+    IPersistPropertyBag *persist = nullptr;
     d->ptr->QueryInterface(IID_IPersistPropertyBag, reinterpret_cast<void **>(&persist));
     if (persist) {
         QtPropertyBag *pbag = new QtPropertyBag();
         pbag->map = bag;
         pbag->AddRef();
-        persist->Load(pbag, 0);
+        persist->Load(pbag, nullptr);
         pbag->Release();
         persist->Release();
     } else {
@@ -4518,9 +4518,9 @@ QVariant QAxBase::asVariant() const
 void *qax_createObjectWrapper(int metaType, IUnknown *iface)
 {
     if (!iface)
-        return 0;
+        return nullptr;
 
-    void *object = QMetaType::create(metaType, 0);
+    void *object = QMetaType::create(metaType, nullptr);
     QAxBasePrivate *d = reinterpret_cast<const QAxObject *>(object)->d;
 
     d->ptr = iface;
diff --git a/src/activeqt/container/qaxdump.cpp b/src/activeqt/container/qaxdump.cpp
index 80133d7..e2122c3 100644
--- a/src/activeqt/container/qaxdump.cpp
+++ b/src/activeqt/container/qaxdump.cpp
@@ -74,7 +74,7 @@ QString qax_docuFromName(ITypeInfo *typeInfo, const QString &name)
     if (memId != DISPID_UNKNOWN) {
         BSTR docStringBstr, helpFileBstr;
         ulong helpContext;
-        HRESULT hres = typeInfo->GetDocumentation(memId, 0, &docStringBstr, &helpContext, &helpFileBstr);
+        HRESULT hres = typeInfo->GetDocumentation(memId, nullptr, &docStringBstr, &helpContext, &helpFileBstr);
         QString docString = QString::fromWCharArray(docStringBstr);
         QString helpFile = QString::fromWCharArray(helpFileBstr);
         SysFreeString(docStringBstr);
@@ -142,8 +142,8 @@ QString qax_generateDocumentation(QAxBase *that)
     if (that->isNull())
         return QString();
 
-    ITypeInfo *typeInfo = 0;
-    IDispatch *dispatch = 0;
+    ITypeInfo *typeInfo = nullptr;
+    IDispatch *dispatch = nullptr;
     that->queryInterface(IID_IDispatch, reinterpret_cast<void **>(&dispatch));
     if (dispatch)
         dispatch->GetTypeInfo(0, LOCALE_SYSTEM_DEFAULT, &typeInfo);
@@ -160,7 +160,7 @@ QString qax_generateDocumentation(QAxBase *that)
 
     stream << "<h3>Interfaces</h3>" << endl;
     stream << "<ul>" << endl;
-    const char *inter = 0;
+    const char *inter = nullptr;
     UINT interCount = 1;
     while ((inter = mo->classInfo(mo->indexOfClassInfo("Interface " + QByteArray::number(interCount))).value())) {
         stream << "<li>" << inter << endl;
@@ -246,13 +246,13 @@ QString qax_generateDocumentation(QAxBase *that)
     }
     int signalCount = mo->methodCount();
     if (signalCount) {
-        ITypeLib *typeLib = 0;
+        ITypeLib *typeLib = nullptr;
         if (typeInfo) {
             UINT index = 0;
             typeInfo->GetContainingTypeLib(&typeLib, &index);
             typeInfo->Release();
         }
-        typeInfo = 0;
+        typeInfo = nullptr;
 
         stream << "<h2>Signals:</h2>" << endl;
         stream << "<ul>" << endl;
@@ -275,7 +275,7 @@ QString qax_generateDocumentation(QAxBase *that)
                 do {
                     if (typeInfo)
                         typeInfo->Release();
-                    typeInfo = 0;
+                    typeInfo = nullptr;
                     typeLib->GetTypeInfo(++interCount, &typeInfo);
                     QString typeLibDocu = docuFromName(typeInfo, QString::fromLatin1(name.constData()));
                     if (!typeLibDocu.isEmpty()) {
@@ -294,7 +294,7 @@ QString qax_generateDocumentation(QAxBase *that)
             methodDetails << detail;
             if (typeInfo)
                 typeInfo->Release();
-            typeInfo = 0;
+            typeInfo = nullptr;
         }
         stream << "</ul>" << endl;
 
diff --git a/src/activeqt/container/qaxobject.cpp b/src/activeqt/container/qaxobject.cpp
index 6389956..97a995d 100644
--- a/src/activeqt/container/qaxobject.cpp
+++ b/src/activeqt/container/qaxobject.cpp
@@ -92,7 +92,7 @@ QT_BEGIN_NAMESPACE
 
 const QMetaObject QAxObject::staticMetaObject = {
     { &QObject::staticMetaObject, qt_meta_stringdata_QAxBase.data,
-      qt_meta_data_QAxBase, qt_static_metacall, 0, 0 }
+      qt_meta_data_QAxBase, qt_static_metacall, nullptr, nullptr }
 };
 
 /*!
@@ -221,14 +221,14 @@ bool QAxObject::doVerb(const QString &verb)
 {
     if (!verbs().contains(verb))
         return false;
-    IOleObject *ole = 0;
+    IOleObject *ole = nullptr;
     queryInterface(IID_IOleObject, reinterpret_cast<void **>(&ole));
     if (!ole)
         return false;
 
     LONG index = indexOfVerb(verb);
 
-    HRESULT hres = ole->DoVerb(index, 0, 0, 0, 0, 0);
+    HRESULT hres = ole->DoVerb(index, nullptr, nullptr, 0, nullptr, nullptr);
 
     ole->Release();
 
diff --git a/src/activeqt/container/qaxscript.cpp b/src/activeqt/container/qaxscript.cpp
index 33a10e0..5ae6c89 100644
--- a/src/activeqt/container/qaxscript.cpp
+++ b/src/activeqt/container/qaxscript.cpp
@@ -160,7 +160,7 @@ ULONG WINAPI QAxScriptSite::Release()
 */
 HRESULT WINAPI QAxScriptSite::QueryInterface(REFIID iid, void **ppvObject)
 {
-    *ppvObject = 0;
+    *ppvObject = nullptr;
     if (iid == IID_IUnknown)
         *ppvObject = static_cast<IUnknown *>(static_cast<IActiveScriptSite *>(this));
     else if (iid == IID_IActiveScriptSite)
@@ -193,12 +193,12 @@ HRESULT WINAPI QAxScriptSite::GetLCID(LCID * /*plcid*/)
 HRESULT WINAPI QAxScriptSite::GetItemInfo(LPCOLESTR pstrName, DWORD mask, IUnknown **item, ITypeInfo **type)
 {
     if (item)
-        *item = 0;
+        *item = nullptr;
     else if (mask & SCRIPTINFO_IUNKNOWN)
         return E_POINTER;
 
     if (type)
-        *type = 0;
+        *type = nullptr;
     else if (mask & SCRIPTINFO_ITYPEINFO)
         return E_POINTER;
 
@@ -209,7 +209,7 @@ HRESULT WINAPI QAxScriptSite::GetItemInfo(LPCOLESTR pstrName, DWORD mask, IUnkno
     if (mask & SCRIPTINFO_IUNKNOWN)
         object->queryInterface(IID_IUnknown, reinterpret_cast<void **>(item));
     if (mask & SCRIPTINFO_ITYPEINFO) {
-        IProvideClassInfo *classInfo = 0;
+        IProvideClassInfo *classInfo = nullptr;
         object->queryInterface(IID_IProvideClassInfo, reinterpret_cast<void **>(&classInfo));
         if (classInfo) {
             classInfo->GetClassInfo(type);
@@ -241,7 +241,7 @@ HRESULT WINAPI QAxScriptSite::OnScriptTerminate(const VARIANT *result, const EXC
     emit script->finished();
 
     if (result && result->vt != VT_EMPTY)
-        emit script->finished(VARIANTToQVariant(*result, 0));
+        emit script->finished(VARIANTToQVariant(*result, nullptr));
     if (exception)
         emit script->finished(exception->wCode,
                               QString::fromWCharArray(exception->bstrSource),
@@ -327,7 +327,7 @@ HRESULT WINAPI QAxScriptSite::OnStateChange(SCRIPTSTATE ssScriptState)
 */
 QWidget *QAxScriptSite::window() const
 {
-    QWidget *w = 0;
+    QWidget *w = nullptr;
     QObject *p = script->parent();
     while (!w && p) {
         w = qobject_cast<QWidget*>(p);
@@ -353,7 +353,7 @@ HRESULT WINAPI QAxScriptSite::GetWindow(HWND *phwnd)
     if (!phwnd)
         return E_POINTER;
 
-    *phwnd = 0;
+    *phwnd = nullptr;
     QWidget *w = window();
     if (!w)
         return E_FAIL;
@@ -428,7 +428,7 @@ HRESULT WINAPI QAxScriptSite::EnableModeless(BOOL fEnable)
     script.
 */
 QAxScriptEngine::QAxScriptEngine(const QString &language, QAxScript *script)
-: QAxObject(script), script_code(script), engine(0), script_language(language)
+: QAxObject(script), script_code(script), engine(nullptr), script_language(language)
 {
 #ifdef QT_CHECK_STATE
     if (language.isEmpty())
@@ -470,7 +470,7 @@ QAxScriptEngine::~QAxScriptEngine()
 */
 bool QAxScriptEngine::initialize(IUnknown **ptr)
 {
-    *ptr = 0;
+    *ptr = nullptr;
 
 #ifndef QT_NO_QAXSCRIPT
     if (!script_code || script_language.isEmpty())
@@ -481,57 +481,57 @@ bool QAxScriptEngine::initialize(IUnknown **ptr)
     if(FAILED(hres))
         return false;
 
-    CoCreateInstance(clsid, 0, CLSCTX_INPROC_SERVER, IID_IActiveScript, reinterpret_cast<void **>(&engine));
+    CoCreateInstance(clsid, nullptr, CLSCTX_INPROC_SERVER, IID_IActiveScript, reinterpret_cast<void **>(&engine));
     if (!engine)
         return false;
 
-    IActiveScriptParse *parser = 0;
+    IActiveScriptParse *parser = nullptr;
     engine->QueryInterface(IID_IActiveScriptParse, reinterpret_cast<void **>(&parser));
     if (!parser) {
         engine->Release();
-        engine = 0;
+        engine = nullptr;
         return false;
     }
 
     if (engine->SetScriptSite(script_code->script_site) != S_OK) {
         engine->Release();
-        engine = 0;
+        engine = nullptr;
         return false;
     }
     if (parser->InitNew() != S_OK) {
         parser->Release();
         engine->Release();
-        engine = 0;
+        engine = nullptr;
         return false;
     }
 
     BSTR bstrCode = QStringToBSTR(script_code->scriptCode());
 #ifdef Q_OS_WIN64
-    hres = parser->ParseScriptText(bstrCode, 0, 0, 0, DWORDLONG(this), 0, SCRIPTTEXT_ISVISIBLE, 0, 0);
+    hres = parser->ParseScriptText(bstrCode, nullptr, nullptr, nullptr, DWORDLONG(this), 0, SCRIPTTEXT_ISVISIBLE, nullptr, nullptr);
 #else
     hres = parser->ParseScriptText(bstrCode, 0, 0, 0, DWORD(this), 0, SCRIPTTEXT_ISVISIBLE, 0, 0);
 #endif
     SysFreeString(bstrCode);
 
     parser->Release();
-    parser = 0;
+    parser = nullptr;
 
     script_code->updateObjects();
 
     if (engine->SetScriptState(SCRIPTSTATE_CONNECTED) != S_OK) {
-        engine = 0;
+        engine = nullptr;
         return false;
     }
 
-    IDispatch *scriptDispatch = 0;
-    engine->GetScriptDispatch(0, &scriptDispatch);
+    IDispatch *scriptDispatch = nullptr;
+    engine->GetScriptDispatch(nullptr, &scriptDispatch);
     if (scriptDispatch) {
         scriptDispatch->QueryInterface(IID_IUnknown, reinterpret_cast<void **>(ptr));
         scriptDispatch->Release();
     }
 #endif
 
-    return *ptr != 0;
+    return *ptr != nullptr;
 }
 
 /*!
@@ -551,7 +551,7 @@ bool QAxScriptEngine::hasIntrospection() const
     if (!isValid())
         return false;
 
-    IDispatch *scriptDispatch = 0;
+    IDispatch *scriptDispatch = nullptr;
     QAxBase::queryInterface(IID_IDispatch, reinterpret_cast<void **>(&scriptDispatch));
     if (!scriptDispatch)
         return false;
@@ -573,7 +573,7 @@ bool QAxScriptEngine::hasIntrospection() const
 */
 long QAxScriptEngine::queryInterface(const QUuid &uuid, void **iface) const
 {
-    *iface = 0;
+    *iface = nullptr;
     if (!engine)
         return E_NOTIMPL;
 
@@ -682,7 +682,7 @@ void QAxScriptEngine::addItem(const QString &name)
 */
 QAxScript::QAxScript(const QString &name, QAxScriptManager *manager)
 : QObject(manager), script_name(name), script_manager(manager),
-script_engine(0)
+script_engine(nullptr)
 {
     if (manager) {
         manager->d->scriptDict.insert(name, this);
@@ -705,7 +705,7 @@ script_engine(0)
 QAxScript::~QAxScript()
 {
     delete script_engine;
-    script_engine = 0;
+    script_engine = nullptr;
 
 #ifndef QT_NO_QAXSCRIPT
     script_site->Release();
@@ -849,7 +849,7 @@ void QAxScript::updateObjects()
 QAxBase *QAxScript::findObject(const QString &name)
 {
     if (!script_manager)
-        return 0;
+        return nullptr;
 
     return script_manager->d->objectDict.value(name);
 }
@@ -1066,7 +1066,7 @@ QAxScript *QAxScriptManager::load(const QString &code, const QString &name, cons
         return script;
 
     delete script;
-    return 0;
+    return nullptr;
 }
 
 /*!
@@ -1089,13 +1089,13 @@ QAxScript *QAxScriptManager::load(const QString &file, const QString &name)
 {
     QFile f(file);
     if (!f.open(QIODevice::ReadOnly))
-        return 0;
+        return nullptr;
     QByteArray data = f.readAll();
     QString contents = QString::fromLocal8Bit(data, data.size());
     f.close();
 
     if (contents.isEmpty())
-        return 0;
+        return nullptr;
 
     QString language;
     if (file.endsWith(QLatin1String(".js"))) {
@@ -1117,7 +1117,7 @@ QAxScript *QAxScriptManager::load(const QString &file, const QString &name)
         return script;
 
     delete script;
-    return 0;
+    return nullptr;
 }
 
 /*!
@@ -1282,7 +1282,7 @@ QAxScript *QAxScriptManager::scriptForFunction(const QString &function) const
             return it.value();
     }
 
-    return 0;
+    return nullptr;
 }
 
 /*!
diff --git a/src/activeqt/container/qaxscriptwrapper.cpp b/src/activeqt/container/qaxscriptwrapper.cpp
index 418eff1..31a082f 100644
--- a/src/activeqt/container/qaxscriptwrapper.cpp
+++ b/src/activeqt/container/qaxscriptwrapper.cpp
@@ -58,8 +58,8 @@ QT_BEGIN_NAMESPACE
 
 QAxBase *qax_create_object_wrapper(QObject *object)
 {
-    IDispatch *dispatch = 0;
-    QAxObject *wrapper = 0;
+    IDispatch *dispatch = nullptr;
+    QAxObject *wrapper = nullptr;
     qAxFactory()->createObjectWrapper(object, &dispatch);
     if (dispatch) {
         wrapper = new QAxObject(dispatch, object);
diff --git a/src/activeqt/container/qaxselect.cpp b/src/activeqt/container/qaxselect.cpp
index 2f0f2aa..25386c3 100644
--- a/src/activeqt/container/qaxselect.cpp
+++ b/src/activeqt/container/qaxselect.cpp
@@ -187,10 +187,10 @@ inline bool operator==(const Control &c1, const Control &c2) { return !c1.compar
 static LONG RegistryQueryValue(HKEY hKey, LPCWSTR lpSubKey, LPBYTE lpData, LPDWORD lpcbData)
 {
     LONG ret = ERROR_FILE_NOT_FOUND;
-    HKEY hSubKey = NULL;
+    HKEY hSubKey = nullptr;
     RegOpenKeyEx(hKey, lpSubKey, 0, KEY_READ, &hSubKey);
     if (hSubKey) {
-        ret = RegQueryValueEx(hSubKey, 0, 0, 0, lpData, lpcbData);
+        ret = RegQueryValueEx(hSubKey, nullptr, nullptr, nullptr, lpData, lpcbData);
         RegCloseKey(hSubKey);
     }
     return ret;
@@ -198,12 +198,12 @@ static LONG RegistryQueryValue(HKEY hKey, LPCWSTR lpSubKey, LPBYTE lpData, LPDWO
 
 static bool querySubKeyValue(HKEY hKey, const QString &subKeyName,  LPBYTE lpData, LPDWORD lpcbData)
 {
-    HKEY hSubKey = NULL;
+    HKEY hSubKey = nullptr;
     const LONG openResult = RegOpenKeyEx(hKey,  reinterpret_cast<const wchar_t *>(subKeyName.utf16()),
                                          0, KEY_READ, &hSubKey);
     if (openResult != ERROR_SUCCESS)
         return false;
-    const bool result = RegQueryValueEx(hSubKey, 0, 0, 0, lpData, lpcbData) == ERROR_SUCCESS;
+    const bool result = RegQueryValueEx(hSubKey, nullptr, nullptr, nullptr, lpData, lpcbData) == ERROR_SUCCESS;
     RegCloseKey(hSubKey);
     return result;
 }
@@ -225,7 +225,7 @@ static QList<Control> readControls(const wchar_t *rootKey, unsigned wordSize)
     FILETIME ft;
     do {
         szBuffer = sizeof(buffer) / sizeof(wchar_t);
-        result = RegEnumKeyEx(classesKey, index, buffer, &szBuffer, 0, 0, 0, &ft);
+        result = RegEnumKeyEx(classesKey, index, buffer, &szBuffer, nullptr, nullptr, nullptr, &ft);
         szBuffer = sizeof(buffer) / sizeof(wchar_t);
         if (result == ERROR_SUCCESS) {
             HKEY subKey;
@@ -268,7 +268,7 @@ static QList<Control> readControls(const wchar_t *rootKey, unsigned wordSize)
 class ControlList : public QAbstractListModel
 {
 public:
-    ControlList(QObject *parent=0)
+    ControlList(QObject *parent=nullptr)
     : QAbstractListModel(parent)
     {
         m_controls = readControls(L"CLSID", unsigned(QSysInfo::WordSize));
diff --git a/src/activeqt/container/qaxwidget.cpp b/src/activeqt/container/qaxwidget.cpp
index 31fd8fe..4a22094 100644
--- a/src/activeqt/container/qaxwidget.cpp
+++ b/src/activeqt/container/qaxwidget.cpp
@@ -150,7 +150,7 @@ protected:
     void showEvent(QShowEvent *e) override;
     QPaintEngine *paintEngine() const override
     {
-        return 0;
+        return nullptr;
     }
 
 private:
@@ -191,9 +191,9 @@ public:
     inline void reset(QWidget *p)
     {
         if (widget == p)
-            widget = 0;
+            widget = nullptr;
         else if (host == p)
-            host = 0;
+            host = nullptr;
     }
 
     inline IOleInPlaceActiveObject *inPlaceObject() const
@@ -209,7 +209,7 @@ public:
             return OLE_E_NOT_INPLACEACTIVE;
 
         RECT rcPos = qaxNativeWidgetRect(host);
-        return m_spOleObject->DoVerb(index, 0, this, 0,
+        return m_spOleObject->DoVerb(index, nullptr, this, 0,
                                      reinterpret_cast<HWND>(host->winId()),
                                      &rcPos);
     }
@@ -398,7 +398,7 @@ public:
 
 private:
     struct OleMenuItem {
-        OleMenuItem(HMENU hm = 0, int ID = 0, QMenu *menu = 0)
+        OleMenuItem(HMENU hm = nullptr, int ID = 0, QMenu *menu = nullptr)
             : hMenu(hm), subMenu(menu), id(ID)
         {}
         HMENU hMenu;
@@ -449,7 +449,7 @@ static const ushort mouseTbl[] = {
 
 static Qt::MouseButtons translateMouseButtonState(int s)
 {
-    Qt::MouseButtons bst = 0;
+    Qt::MouseButtons bst = nullptr;
     if (s & MK_LBUTTON)
         bst |= Qt::LeftButton;
     if (s & MK_MBUTTON)
@@ -462,7 +462,7 @@ static Qt::MouseButtons translateMouseButtonState(int s)
 
 static Qt::KeyboardModifiers translateModifierState(int s)
 {
-    Qt::KeyboardModifiers bst = 0;
+    Qt::KeyboardModifiers bst = nullptr;
     if (s & MK_SHIFT)
         bst |= Qt::ShiftModifier;
     if (s & MK_CONTROL)
@@ -499,8 +499,8 @@ bool QAxNativeEventFilter::nativeEventFilter(const QByteArray &, void *m, long *
         qaxClearCachedSystemLogicalDpi();
     if ((message >= WM_MOUSEFIRST && message <= WM_MOUSELAST) || (message >= WM_KEYFIRST && message <= WM_KEYLAST)) {
         HWND hwnd = msg->hwnd;
-        QAxWidget *ax = 0;
-        QAxHostWidget *host = 0;
+        QAxWidget *ax = nullptr;
+        QAxHostWidget *host = nullptr;
         while (!host && hwnd) {
             // FIXME: 4.10.2011: Does this still work?
             QWidget *widget = QWidget::find(reinterpret_cast<WId>(hwnd));
@@ -579,16 +579,16 @@ bool QAxClientSite::activateObject(bool initialized, const QByteArray &data)
         DWORD dwMiscStatus = 0;
         m_spOleObject->GetMiscStatus(DVASPECT_CONTENT, &dwMiscStatus);
 
-        IOleDocument *document = 0;
+        IOleDocument *document = nullptr;
         m_spOleObject->QueryInterface(IID_IOleDocument, (void**)&document);
         if (document) {
-            IPersistStorage *persistStorage = 0;
+            IPersistStorage *persistStorage = nullptr;
             document->QueryInterface(IID_IPersistStorage, (void**)&persistStorage);
             if (persistStorage) {
             // try to activate as document server
-                IStorage *storage = 0;
-                ILockBytes * bytes = 0;
-                ::CreateILockBytesOnHGlobal(0, TRUE, &bytes);
+                IStorage *storage = nullptr;
+                ILockBytes * bytes = nullptr;
+                ::CreateILockBytesOnHGlobal(nullptr, TRUE, &bytes);
                 ::StgCreateDocfileOnILockBytes(bytes, STGM_SHARE_EXCLUSIVE|STGM_CREATE|STGM_READWRITE, 0, &storage);
 
                 persistStorage->InitNew(storage);
@@ -609,11 +609,11 @@ bool QAxClientSite::activateObject(bool initialized, const QByteArray &data)
                 m_spOleObject->SetClientSite(this);
 
             if (!initialized) {
-                IPersistStreamInit *spPSI = 0;
+                IPersistStreamInit *spPSI = nullptr;
                 m_spOleObject->QueryInterface(IID_IPersistStreamInit, (void**)&spPSI);
                 if (spPSI) {
                     if (data.length()) {
-                        IStream *pStream = 0;
+                        IStream *pStream = nullptr;
                         HGLOBAL hGlobal = GlobalAlloc(GMEM_MOVEABLE, data.length());
                         if (hGlobal) {
                             BYTE *pStByte = (BYTE *)GlobalLock(hGlobal);
@@ -631,7 +631,7 @@ bool QAxClientSite::activateObject(bool initialized, const QByteArray &data)
                     }
                     spPSI->Release();
                 } else if (data.length()) { //try initializing using a IPersistStorage
-                    IPersistStorage *spPS = 0;
+                    IPersistStorage *spPS = nullptr;
                     m_spOleObject->QueryInterface( IID_IPersistStorage, reinterpret_cast<void **>(&spPS));
                     if (spPS) {
                         HGLOBAL hGlobal = GlobalAlloc(GMEM_MOVEABLE, size_t(data.length()));
@@ -640,11 +640,11 @@ bool QAxClientSite::activateObject(bool initialized, const QByteArray &data)
                                 memcpy(pbData, data.data(), size_t(data.length()));
                             GlobalUnlock(hGlobal);
                             // open an IStorage on the data and pass it to Load
-                            LPLOCKBYTES pLockBytes = 0;
+                            LPLOCKBYTES pLockBytes = nullptr;
                             if (SUCCEEDED(CreateILockBytesOnHGlobal(hGlobal, TRUE, &pLockBytes))) {
-                                LPSTORAGE pStorage = 0;
-                                if (SUCCEEDED(StgOpenStorageOnILockBytes(pLockBytes, 0,
-                                              STGM_READWRITE | STGM_SHARE_EXCLUSIVE, 0, 0, &pStorage))) {
+                                LPSTORAGE pStorage = nullptr;
+                                if (SUCCEEDED(StgOpenStorageOnILockBytes(pLockBytes, nullptr,
+                                              STGM_READWRITE | STGM_SHARE_EXCLUSIVE, nullptr, 0, &pStorage))) {
                                     spPS->Load(pStorage);
                                     pStorage->Release();
                                 }
@@ -661,11 +661,11 @@ bool QAxClientSite::activateObject(bool initialized, const QByteArray &data)
                 m_spOleObject->SetClientSite(this);
         }
 
-        IViewObject *spViewObject = 0;
+        IViewObject *spViewObject = nullptr;
         m_spOleObject->QueryInterface(IID_IViewObject, reinterpret_cast<void **>(&spViewObject));
 
         m_spOleObject->Advise(this, &m_dwOleObject);
-        IAdviseSink *spAdviseSink = 0;
+        IAdviseSink *spAdviseSink = nullptr;
         QueryInterface(IID_IAdviseSink, reinterpret_cast<void **>(&spAdviseSink));
         if (spAdviseSink && spViewObject) {
             if (spViewObject)
@@ -676,7 +676,7 @@ bool QAxClientSite::activateObject(bool initialized, const QByteArray &data)
         if (spViewObject)
             spViewObject->Release();
 
-        m_spOleObject->SetHostNames(OLESTR("AXWIN"), 0);
+        m_spOleObject->SetHostNames(OLESTR("AXWIN"), nullptr);
 
         if (!(dwMiscStatus & OLEMISC_INVISIBLEATRUNTIME)) {
             SIZEL hmSize = qaxMapPixToLogHiMetrics(QSize(250, 250), widget);
@@ -699,7 +699,7 @@ bool QAxClientSite::activateObject(bool initialized, const QByteArray &data)
         RECT rcPos = qaxQRect2Rect(QRect(qaxNativeWidgetPosition(host), qaxToNativeSize(host, sizehint)));
 
         const HWND hostWnd = reinterpret_cast<HWND>(host->winId());
-        m_spOleObject->DoVerb(OLEIVERB_INPLACEACTIVATE, 0, static_cast<IOleClientSite *>(this), 0,
+        m_spOleObject->DoVerb(OLEIVERB_INPLACEACTIVATE, nullptr, static_cast<IOleClientSite *>(this), 0,
                               hostWnd,
                               &rcPos);
 
@@ -743,7 +743,7 @@ bool QAxClientSite::activateObject(bool initialized, const QByteArray &data)
             CoTaskMemFree(userType);
         }
     } else {
-        IObjectWithSite *spSite = 0;
+        IObjectWithSite *spSite = nullptr;
         widget->queryInterface(IID_IObjectWithSite, reinterpret_cast<void **>(&spSite));
         if (spSite) {
             spSite->SetSite(static_cast<IUnknown *>(static_cast<IDispatch *>(this)));
@@ -766,11 +766,11 @@ bool QAxClientSite::activateObject(bool initialized, const QByteArray &data)
 QAxClientSite::~QAxClientSite()
 {
     if (host) {
-        host->axhost = 0;
+        host->axhost = nullptr;
     }
 
     if (aggregatedObject)
-        aggregatedObject->the_object = 0;
+        aggregatedObject->the_object = nullptr;
     delete aggregatedObject;
     delete host;
 }
@@ -785,11 +785,11 @@ void QAxClientSite::releaseAll()
         m_spOleObject->SetClientSite(nullptr);
         m_spOleObject->Release();
     }
-    m_spOleObject = 0;
+    m_spOleObject = nullptr;
     if (m_spInPlaceObject) m_spInPlaceObject->Release();
-    m_spInPlaceObject = 0;
+    m_spInPlaceObject = nullptr;
     if (m_spInPlaceActiveObject) m_spInPlaceActiveObject->Release();
-    m_spInPlaceActiveObject = 0;
+    m_spInPlaceActiveObject = nullptr;
 
     inPlaceObjectWindowless = false;
 }
@@ -810,7 +810,7 @@ void QAxClientSite::deactivate()
         CoDisconnectObject(static_cast<IUnknown *>(static_cast<IDispatch *>(this)), 0);
     }
 
-    Q_ASSERT(m_spInPlaceObject == 0);
+    Q_ASSERT(m_spInPlaceObject == nullptr);
 }
 
 //**** IUnknown
@@ -830,7 +830,7 @@ unsigned long WINAPI QAxClientSite::Release()
 
 HRESULT WINAPI QAxClientSite::QueryInterface(REFIID iid, void **iface)
 {
-    *iface = 0;
+    *iface = nullptr;
 
     if (iid == IID_IUnknown) {
         *iface = static_cast<IUnknown *>(static_cast<IDispatch *>(this));
@@ -960,7 +960,7 @@ HRESULT WINAPI QAxClientSite::GetMoniker(DWORD, DWORD, IMoniker **ppmk)
     if (!ppmk)
         return E_POINTER;
 
-    *ppmk = 0;
+    *ppmk = nullptr;
     return E_NOTIMPL;
 }
 
@@ -969,7 +969,7 @@ HRESULT WINAPI QAxClientSite::GetContainer(LPOLECONTAINER *ppContainer)
     if (!ppContainer)
         return E_POINTER;
 
-    *ppContainer = 0;
+    *ppContainer = nullptr;
     return E_NOINTERFACE;
 }
 
@@ -1008,7 +1008,7 @@ HRESULT WINAPI QAxClientSite::GetExtendedControl(IDispatch** ppDisp)
     if (!ppDisp)
         return E_POINTER;
 
-    *ppDisp = 0;
+    *ppDisp = nullptr;
     return E_NOTIMPL;
 }
 
@@ -1137,10 +1137,10 @@ HRESULT WINAPI QAxClientSite::GetWindowContext(IOleInPlaceFrame **ppFrame, IOleI
 
     lpFrameInfo->cb = sizeof(OLEINPLACEFRAMEINFO);
     lpFrameInfo->fMDIApp = false;
-    lpFrameInfo->haccel = 0;
+    lpFrameInfo->haccel = nullptr;
     lpFrameInfo->cAccelEntries = 0;
     // FIXME: 4.10.2011: Parent's HWND required, should work.
-    lpFrameInfo->hwndFrame = widget ? hwnd : 0;
+    lpFrameInfo->hwndFrame = widget ? hwnd : nullptr;
 
     return S_OK;
 }
@@ -1165,7 +1165,7 @@ HRESULT WINAPI QAxClientSite::OnInPlaceDeactivate()
     AX_DEBUG(QAxClientSite::OnInPlaceDeactivate);
     if (m_spInPlaceObject)
         m_spInPlaceObject->Release();
-    m_spInPlaceObject = 0;
+    m_spInPlaceObject = nullptr;
     inPlaceObjectWindowless = false;
     OleLockRunning(m_spOleObject, false, false);
 
@@ -1203,9 +1203,9 @@ HRESULT WINAPI QAxClientSite::InsertMenus(HMENU /*hmenuShared*/, LPOLEMENUGROUPW
         return E_NOTIMPL;
     menuBar = mb;
 
-    QMenu *fileMenu = 0;
-    QMenu *viewMenu = 0;
-    QMenu *windowMenu = 0;
+    QMenu *fileMenu = nullptr;
+    QMenu *viewMenu = nullptr;
+    QMenu *windowMenu = nullptr;
     QList<QAction*> actions = menuBar->actions();
     for (int i = 0; i < actions.count(); ++i) {
         QAction *action = actions.at(i);
@@ -1264,7 +1264,7 @@ static int menuItemEntry(HMENU menu, int index, MENUITEMINFO item, QString &text
 
 QMenu *QAxClientSite::generatePopup(HMENU subMenu, QWidget *parent)
 {
-    QMenu *popup = 0;
+    QMenu *popup = nullptr;
     int count = GetMenuItemCount(subMenu);
     if (count)
         popup = new QMenu(parent);
@@ -1275,15 +1275,15 @@ QMenu *QAxClientSite::generatePopup(HMENU subMenu, QWidget *parent)
         item.fMask = MIIM_ID | MIIM_TYPE | MIIM_SUBMENU;
         ::GetMenuItemInfo(subMenu, UINT(i), true, &item);
 
-        QAction *action = 0;
-        QMenu *popupMenu = 0;
+        QAction *action = nullptr;
+        QMenu *popupMenu = nullptr;
         if (item.fType == MFT_SEPARATOR) {
             action = popup->addSeparator();
         } else {
             QString text;
             QPixmap icon;
             QKeySequence accel;
-            popupMenu = item.hSubMenu ? generatePopup(item.hSubMenu, popup) : 0;
+            popupMenu = item.hSubMenu ? generatePopup(item.hSubMenu, popup) : nullptr;
             int res = menuItemEntry(subMenu, i, item, text, icon);
 
             int lastSep = text.lastIndexOf(QRegularExpression(QLatin1String("[\\s]")));
@@ -1349,14 +1349,14 @@ HRESULT WINAPI QAxClientSite::SetMenu(HMENU hmenuShared, HOLEMENU holemenu, HWND
             item.fMask = MIIM_ID | MIIM_TYPE | MIIM_SUBMENU;
             ::GetMenuItemInfo(hmenuShared, UINT(i), true, &item);
 
-            QAction *action = 0;
-            QMenu *popupMenu = 0;
+            QAction *action = nullptr;
+            QMenu *popupMenu = nullptr;
             if (item.fType == MFT_SEPARATOR) {
                 action = menuBar->addSeparator();
             } else {
                 QString text;
                 QPixmap icon;
-                popupMenu = item.hSubMenu ? generatePopup(item.hSubMenu, menuBar) : 0;
+                popupMenu = item.hSubMenu ? generatePopup(item.hSubMenu, menuBar) : nullptr;
                 int res = menuItemEntry(hmenuShared, i, item, text, icon);
 
                 if (popupMenu)
@@ -1395,14 +1395,14 @@ HRESULT WINAPI QAxClientSite::SetMenu(HMENU hmenuShared, HOLEMENU holemenu, HWND
             QMetaObject::connect(menuBar, index, host, index);
         }
     } else if (menuBar) {
-        m_menuOwner = 0;
+        m_menuOwner = nullptr;
         const MenuItemMap::Iterator mend = menuItemMap.end();
         for (MenuItemMap::Iterator it = menuItemMap.begin(); it != mend; ++it)
             delete it.key();
         menuItemMap.clear();
     }
 
-    OleSetMenuDescriptor(holemenu, widget ? hwndForWidget(widget) : 0, m_menuOwner, this, m_spInPlaceActiveObject);
+    OleSetMenuDescriptor(holemenu, widget ? hwndForWidget(widget) : nullptr, m_menuOwner, this, m_spInPlaceActiveObject);
     return S_OK;
 }
 
@@ -1575,15 +1575,15 @@ HRESULT WINAPI QAxClientSite::ActivateMe(IOleDocumentView *pViewToActivate)
 
     if (m_spActiveView)
         m_spActiveView->Release();
-    m_spActiveView = 0;
+    m_spActiveView = nullptr;
 
     if (!pViewToActivate) {
-        IOleDocument *document = 0;
+        IOleDocument *document = nullptr;
         m_spOleObject->QueryInterface(IID_IOleDocument, reinterpret_cast<void **>(&document));
         if (!document)
             return E_FAIL;
 
-        document->CreateView(this, 0, 0, &pViewToActivate);
+        document->CreateView(this, nullptr, 0, &pViewToActivate);
 
         document->Release();
         if (!pViewToActivate)
@@ -1662,7 +1662,7 @@ int QAxHostWidget::qt_metacall(QMetaObject::Call call, int isignal, void **argv)
 
 void* QAxHostWidget::qt_metacast(const char *clname)
 {
-    if (!clname) return 0;
+    if (!clname) return nullptr;
     if (!qstrcmp(clname,"QAxHostWidget"))
         return static_cast<void*>(const_cast< QAxHostWidget*>(this));
     return QWidget::qt_metacast(clname);
@@ -1674,7 +1674,7 @@ QWindow *QAxHostWidget::hostWindow() const
         return w;
     if (QWidget *parent = nativeParentWidget())
         return parent->windowHandle();
-    return 0;
+    return nullptr;
 }
 
 QSize QAxHostWidget::sizeHint() const
@@ -1755,7 +1755,7 @@ bool QAxHostWidget::event(QEvent *e)
             killTimer(setFocusTimer);
             setFocusTimer = 0;
             RECT rcPos = qaxNativeWidgetRect(this);
-            axhost->m_spOleObject->DoVerb(OLEIVERB_UIACTIVATE, 0, static_cast<IOleClientSite *>(axhost), 0,
+            axhost->m_spOleObject->DoVerb(OLEIVERB_UIACTIVATE, nullptr, static_cast<IOleClientSite *>(axhost), 0,
                                           reinterpret_cast<HWND>(winId()), &rcPos);
             if (axhost->m_spActiveView)
                 axhost->m_spActiveView->UIActivate(TRUE);
@@ -1841,7 +1841,7 @@ void QAxHostWidget::paintEvent(QPaintEvent*)
     if (!redirected(&dummyOffset))
         return;
 
-    IViewObject *view = 0;
+    IViewObject *view = nullptr;
     if (axhost)
         axhost->widget->queryInterface(IID_IViewObject, reinterpret_cast<void **>(&view));
     if (!view)
@@ -1851,7 +1851,7 @@ void QAxHostWidget::paintEvent(QPaintEvent*)
     pm.fill();
 
     HBITMAP hBmp = qt_pixmapToWinHBITMAP(pm);
-    const HDC displayDc = GetDC(0);
+    const HDC displayDc = GetDC(nullptr);
     HDC hBmp_hdc = CreateCompatibleDC(displayDc);
     HGDIOBJ old_hBmp = SelectObject(hBmp_hdc, hBmp);
 
@@ -1861,7 +1861,7 @@ void QAxHostWidget::paintEvent(QPaintEvent*)
     bounds.top = 0;
     bounds.bottom = pm.height();
 
-    view->Draw(DVASPECT_CONTENT, -1, 0, 0, 0, hBmp_hdc, &bounds, 0, 0 /*fptr*/, 0);
+    view->Draw(DVASPECT_CONTENT, -1, nullptr, nullptr, nullptr, hBmp_hdc, &bounds, nullptr, nullptr /*fptr*/, 0);
     view->Release();
 
     QPainter painter(this);
@@ -1872,7 +1872,7 @@ void QAxHostWidget::paintEvent(QPaintEvent*)
     SelectObject(hBmp_hdc, old_hBmp);
     DeleteObject(hBmp);
     DeleteDC(hBmp_hdc);
-    ReleaseDC(0, displayDc);
+    ReleaseDC(nullptr, displayDc);
 }
 
 /*!
@@ -1919,7 +1919,7 @@ void QAxHostWidget::paintEvent(QPaintEvent*)
 
 const QMetaObject QAxWidget::staticMetaObject = {
     { &QWidget::staticMetaObject, qt_meta_stringdata_QAxBase.data,
-      qt_meta_data_QAxBase, qt_static_metacall, 0, 0 }
+      qt_meta_data_QAxBase, qt_static_metacall, nullptr, nullptr }
 };
 
 /*!
@@ -2041,7 +2041,7 @@ bool QAxWidget::createHostWindow(bool initialized, const QByteArray &data)
 */
 QAxAggregated *QAxWidget::createAggregate()
 {
-    return 0;
+    return nullptr;
 }
 
 /*!
@@ -2072,7 +2072,7 @@ void QAxWidget::clear()
         container->releaseAll();
         container->Release();
     }
-    container = 0;
+    container = nullptr;
 }
 
 /*!
diff --git a/src/activeqt/control/qaxbindable.cpp b/src/activeqt/control/qaxbindable.cpp
index 20e8b7c..f74122d 100644
--- a/src/activeqt/control/qaxbindable.cpp
+++ b/src/activeqt/control/qaxbindable.cpp
@@ -149,7 +149,7 @@ void QAxBindable::propertyChanged(const char *property)
 IUnknown *QAxBindable::clientSite() const
 {
     if (!activex)
-        return 0;
+        return nullptr;
 
     return activex->clientSite();
 }
@@ -164,7 +164,7 @@ IUnknown *QAxBindable::clientSite() const
 */
 QAxAggregated *QAxBindable::createAggregate()
 {
-    return 0;
+    return nullptr;
 }
 
 /*!
diff --git a/src/activeqt/control/qaxfactory.cpp b/src/activeqt/control/qaxfactory.cpp
index 76f0a82..2faf508 100644
--- a/src/activeqt/control/qaxfactory.cpp
+++ b/src/activeqt/control/qaxfactory.cpp
@@ -458,7 +458,7 @@ public:
 };
 
 ActiveObject::ActiveObject(QObject *parent, QAxFactory *factory)
-: QObject(parent), wrapper(0), cookie(0)
+: QObject(parent), wrapper(nullptr), cookie(0)
 {
     QLatin1String key(parent->metaObject()->className());
 
@@ -470,7 +470,7 @@ ActiveObject::ActiveObject(QObject *parent, QAxFactory *factory)
 ActiveObject::~ActiveObject()
 {
     if (cookie)
-        RevokeActiveObject(cookie, 0);
+        RevokeActiveObject(cookie, nullptr);
     if (wrapper)
         wrapper->Release();
 }
diff --git a/src/activeqt/control/qaxserver.cpp b/src/activeqt/control/qaxserver.cpp
index 8ae62a2..7f03ac1 100644
--- a/src/activeqt/control/qaxserver.cpp
+++ b/src/activeqt/control/qaxserver.cpp
@@ -74,13 +74,13 @@ QT_BEGIN_NAMESPACE
 
 // Some global variables to store module information
 bool qAxIsServer = false;
-HANDLE qAxInstance = 0;
-ITypeLib *qAxTypeLibrary = 0;
+HANDLE qAxInstance = nullptr;
+ITypeLib *qAxTypeLibrary = nullptr;
 wchar_t qAxModuleFilename[MAX_PATH];
 bool qAxOutProcServer = false;
 
 // The QAxFactory instance
-static QAxFactory* qax_factory = 0;
+static QAxFactory* qax_factory = nullptr;
 extern CLSID CLSID_QRect;
 extern CLSID CLSID_QSize;
 extern CLSID CLSID_QPoint;
@@ -93,7 +93,7 @@ extern QAxFactory *qax_instantiate();
 QAxFactory *qAxFactory()
 {
     if (!qax_factory) {
-        bool hadQApp = qApp != 0;
+        bool hadQApp = qApp != nullptr;
         qax_factory = qax_instantiate();
         // QAxFactory created a QApplication
         if (!hadQApp && qApp)
@@ -163,11 +163,11 @@ void qAxCleanup()
         return;
 
     delete qax_factory;
-    qax_factory = 0;
+    qax_factory = nullptr;
 
     if (qAxTypeLibrary) {
         qAxTypeLibrary->Release();
-        qAxTypeLibrary = 0;
+        qAxTypeLibrary = nullptr;
     }
 
     DeleteCriticalSection(&qAxModuleSection);
@@ -236,7 +236,7 @@ HRESULT UpdateRegistry(BOOL bRegister)
 
     const QString libFile = qAxInit();
 
-    TLIBATTR *libAttr = 0;
+    TLIBATTR *libAttr = nullptr;
     if (qAxTypeLibrary)
         qAxTypeLibrary->GetLibAttr(&libAttr);
     if (!libAttr)
@@ -244,10 +244,10 @@ HRESULT UpdateRegistry(BOOL bRegister)
     bool userFallback = false;
     if (bRegister) {
         if (RegisterTypeLib(qAxTypeLibrary,
-                            reinterpret_cast<wchar_t *>(const_cast<ushort *>(libFile.utf16())), 0) == TYPE_E_REGISTRYACCESS) {
+                            reinterpret_cast<wchar_t *>(const_cast<ushort *>(libFile.utf16())), nullptr) == TYPE_E_REGISTRYACCESS) {
 #ifndef Q_CC_MINGW
             // MinGW does not have RegisterTypeLibForUser() implemented so we cannot fallback in this case
-            RegisterTypeLibForUser(qAxTypeLibrary, reinterpret_cast<wchar_t *>(const_cast<ushort *>(libFile.utf16())), 0);
+            RegisterTypeLibForUser(qAxTypeLibrary, reinterpret_cast<wchar_t *>(const_cast<ushort *>(libFile.utf16())), nullptr);
             userFallback = true;
 #endif
         }
@@ -278,7 +278,7 @@ HRESULT UpdateRegistry(BOOL bRegister)
     bool delete_qApp = false;
     if (!qApp) {
         static int argc = 0; // static lifetime, since it's passed as reference to QApplication, which has a lifetime exceeding the stack frame
-        (void)new QApplication(argc, 0);
+        (void)new QApplication(argc, nullptr);
         delete_qApp = true;
     }
 
@@ -542,7 +542,7 @@ static const char* const type_map[][2] =
     { "IUnknown",       "IUnknown*" },
     { "IDispatch*",     "IDispatch*" },
     { "IUnknown*",      "IUnknown*" },
-    { 0,                0 }
+    { nullptr,                nullptr }
 };
 
 static QByteArray convertTypes(const QByteArray &qtype, bool *ok)
@@ -614,7 +614,7 @@ static const char* const keyword_map[][2] =
     { "source",         "source_"           },
     { "string",         "string_"           },
     { "uuid",           "uuid_"             },
-    { 0,                0                   }
+    { nullptr,                nullptr                   }
 };
 
 static QByteArray replaceKeyword(const QByteArray &name)
@@ -684,7 +684,7 @@ static const char* const ignore_props[] =
     "customWhatsThis",
     "shown",
     "windowOpacity",
-    0
+    nullptr
 };
 
 // filter out some slots
@@ -707,7 +707,7 @@ static const char* const ignore_slots[] =
     "move_1",
     "resize_1",
     "setGeometry_1",
-    0
+    nullptr
 };
 
 static bool ignore(const char *test, const char *const *table)
@@ -1174,7 +1174,7 @@ extern "C" HRESULT __stdcall DumpIDL(const QString &outfile, const QString &ver)
     bool delete_qApp = false;
     if (!qApp) {
         static int argc = 0; // static lifetime, since it's passed as reference to QApplication, which has a lifetime exceeding the stack frame
-        (void)new QApplication(argc, 0);
+        (void)new QApplication(argc, nullptr);
         delete_qApp = true;
     }
 
@@ -1257,7 +1257,7 @@ extern "C" HRESULT __stdcall DumpIDL(const QString &outfile, const QString &ver)
             QObject *o = qAxFactory()->createObject(className);
             // It's not a control class, so it is actually a subtype. Define it.
             if (!o)
-                res = classIDL(0, mo, className, false, out);
+                res = classIDL(nullptr, mo, className, false, out);
             delete o;
         }
     }
@@ -1272,7 +1272,7 @@ extern "C" HRESULT __stdcall DumpIDL(const QString &outfile, const QString &ver)
             continue;
         const QMetaObject *mo = o->metaObject();
         QAxBindable *bind = static_cast<QAxBindable *>(o->qt_metacast("QAxBindable"));
-        bool isBindable =  bind != 0;
+        bool isBindable =  bind != nullptr;
 
         const QByteArray cleanType = qax_clean_type(className, mo).toLatin1();
         subtypes.append(cleanType);
diff --git a/src/activeqt/control/qaxserverbase.cpp b/src/activeqt/control/qaxserverbase.cpp
index 6dd1234..9e873c5 100644
--- a/src/activeqt/control/qaxserverbase.cpp
+++ b/src/activeqt/control/qaxserverbase.cpp
@@ -179,7 +179,7 @@ public:
 
 // Window creation
     HWND create(HWND hWndParent, RECT& rcPos);
-    HMENU createPopup(QMenu *popup, HMENU oldMenu = 0);
+    HMENU createPopup(QMenu *popup, HMENU oldMenu = nullptr);
     void createMenu(QMenuBar *menuBar);
     void removeMenu();
 
@@ -480,7 +480,7 @@ public:
     }
     HRESULT WINAPI QueryInterface(REFIID iid, void **iface) override
     {
-        *iface = 0;
+        *iface = nullptr;
 
         if (iid == IID_IUnknown) {
             *iface = static_cast<IUnknown *>(this);
@@ -500,7 +500,7 @@ private:
 
 bool QAxFactory::createObjectWrapper(QObject *object, IDispatch **wrapper)
 {
-    *wrapper = 0;
+    *wrapper = nullptr;
     QAxServerBase *obj = new QAxServerBase(object);
     obj->QueryInterface(IID_IDispatch, reinterpret_cast<void **>(wrapper));
     if (*wrapper)
@@ -564,7 +564,7 @@ public:
     {
         if (!iface)
             return E_POINTER;
-        *iface = 0;
+        *iface = nullptr;
         if (iid == IID_IUnknown)
             *iface = this;
         else if (iid == IID_IEnumConnectionPoints)
@@ -683,7 +683,7 @@ public:
     {
         if (!iface)
             return E_POINTER;
-        *iface = 0;
+        *iface = nullptr;
         if (iid == IID_IUnknown)
             *iface = static_cast<IConnectionPoint *>(this);
         else if (iid == IID_IConnectionPoint)
@@ -713,7 +713,7 @@ public:
             return E_POINTER;
 
         {
-            IDispatch *checkImpl = 0;
+            IDispatch *checkImpl = nullptr;
             pUnk->QueryInterface(iid, reinterpret_cast<void **>(&checkImpl));
             if (!checkImpl)
                 return CONNECT_E_CANNOTCONNECT;
@@ -847,7 +847,7 @@ bool QAxWinEventFilter::nativeEventFilter(const QByteArray &, void *message, lon
 
     // FIXME: 4.10.211: was '::GetParent(hwndForWidget(aqt));'
     HWND baseHwnd = hwndForWidget(aqt);
-    QAxServerBase *axbase = 0;
+    QAxServerBase *axbase = nullptr;
     while (!axbase && baseHwnd) {
         axbase = axServerBaseFromWindow(baseHwnd);
         baseHwnd = ::GetParent(baseHwnd);
@@ -905,7 +905,7 @@ unsigned long QClassFactory::Release()
 
 HRESULT QClassFactory::QueryInterface(REFIID iid, LPVOID *iface)
 {
-    *iface = 0;
+    *iface = nullptr;
     if (iid == IID_IUnknown)
         *iface = static_cast<IUnknown *>(this);
     else if (iid == IID_IClassFactory)
@@ -933,7 +933,7 @@ HRESULT QClassFactory::CreateInstanceHelper(IUnknown *pUnkOuter, REFIID iid, voi
     if (!qApp) {
         qax_ownQApp = true;
         static int argc = 0; // static lifetime, since it's passed as reference to QApplication, which has a lifetime exceeding the stack frame
-        new QApplication(argc, 0);
+        new QApplication(argc, nullptr);
     }
     QGuiApplication::setQuitOnLastWindowClosed(false);
 
@@ -944,7 +944,7 @@ HRESULT QClassFactory::CreateInstanceHelper(IUnknown *pUnkOuter, REFIID iid, voi
 
     // hook into eventloop; this allows a server to create his own QApplication object
     if (!qax_hhook && qax_ownQApp) {
-        qax_hhook = SetWindowsHookEx(WH_GETMESSAGE, axs_FilterProc, 0, GetCurrentThreadId());
+        qax_hhook = SetWindowsHookEx(WH_GETMESSAGE, axs_FilterProc, nullptr, GetCurrentThreadId());
     }
 
     // If we created QApplication instance, ensure native event loop starts properly
@@ -995,7 +995,7 @@ HRESULT QClassFactory::RequestLicKey(DWORD, BSTR *pKey)
 {
     if (!pKey)
         return E_POINTER;
-    *pKey = 0;
+    *pKey = nullptr;
 
     // This of course works only on fully licensed machines
     if (!qAxFactory()->validateLicenseKey(className, QString()))
@@ -1091,7 +1091,7 @@ QAxServerBase::QAxServerBase(QObject *o)
 */
 void QAxServerBase::init()
 {
-    qt.object = 0;
+    qt.object = nullptr;
     isWidget            = false;
     ownObject           = false;
     initNewCalled       = false;
@@ -1136,31 +1136,31 @@ QAxServerBase::~QAxServerBase()
             point->Release();
     }
     delete aggregatedObject;
-    aggregatedObject = 0;
+    aggregatedObject = nullptr;
     if (theObject) {
         qt.object->disconnect(this);
         QObject *aqt = qt.object;
-        qt.object = 0;
+        qt.object = nullptr;
         if (ownObject)
             delete aqt;
     }
 
     if (m_spAdviseSink) m_spAdviseSink->Release();
-    m_spAdviseSink = 0;
+    m_spAdviseSink = nullptr;
     for (int i = 0; i < adviseSinks.count(); ++i) {
         adviseSinks.at(i).pAdvSink->Release();
     }
     if (m_spClientSite) m_spClientSite->Release();
-    m_spClientSite = 0;
+    m_spClientSite = nullptr;
     if (m_spInPlaceFrame) m_spInPlaceFrame->Release();
-    m_spInPlaceFrame = 0;
+    m_spInPlaceFrame = nullptr;
     if (m_spInPlaceSiteWindowless)
         m_spInPlaceSiteWindowless->Release();
-    m_spInPlaceSiteWindowless = 0;
+    m_spInPlaceSiteWindowless = nullptr;
     if (m_spInPlaceSite) m_spInPlaceSite->Release();
-    m_spInPlaceSite = 0;
+    m_spInPlaceSite = nullptr;
     if (m_spTypeInfo) m_spTypeInfo->Release();
-    m_spTypeInfo = 0;
+    m_spTypeInfo = nullptr;
     if (m_spStorage) m_spStorage->Release();
     m_spStorage = 0;
 
@@ -1188,7 +1188,7 @@ void QAxServerBase::revokeActiveObject()
     if (!ole_ref)
         return;
 
-    RevokeActiveObject(ole_ref, 0);
+    RevokeActiveObject(ole_ref, nullptr);
     ole_ref = 0;
 }
 
@@ -1205,7 +1205,7 @@ HRESULT WINAPI QAxServerBase::QueryInterface(REFIID iid, void **iface)
 
 HRESULT QAxServerBase::InternalQueryInterface(REFIID iid, void **iface)
 {
-    *iface = 0;
+    *iface = nullptr;
 
     if (iid == IID_IUnknown) {
         *iface = static_cast<IUnknown *>(static_cast<IDispatch *>(this));
@@ -1404,7 +1404,7 @@ LRESULT QT_WIN_CALLBACK QAxServerBase::ActiveXProc(HWND hWnd, UINT uMsg, WPARAM
     switch (uMsg) {
     case WM_NCDESTROY:
         if (QAxServerBase *that = axServerBaseFromWindow(hWnd))
-            that->m_hWnd = 0;
+            that->m_hWnd = nullptr;
         break;
 
     case WM_QUERYENDSESSION:
@@ -1414,7 +1414,7 @@ LRESULT QT_WIN_CALLBACK QAxServerBase::ActiveXProc(HWND hWnd, UINT uMsg, WPARAM
                 that->qt.widget->hide();
                 if (QWindow *widgetWindow = that->qt.widget->windowHandle()) {
                     if (HWND h = reinterpret_cast<HWND>(widgetWindow->winId()))
-                        ::SetParent(h, 0);
+                        ::SetParent(h, nullptr);
                 }
             }
         }
@@ -1474,9 +1474,9 @@ LRESULT QT_WIN_CALLBACK QAxServerBase::ActiveXProc(HWND hWnd, UINT uMsg, WPARAM
         if (QAxServerBase *that = axServerBaseFromWindow(hWnd)) {
             if (that->isInPlaceActive && that->m_spClientSite && !that->inDesignMode && that->canTakeFocus) {
                 RECT rcPos = that->rcPosRect();
-                that->DoVerb(OLEIVERB_UIACTIVATE, NULL, that->m_spClientSite, 0, that->m_hWnd, &rcPos);
+                that->DoVerb(OLEIVERB_UIACTIVATE, nullptr, that->m_spClientSite, 0, that->m_hWnd, &rcPos);
                 if (that->isUIActive) {
-                    IOleControlSite *spSite = 0;
+                    IOleControlSite *spSite = nullptr;
                     that->m_spClientSite->QueryInterface(IID_IOleControlSite, reinterpret_cast<void **>(&spSite));
                     if (spSite) {
                         spSite->OnFocus(true);
@@ -1486,7 +1486,7 @@ LRESULT QT_WIN_CALLBACK QAxServerBase::ActiveXProc(HWND hWnd, UINT uMsg, WPARAM
                     while (!(candidate->focusPolicy() & Qt::TabFocus)) {
                         candidate = candidate->nextInFocusChain();
                         if (candidate == that->qt.widget) {
-                            candidate = 0;
+                            candidate = nullptr;
                             break;
                         }
                     }
@@ -1503,7 +1503,7 @@ LRESULT QT_WIN_CALLBACK QAxServerBase::ActiveXProc(HWND hWnd, UINT uMsg, WPARAM
     case WM_KILLFOCUS:
         if (QAxServerBase *that = axServerBaseFromWindow(hWnd)) {
             if (that->isInPlaceActive && that->isUIActive && that->m_spClientSite) {
-                IOleControlSite *spSite = 0;
+                IOleControlSite *spSite = nullptr;
                 that->m_spClientSite->QueryInterface(IID_IOleControlSite, reinterpret_cast<void **>(&spSite));
                 if (spSite) {
                     if (!::IsChild(that->m_hWnd, ::GetFocus()))
@@ -1517,7 +1517,7 @@ LRESULT QT_WIN_CALLBACK QAxServerBase::ActiveXProc(HWND hWnd, UINT uMsg, WPARAM
     case WM_MOUSEACTIVATE:
         if (QAxServerBase *that = axServerBaseFromWindow(hWnd)) {
             RECT rcPos = that->rcPosRect();
-            that->DoVerb(OLEIVERB_UIACTIVATE, NULL, that->m_spClientSite, 0, that->m_hWnd, &rcPos);
+            that->DoVerb(OLEIVERB_UIACTIVATE, nullptr, that->m_spClientSite, 0, that->m_hWnd, &rcPos);
         }
         break;
 
@@ -1532,7 +1532,7 @@ LRESULT QT_WIN_CALLBACK QAxServerBase::ActiveXProc(HWND hWnd, UINT uMsg, WPARAM
                 if (index < 0)
                     break;
 
-                that->currentPopup->qt_metacall(QMetaObject::InvokeMetaMethod, index, 0);
+                that->currentPopup->qt_metacall(QMetaObject::InvokeMetaMethod, index, nullptr);
                 that->createPopup(that->currentPopup, reinterpret_cast<HMENU>(wParam));
                 return 0;
             }
@@ -1547,7 +1547,7 @@ LRESULT QT_WIN_CALLBACK QAxServerBase::ActiveXProc(HWND hWnd, UINT uMsg, WPARAM
                 if (!menuBar)
                     break;
 
-                QObject *menuObject = 0;
+                QObject *menuObject = nullptr;
                 bool menuClosed = false;
 
                 if (uMsg == WM_COMMAND) {
@@ -1573,9 +1573,9 @@ LRESULT QT_WIN_CALLBACK QAxServerBase::ActiveXProc(HWND hWnd, UINT uMsg, WPARAM
                     if (index < 0)
                         break;
 
-                    menuObject->qt_metacall(QMetaObject::InvokeMetaMethod, index, 0);
+                    menuObject->qt_metacall(QMetaObject::InvokeMetaMethod, index, nullptr);
                     if (menuClosed || uMsg == WM_COMMAND)
-                        that->currentPopup = 0;
+                        that->currentPopup = nullptr;
                     return 0;
                 }
             }
@@ -1609,12 +1609,12 @@ HWND QAxServerBase::create(HWND hWndParent, RECT& rcPos)
         wcTemp.style = CS_DBLCLKS;
         wcTemp.cbClsExtra = 0;
         wcTemp.cbWndExtra = 0;
-        wcTemp.hbrBackground = 0;
-        wcTemp.hCursor = 0;
-        wcTemp.hIcon = 0;
+        wcTemp.hbrBackground = nullptr;
+        wcTemp.hCursor = nullptr;
+        wcTemp.hIcon = nullptr;
         wcTemp.hInstance = hInst;
         wcTemp.lpszClassName = reinterpret_cast<const wchar_t *>(cn.utf16());
-        wcTemp.lpszMenuName = 0;
+        wcTemp.lpszMenuName = nullptr;
         wcTemp.lpfnWndProc = ActiveXProc;
 
         atom = RegisterClass(&wcTemp);
@@ -1630,20 +1630,20 @@ HWND QAxServerBase::create(HWND hWndParent, RECT& rcPos)
 
     Q_ASSERT(!m_hWnd);
     // will fail if parent window belongs to a higher integrity level process
-    HWND hWnd = ::CreateWindow(reinterpret_cast<const wchar_t *>(cn.utf16()), 0,
+    HWND hWnd = ::CreateWindow(reinterpret_cast<const wchar_t *>(cn.utf16()), nullptr,
                                WS_CHILD | WS_CLIPCHILDREN | WS_CLIPSIBLINGS,
                                rcPos.left, rcPos.top, rcPos.right - rcPos.left,
-                               rcPos.bottom - rcPos.top, hWndParent, 0, hInst, this);
+                               rcPos.bottom - rcPos.top, hWndParent, nullptr, hInst, this);
     // m_hWnd is assigned in reponse to WM_CREATE
     if (!hWnd) {
         DWORD err = GetLastError();
         if (err == ERROR_ACCESS_DENIED) {
             // retry without parent window
             // the window will now need to be re-parented in the container process
-            hWnd = ::CreateWindow(reinterpret_cast<const wchar_t *>(cn.utf16()), 0,
+            hWnd = ::CreateWindow(reinterpret_cast<const wchar_t *>(cn.utf16()), nullptr,
                                   WS_CLIPCHILDREN | WS_CLIPSIBLINGS,
                                   rcPos.left, rcPos.top, rcPos.right - rcPos.left,
-                                  rcPos.bottom - rcPos.top, nullptr, 0, hInst, this);
+                                  rcPos.bottom - rcPos.top, nullptr, nullptr, hInst, this);
         }
     }
 
@@ -1749,7 +1749,7 @@ void QAxServerBase::createMenu(QMenuBar *menuBar)
     HRESULT hres = m_spInPlaceFrame->InsertMenus(hmenuShared, &menuWidths);
     if (FAILED(hres)) {
         ::DestroyMenu(hmenuShared);
-        hmenuShared = 0;
+        hmenuShared = nullptr;
         return;
     }
 
@@ -1759,7 +1759,7 @@ void QAxServerBase::createMenu(QMenuBar *menuBar)
     hres = m_spInPlaceFrame->SetMenu(hmenuShared, holemenu, m_hWnd);
     if (FAILED(hres)) {
         ::DestroyMenu(hmenuShared);
-        hmenuShared = 0;
+        hmenuShared = nullptr;
         OleDestroyMenuDescriptor(holemenu);
     }
 }
@@ -1771,14 +1771,14 @@ void QAxServerBase::removeMenu()
 {
     if (hmenuShared)
         m_spInPlaceFrame->RemoveMenus(hmenuShared);
-    holemenu = 0;
-    m_spInPlaceFrame->SetMenu(0, 0, m_hWnd);
+    holemenu = nullptr;
+    m_spInPlaceFrame->SetMenu(nullptr, nullptr, m_hWnd);
     if (hmenuShared) {
         DestroyMenu(hmenuShared);
-        hmenuShared = 0;
+        hmenuShared = nullptr;
         menuMap.clear();
     }
-    hwndMenuOwner = 0;
+    hwndMenuOwner = nullptr;
 }
 
 extern bool ignoreSlots(const char *test);
@@ -1833,9 +1833,9 @@ void QAxServerBase::update()
 {
     if (isInPlaceActive) {
         if (m_hWnd)
-            ::InvalidateRect(m_hWnd, 0, true);
+            ::InvalidateRect(m_hWnd, nullptr, true);
         else if (m_spInPlaceSiteWindowless)
-            m_spInPlaceSiteWindowless->InvalidateRect(NULL, true);
+            m_spInPlaceSiteWindowless->InvalidateRect(nullptr, true);
     } else if (m_spAdviseSink) {
         m_spAdviseSink->OnViewChange(DVASPECT_CONTENT, -1);
         for (int i = 0; i < adviseSinks.count(); ++i) {
@@ -1917,7 +1917,7 @@ void QAxServerBase::updateMask()
 
     // Since SetWindowRegion takes ownership
     HRGN wr = CreateRectRgn(0,0,0,0);
-    CombineRgn(wr, hrgn, 0, RGN_COPY);
+    CombineRgn(wr, hrgn, nullptr, RGN_COPY);
     SetWindowRgn(m_hWnd, wr, true);
     DeleteObject(hrgn);
 }
@@ -2004,7 +2004,7 @@ int QAxServerBase::qt_metacall(QMetaObject::Call call, int index, void **argv)
 
             eventId = signalCache.value(index, -1);
             if (eventId == -1) {
-                ITypeInfo *eventInfo = 0;
+                ITypeInfo *eventInfo = nullptr;
                 qAxTypeLibrary->GetTypeInfoOfGuid(qAxFactory()->eventsID(class_name), &eventInfo);
                 if (eventInfo) {
                     QString uni_name = QLatin1String(name);
@@ -2032,11 +2032,11 @@ int QAxServerBase::qt_metacall(QMetaObject::Call call, int index, void **argv)
         return false;
 
     // For all connected event sinks...
-    IConnectionPoint *cpoint = 0;
+    IConnectionPoint *cpoint = nullptr;
     GUID IID_QAxEvents = qAxFactory()->eventsID(class_name);
     FindConnectionPoint(IID_QAxEvents, &cpoint);
     if (cpoint) {
-        IEnumConnections *clist = 0;
+        IEnumConnections *clist = nullptr;
         cpoint->EnumConnections(&clist);
         if (clist) {
             clist->Reset();
@@ -2049,8 +2049,8 @@ int QAxServerBase::qt_metacall(QMetaObject::Call call, int index, void **argv)
                 DISPPARAMS dispParams;
                 dispParams.cArgs = UINT(pcount);
                 dispParams.cNamedArgs = 0;
-                dispParams.rgdispidNamedArgs = 0;
-                dispParams.rgvarg = 0;
+                dispParams.rgdispidNamedArgs = nullptr;
+                dispParams.rgvarg = nullptr;
 
                 if (pcount) // Use malloc/free for eval package compatibility
                     dispParams.rgvarg = static_cast<VARIANTARG *>(malloc(size_t(pcount) * sizeof(VARIANTARG)));
@@ -2085,17 +2085,17 @@ int QAxServerBase::qt_metacall(QMetaObject::Call call, int index, void **argv)
 
                 VARIANT retval;
                 VariantInit(&retval);
-                VARIANT *pretval = 0;
+                VARIANT *pretval = nullptr;
                 if (!type.isEmpty() && type != "void")
                     pretval = &retval;
 
                 // call listeners (through IDispatch)
                 while (cc) {
                     if (c->pUnk) {
-                        IDispatch *disp = 0;
+                        IDispatch *disp = nullptr;
                         c->pUnk->QueryInterface(IID_QAxEvents, reinterpret_cast<void **>(&disp));
                         if (disp) {
-                            disp->Invoke(eventId, IID_NULL, LOCALE_USER_DEFAULT, DISPATCH_METHOD, &dispParams, pretval, 0, &argErr);
+                            disp->Invoke(eventId, IID_NULL, LOCALE_USER_DEFAULT, DISPATCH_METHOD, &dispParams, pretval, nullptr, &argErr);
 
                             // update out-parameters and return value
                             if (index > 0) {
@@ -2136,10 +2136,10 @@ bool QAxServerBase::emitRequestPropertyChange(const char *property)
 {
     long dispId = -1;
 
-    IConnectionPoint *cpoint = 0;
+    IConnectionPoint *cpoint = nullptr;
     FindConnectionPoint(IID_IPropertyNotifySink, &cpoint);
     if (cpoint) {
-        IEnumConnections *clist = 0;
+        IEnumConnections *clist = nullptr;
         cpoint->EnumConnections(&clist);
         if (clist) {
             clist->Reset();
@@ -2154,7 +2154,7 @@ bool QAxServerBase::emitRequestPropertyChange(const char *property)
                 }
                 if (dispId != -1) while (cc) {
                     if (c->pUnk) {
-                        IPropertyNotifySink *sink = 0;
+                        IPropertyNotifySink *sink = nullptr;
                         c->pUnk->QueryInterface(IID_IPropertyNotifySink, reinterpret_cast<void **>(&sink));
                         bool disallows = sink && sink->OnRequestEdit(dispId) == S_FALSE;
                         sink->Release();
@@ -2184,10 +2184,10 @@ void QAxServerBase::emitPropertyChanged(const char *property)
 {
     long dispId = -1;
 
-    IConnectionPoint *cpoint = 0;
+    IConnectionPoint *cpoint = nullptr;
     FindConnectionPoint(IID_IPropertyNotifySink, &cpoint);
     if (cpoint) {
-        IEnumConnections *clist = 0;
+        IEnumConnections *clist = nullptr;
         cpoint->EnumConnections(&clist);
         if (clist) {
             clist->Reset();
@@ -2202,7 +2202,7 @@ void QAxServerBase::emitPropertyChanged(const char *property)
                 }
                 if (dispId != -1) while (cc) {
                     if (c->pUnk) {
-                        IPropertyNotifySink *sink = 0;
+                        IPropertyNotifySink *sink = nullptr;
                         c->pUnk->QueryInterface(IID_IPropertyNotifySink, reinterpret_cast<void **>(&sink));
                         if (sink) {
                             sink->OnChanged(dispId);
@@ -2471,9 +2471,9 @@ HRESULT WINAPI QAxServerBase::Invoke(DISPID dispidMember, REFIID riid,
             if (!type.isEmpty())
                 ++totalParam;
 
-            void **argv = 0; // the actual array passed into qt_metacall
-            void **argv_pointer = 0; // in case we need an additional level of indirection
-            QVariant *varp = 0; // QVariants to hold the temporary Qt data object for us
+            void **argv = nullptr; // the actual array passed into qt_metacall
+            void **argv_pointer = nullptr; // in case we need an additional level of indirection
+            QVariant *varp = nullptr; // QVariants to hold the temporary Qt data object for us
 
             if (totalParam) {
                 if (totalParam <= QAX_NUM_PARAMS) {
@@ -2486,7 +2486,7 @@ HRESULT WINAPI QAxServerBase::Invoke(DISPID dispidMember, REFIID riid,
                     varp = new QVariant[pcount + 1];
                 }
 
-                argv_pointer[0] = 0;
+                argv_pointer[0] = nullptr;
             }
 
             for (UINT p = 0; p < pcount; ++p) {
@@ -2494,7 +2494,7 @@ HRESULT WINAPI QAxServerBase::Invoke(DISPID dispidMember, REFIID riid,
                 bool out;
                 QByteArray ptype = paramType(ptypes.at(int(p)), &out);
                 varp[p + 1] = VARIANTToQVariant(pDispParams->rgvarg[pcount - p - 1], ptype);
-                argv_pointer[p + 1] = 0;
+                argv_pointer[p + 1] = nullptr;
                 if (varp[p + 1].isValid()) {
                     if (varp[p + 1].type() == QVariant::UserType) {
                         argv[p + 1] = varp[p + 1].data();
@@ -2622,15 +2622,15 @@ HRESULT WINAPI QAxServerBase::Invoke(DISPID dispidMember, REFIID riid,
         if (m_spAdviseSink || adviseSinks.count()) {
             FORMATETC fmt;
             fmt.cfFormat = 0;
-            fmt.ptd = 0;
+            fmt.ptd = nullptr;
             fmt.dwAspect = DVASPECT_CONTENT;
             fmt.lindex = -1;
             fmt.tymed = TYMED_NULL;
 
             STGMEDIUM stg;
             stg.tymed = TYMED_NULL;
-            stg.pUnkForRelease = 0;
-            stg.hBitmap = 0; // initializes the whole union
+            stg.pUnkForRelease = nullptr;
+            stg.hBitmap = nullptr; // initializes the whole union
 
             if (m_spAdviseSink) {
                 m_spAdviseSink->OnViewChange(DVASPECT_CONTENT, -1);
@@ -2672,7 +2672,7 @@ HRESULT WINAPI QAxServerBase::Invoke(DISPID dispidMember, REFIID riid,
             }
         }
         delete exception;
-        exception = 0;
+        exception = nullptr;
         return DISP_E_EXCEPTION;
     } else if (isWidget) {
         if (oldSizeHint != qt.widget->sizeHint()) {
@@ -2880,7 +2880,7 @@ HRESULT WINAPI QAxServerBase::Load(IStorage *pStg)
     if (InitNew(pStg) != S_OK)
         return CO_E_ALREADYINITIALIZED;
 
-    IStream *spStream = 0;
+    IStream *spStream = nullptr;
     QString streamName = QLatin1String(qt.object->metaObject()->className());
     streamName.replace(QLatin1Char(':'), QLatin1Char('.'));
     /* Also invalid, but not relevant
@@ -2889,9 +2889,9 @@ HRESULT WINAPI QAxServerBase::Load(IStorage *pStg)
     */
     streamName += QLatin1String("_Stream4.2");
 
-    pStg->OpenStream(reinterpret_cast<const wchar_t *>(streamName.utf16()), 0, STGM_READ | STGM_SHARE_EXCLUSIVE, 0, &spStream);
+    pStg->OpenStream(reinterpret_cast<const wchar_t *>(streamName.utf16()), nullptr, STGM_READ | STGM_SHARE_EXCLUSIVE, 0, &spStream);
     if (!spStream) // support for streams saved with 4.1 and earlier
-        pStg->OpenStream(L"SomeStreamName", 0, STGM_READ | STGM_SHARE_EXCLUSIVE, 0, &spStream);
+        pStg->OpenStream(L"SomeStreamName", nullptr, STGM_READ | STGM_SHARE_EXCLUSIVE, 0, &spStream);
     if (!spStream)
         return E_FAIL;
 
@@ -2903,7 +2903,7 @@ HRESULT WINAPI QAxServerBase::Load(IStorage *pStg)
 
 HRESULT WINAPI QAxServerBase::Save(IStorage *pStg, BOOL /* fSameAsLoad */)
 {
-    IStream *spStream = 0;
+    IStream *spStream = nullptr;
     QString streamName = QLatin1String(qt.object->metaObject()->className());
     streamName.replace(QLatin1Char(':'), QLatin1Char('.'));
     /* Also invalid, but not relevant
@@ -2936,7 +2936,7 @@ HRESULT WINAPI QAxServerBase::SaveCompleted(IStorage *pStgNew)
 HRESULT WINAPI QAxServerBase::HandsOffStorage()
 {
     if (m_spStorage) m_spStorage->Release();
-    m_spStorage = 0;
+    m_spStorage = nullptr;
 
     return S_OK;
 }
@@ -2976,7 +2976,7 @@ HRESULT WINAPI QAxServerBase::Load(IPropertyBag *bag, IErrorLog * /*log*/)
         BSTR bstr = QStringToBSTR(QLatin1String(pname));
         VARIANT var;
         var.vt = VT_EMPTY;
-        HRESULT res = bag->Read(bstr, &var, 0);
+        HRESULT res = bag->Read(bstr, &var, nullptr);
         if (property.isWritable() && var.vt != VT_EMPTY) {
             if (res != S_OK || !qt.object->setProperty(pname, VARIANTToQVariant(var, property.typeName(), property.type())))
                 error = true;
@@ -3040,10 +3040,10 @@ HRESULT WINAPI QAxServerBase::GetCurFile(LPOLESTR *currentFile)
         return E_NOTIMPL;
 
     if (currentFileName.isEmpty()) {
-        *currentFile = 0;
+        *currentFile = nullptr;
         return S_FALSE;
     }
-    IMalloc *malloc = 0;
+    IMalloc *malloc = nullptr;
     CoGetMalloc(1, &malloc);
     if (!malloc)
         return E_OUTOFMEMORY;
@@ -3169,11 +3169,11 @@ HRESULT WINAPI QAxServerBase::Draw(DWORD dwAspect, LONG /* lindex */, void * /*
         return DV_E_DVASPECT;
     }
     if (!ptd)
-        hicTargetDev = 0;
+        hicTargetDev = nullptr;
 
     bool bDeleteDC = false;
     if (!hicTargetDev) {
-        hicTargetDev = ::CreateDC(L"DISPLAY", NULL, NULL, NULL);
+        hicTargetDev = ::CreateDC(L"DISPLAY", nullptr, nullptr, nullptr);
         bDeleteDC = (hicTargetDev != hdcDraw);
     }
 
@@ -3184,7 +3184,7 @@ HRESULT WINAPI QAxServerBase::Draw(DWORD dwAspect, LONG /* lindex */, void * /*
 
     const QPixmap pm = qt.widget->grab();
     HBITMAP hbm = qt_pixmapToWinHBITMAP(pm);
-    HDC hdc = CreateCompatibleDC(0);
+    HDC hdc = CreateCompatibleDC(nullptr);
     SelectObject(hdc, hbm);
     ::StretchBlt(hdcDraw, rc.left, rc.top, rc.right - rc.left, rc.bottom - rc.top, hdc, 0, 0,pm.width(), pm.height(), SRCCOPY);
     DeleteDC(hdc);
@@ -3298,17 +3298,17 @@ HRESULT WINAPI QAxServerBase::OnAmbientPropertyChange(DISPID dispID)
     if (!m_spClientSite || !theObject)
         return S_OK;
 
-    IDispatch *disp = 0;
+    IDispatch *disp = nullptr;
     m_spClientSite->QueryInterface(IID_IDispatch, reinterpret_cast<void **>(&disp));
     if (!disp)
         return S_OK;
 
     VARIANT var;
     VariantInit(&var);
-    DISPPARAMS params = { 0, 0, 0, 0 };
-    disp->Invoke(dispID, IID_NULL, LOCALE_USER_DEFAULT, DISPATCH_PROPERTYGET, &params, &var, 0, 0);
+    DISPPARAMS params = { nullptr, 0, 0, 0 };
+    disp->Invoke(dispID, IID_NULL, LOCALE_USER_DEFAULT, DISPATCH_PROPERTYGET, &params, &var, nullptr, nullptr);
     disp->Release();
-    disp = 0;
+    disp = nullptr;
 
     switch(dispID) {
     case DISPID_AMBIENT_APPEARANCE:
@@ -3429,7 +3429,7 @@ HRESULT WINAPI QAxServerBase::InPlaceDeactivate()
     if (m_hWnd) {
         if (::IsWindow(m_hWnd))
             ::DestroyWindow(m_hWnd);
-        m_hWnd = 0;
+        m_hWnd = nullptr;
     }
 
     if (m_spInPlaceSite)
@@ -3453,32 +3453,32 @@ HRESULT WINAPI QAxServerBase::UIDeactivate()
     HWND hwndParent;
     if (m_spInPlaceSite->GetWindow(&hwndParent) == S_OK) {
         if (m_spInPlaceFrame) m_spInPlaceFrame->Release();
-        m_spInPlaceFrame = 0;
-        IOleInPlaceUIWindow *spInPlaceUIWindow = 0;
+        m_spInPlaceFrame = nullptr;
+        IOleInPlaceUIWindow *spInPlaceUIWindow = nullptr;
         RECT rcPos, rcClip;
         OLEINPLACEFRAMEINFO frameInfo;
         frameInfo.cb = sizeof(OLEINPLACEFRAMEINFO);
 
         m_spInPlaceSite->GetWindowContext(&m_spInPlaceFrame, &spInPlaceUIWindow, &rcPos, &rcClip, &frameInfo);
         if (spInPlaceUIWindow) {
-            spInPlaceUIWindow->SetActiveObject(0, 0);
+            spInPlaceUIWindow->SetActiveObject(nullptr, nullptr);
             spInPlaceUIWindow->Release();
         }
         if (m_spInPlaceFrame) {
             removeMenu();
             if (menuBar) {
                 menuBar->removeEventFilter(this);
-                menuBar = 0;
+                menuBar = nullptr;
             }
             if (statusBar) {
                 statusBar->removeEventFilter(this);
                 const int index = statusBar->metaObject()->indexOfSignal("messageChanged(QString)");
         QMetaObject::disconnect(statusBar, index, this, STATUSBAR_MESSAGE_CHANGED_SLOT_INDEX);
-                statusBar = 0;
+                statusBar = nullptr;
             }
-            m_spInPlaceFrame->SetActiveObject(0, 0);
+            m_spInPlaceFrame->SetActiveObject(0, nullptr);
             m_spInPlaceFrame->Release();
-            m_spInPlaceFrame = 0;
+            m_spInPlaceFrame = nullptr;
         }
     }
     // we don't need to explicitly release the focus here since somebody
@@ -3493,21 +3493,21 @@ HRESULT WINAPI QAxServerBase::UIDeactivate()
 */
 HRESULT WINAPI QAxServerBase::SetObjectRects(LPCRECT prcPos, LPCRECT prcClip)
 {
-    if (prcPos == 0 || prcClip == 0)
+    if (prcPos == 0 || prcClip == nullptr)
         return E_POINTER;
 
     if (m_hWnd) {
         // the container wants us to clip, so figure out if we really need to
         RECT rcIXect;
         BOOL b = IntersectRect(&rcIXect, prcPos, prcClip);
-        HRGN tempRgn = 0;
+        HRGN tempRgn = nullptr;
         if (b && !EqualRect(&rcIXect, prcPos)) {
             OffsetRect(&rcIXect, -(prcPos->left), -(prcPos->top));
             tempRgn = CreateRectRgnIndirect(&rcIXect);
         }
 
         ::SetWindowRgn(m_hWnd, tempRgn, true);
-        ::SetWindowPos(m_hWnd, 0, prcPos->left, prcPos->top,
+        ::SetWindowPos(m_hWnd, nullptr, prcPos->left, prcPos->top,
             prcPos->right - prcPos->left, prcPos->bottom - prcPos->top,
             SWP_NOZORDER | SWP_NOACTIVATE);
     }
@@ -3555,10 +3555,10 @@ HRESULT WINAPI QAxServerBase::TranslateAcceleratorW(MSG *pMsg)
                 if (shift) {
                     if (!curFocus->isWindow()) {
                         QWidget *nextFocus = curFocus->nextInFocusChain();
-                        QWidget *topLevel = 0;
+                        QWidget *topLevel = nullptr;
                         while (nextFocus != curFocus) {
                             if (nextFocus->focusPolicy() & Qt::TabFocus) {
-                                topLevel = 0;
+                                topLevel = nullptr;
                             } else if (nextFocus->isWindow()) {
                                 topLevel = nextFocus;
                             }
@@ -3631,7 +3631,7 @@ HRESULT WINAPI QAxServerBase::TranslateAcceleratorW(MSG *pMsg)
     if (!m_spClientSite)
         return S_FALSE;
 
-    IOleControlSite *controlSite = 0;
+    IOleControlSite *controlSite = nullptr;
     m_spClientSite->QueryInterface(IID_IOleControlSite, reinterpret_cast<void **>(&controlSite));
     if (!controlSite)
         return S_FALSE;
@@ -3747,7 +3747,7 @@ HRESULT WINAPI QAxServerBase::GetMiscStatus(DWORD dwAspect, DWORD *pdwStatus)
 HRESULT WINAPI QAxServerBase::Advise(IAdviseSink* pAdvSink, DWORD* pdwConnection)
 {
     *pdwConnection = DWORD(adviseSinks.count()) + 1;
-    STATDATA data = { {0, 0, DVASPECT_CONTENT, -1, TYMED_NULL} , 0, pAdvSink, *pdwConnection };
+    STATDATA data = { {0, nullptr, DVASPECT_CONTENT, -1, TYMED_NULL} , 0, pAdvSink, *pdwConnection };
     adviseSinks.append(data);
     pAdvSink->AddRef();
     return S_OK;
@@ -3768,16 +3768,16 @@ HRESULT WINAPI QAxServerBase::Close(DWORD dwSaveOption)
     if (m_hWnd) {
         if (IsWindow(m_hWnd))
             DestroyWindow(m_hWnd);
-        m_hWnd = 0;
+        m_hWnd = nullptr;
         if (m_spClientSite)
             m_spClientSite->OnShowWindow(false);
     }
 
     if (m_spInPlaceSiteWindowless)
         m_spInPlaceSiteWindowless->Release();
-    m_spInPlaceSiteWindowless = 0;
+    m_spInPlaceSiteWindowless = nullptr;
     if (m_spInPlaceSite) m_spInPlaceSite->Release();
-    m_spInPlaceSite = 0;
+    m_spInPlaceSite = nullptr;
 
     if (m_spAdviseSink)
         m_spAdviseSink->OnClose();
@@ -3816,12 +3816,12 @@ HRESULT QAxServerBase::internalActivate()
     OnAmbientPropertyChange(DISPID_AMBIENT_USERMODE);
 
     if (isWidget) {
-        IOleInPlaceUIWindow *spInPlaceUIWindow = 0;
+        IOleInPlaceUIWindow *spInPlaceUIWindow = nullptr;
         HWND hwndParent;
         if (m_spInPlaceSite->GetWindow(&hwndParent) == S_OK) {
             // get location in the parent window, as well as some information about the parent
             if (m_spInPlaceFrame) m_spInPlaceFrame->Release();
-            m_spInPlaceFrame = 0;
+            m_spInPlaceFrame = nullptr;
             RECT rcPos, rcClip;
             OLEINPLACEFRAMEINFO frameInfo;
             frameInfo.cb = sizeof(OLEINPLACEFRAMEINFO);
@@ -3854,7 +3854,7 @@ HRESULT QAxServerBase::internalActivate()
             hr = m_spInPlaceSite->OnUIActivate();
             if (FAILED(hr)) {
                 if (m_spInPlaceFrame) m_spInPlaceFrame->Release();
-                    m_spInPlaceFrame = 0;
+                    m_spInPlaceFrame = nullptr;
                 if (spInPlaceUIWindow) spInPlaceUIWindow->Release();
                     return hr;
             }
@@ -3884,7 +3884,7 @@ HRESULT QAxServerBase::internalActivate()
             }
             if (spInPlaceUIWindow) {
                 spInPlaceUIWindow->SetActiveObject(this, reinterpret_cast<const wchar_t *>(class_name.utf16()));
-                spInPlaceUIWindow->SetBorderSpace(0);
+                spInPlaceUIWindow->SetBorderSpace(nullptr);
             }
         }
         if (spInPlaceUIWindow) spInPlaceUIWindow->Release();
@@ -4038,11 +4038,11 @@ HRESULT WINAPI QAxServerBase::SetClientSite(IOleClientSite* pClientSite)
     if (m_spClientSite) m_spClientSite->Release();
     if (m_spInPlaceSiteWindowless)
         m_spInPlaceSiteWindowless->Release();
-    m_spInPlaceSiteWindowless = 0;
+    m_spInPlaceSiteWindowless = nullptr;
     if (m_spInPlaceSite) m_spInPlaceSite->Release();
-    m_spInPlaceSite = 0;
+    m_spInPlaceSite = nullptr;
     if (m_spInPlaceFrame) m_spInPlaceFrame->Release();
-    m_spInPlaceFrame = 0;
+    m_spInPlaceFrame = nullptr;
 
     m_spClientSite = pClientSite;
     if (m_spClientSite) {
@@ -4154,7 +4154,7 @@ HRESULT WINAPI QAxServerBase::GetData(FORMATETC *pformatetcIn, STGMEDIUM *pmediu
 
     // Container wants to draw, but the size is not defined yet - ask container
     if (m_spInPlaceSite && !qt.widget->testAttribute(Qt::WA_Resized)) {
-        IOleInPlaceUIWindow *spInPlaceUIWindow = 0;
+        IOleInPlaceUIWindow *spInPlaceUIWindow = nullptr;
         RECT rcPos, rcClip;
         OLEINPLACEFRAMEINFO frameInfo;
         frameInfo.cb = sizeof(OLEINPLACEFRAMEINFO);
@@ -4172,12 +4172,12 @@ HRESULT WINAPI QAxServerBase::GetData(FORMATETC *pformatetcIn, STGMEDIUM *pmediu
     int height = qt.widget->height();
     RECTL rectl = {0, 0, width, height};
 
-    HDC hdc = CreateMetaFile(0);
+    HDC hdc = CreateMetaFile(nullptr);
     SaveDC(hdc);
-    SetWindowOrgEx(hdc, 0, 0, 0);
-    SetWindowExtEx(hdc, rectl.right, rectl.bottom, 0);
+    SetWindowOrgEx(hdc, 0, 0, nullptr);
+    SetWindowExtEx(hdc, rectl.right, rectl.bottom, nullptr);
 
-    Draw(pformatetcIn->dwAspect, pformatetcIn->lindex, 0, pformatetcIn->ptd, 0, hdc, &rectl, &rectl, 0, 0);
+    Draw(pformatetcIn->dwAspect, pformatetcIn->lindex, nullptr, pformatetcIn->ptd, nullptr, hdc, &rectl, &rectl, nullptr, 0);
 
     RestoreDC(hdc, -1);
     HMETAFILE hMF = CloseMetaFile(hdc);
@@ -4201,7 +4201,7 @@ HRESULT WINAPI QAxServerBase::GetData(FORMATETC *pformatetcIn, STGMEDIUM *pmediu
     memset(pmedium, 0, sizeof(STGMEDIUM));
     pmedium->tymed = TYMED_MFPICT;
     pmedium->hGlobal = hMem;
-    pmedium->pUnkForRelease = 0;
+    pmedium->pUnkForRelease = nullptr;
 
     return S_OK;
 }
@@ -4333,7 +4333,7 @@ bool QAxServerBase::eventFilter(QObject *o, QEvent *e)
             int key = ke->key();
             int state = ke->modifiers();
             void *argv[] = {
-                0,
+                nullptr,
                 &key,
                 &state
             };
@@ -4348,7 +4348,7 @@ bool QAxServerBase::eventFilter(QObject *o, QEvent *e)
             int key = ke->key();
             int state = ke->modifiers();
             void *argv[] = {
-                0,
+                nullptr,
                 &key,
                 &state
             };
@@ -4363,7 +4363,7 @@ bool QAxServerBase::eventFilter(QObject *o, QEvent *e)
             int x = me->x();
             int y = me->y();
             void *argv[] = {
-                0,
+                nullptr,
                 &button,
                 &state,
                 &x,
@@ -4380,19 +4380,19 @@ bool QAxServerBase::eventFilter(QObject *o, QEvent *e)
             int x = me->x();
             int y = me->y();
             void *argv[] = {
-                0,
+                nullptr,
                 &button,
                 &state,
                 &x,
                 &y
             };
             qt_metacall(QMetaObject::InvokeMetaMethod, DISPID_MOUSEUP, argv);
-            qt_metacall(QMetaObject::InvokeMetaMethod, DISPID_CLICK, 0);
+            qt_metacall(QMetaObject::InvokeMetaMethod, DISPID_CLICK, nullptr);
         }
         break;
     case QEvent::MouseButtonDblClick:
         if (o == qt.object && hasStockEvents) {
-            qt_metacall(QMetaObject::InvokeMetaMethod, DISPID_DBLCLICK, 0);
+            qt_metacall(QMetaObject::InvokeMetaMethod, DISPID_DBLCLICK, nullptr);
         }
         break;
     case QEvent::MouseButtonPress:
@@ -4406,7 +4406,7 @@ bool QAxServerBase::eventFilter(QObject *o, QEvent *e)
             int x = me->x();
             int y = me->y();
             void *argv[] = {
-                0,
+                nullptr,
                 &button,
                 &state,
                 &x,
@@ -4445,7 +4445,7 @@ bool QAxServerBase::eventFilter(QObject *o, QEvent *e)
         // Visual Basic 6.0 posts the message WM_USER+3078 from the EnableModeless().
         // While handling this message, VB will disable all current top-levels. After
         // this we have to re-enable the Qt modal widget to receive input events.
-        if (PeekMessage(&msg, 0, WM_USER+3078, WM_USER+3078, PM_REMOVE)) {
+        if (PeekMessage(&msg, nullptr, WM_USER+3078, WM_USER+3078, PM_REMOVE)) {
             TranslateMessage(&msg);
             DispatchMessage(&msg);
             // FIXME: 4.10.2011 Does this work with the parent's HWND?
diff --git a/src/activeqt/control/qaxserverdll.cpp b/src/activeqt/control/qaxserverdll.cpp
index 06fe6b9..20b030c 100644
--- a/src/activeqt/control/qaxserverdll.cpp
+++ b/src/activeqt/control/qaxserverdll.cpp
@@ -60,7 +60,7 @@
 QT_BEGIN_NAMESPACE
 
 bool qax_ownQApp = false;
-HHOOK qax_hhook = 0;
+HHOOK qax_hhook = nullptr;
 
 // in qaxserver.cpp
 extern wchar_t qAxModuleFilename[MAX_PATH];
diff --git a/src/activeqt/control/qaxservermain.cpp b/src/activeqt/control/qaxservermain.cpp
index 5ad97d8..cc217aa 100644
--- a/src/activeqt/control/qaxservermain.cpp
+++ b/src/activeqt/control/qaxservermain.cpp
@@ -59,7 +59,7 @@
 
 QT_BEGIN_NAMESPACE
 
-static DWORD *classRegistration = 0;
+static DWORD *classRegistration = nullptr;
 static DWORD dwThreadID;
 static bool qAxActivity = false;
 static HANDLE hEventShutdown;
@@ -112,12 +112,12 @@ static DWORD WINAPI MonitorProc(void* /* pv */)
 static bool StartMonitor()
 {
     dwThreadID = GetCurrentThreadId();
-    hEventShutdown = CreateEvent(0, false, false, 0);
-    if (hEventShutdown == 0)
+    hEventShutdown = CreateEvent(nullptr, false, false, nullptr);
+    if (hEventShutdown == nullptr)
         return false;
     DWORD dwThreadID;
-    HANDLE h = CreateThread(0, 0, MonitorProc, 0, 0, &dwThreadID);
-    return (h != NULL);
+    HANDLE h = CreateThread(nullptr, 0, MonitorProc, nullptr, 0, &dwThreadID);
+    return (h != nullptr);
 }
 
 void qax_shutDown()
@@ -146,7 +146,7 @@ bool qax_startServer(QAxFactory::ServerType type)
     classRegistration = new DWORD[keyCount];
     int object = 0;
     for (object = 0; object < keyCount; ++object) {
-        IUnknown* p = 0;
+        IUnknown* p = nullptr;
         CLSID clsid = qAxFactory()->classID(keys.at(object));
 
         // Create a QClassFactory (implemented in qaxserverbase.cpp)
@@ -178,7 +178,7 @@ bool qax_stopServer()
         CoRevokeClassObject(classRegistration[object]);
 
     delete []classRegistration;
-    classRegistration = 0;
+    classRegistration = nullptr;
 
     Sleep(dwPause); //wait for any threads to finish
 
@@ -239,7 +239,7 @@ EXTERN_C int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE /* hPrevInstance */,
     QT_USE_NAMESPACE
 
     qAxOutProcServer = true;
-    GetModuleFileName(0, qAxModuleFilename, MAX_PATH);
+    GetModuleFileName(nullptr, qAxModuleFilename, MAX_PATH);
     qAxInstance = hInstance;
 
     const QStringList cmds = commandLineArguments();
@@ -287,7 +287,7 @@ EXTERN_C int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE /* hPrevInstance */,
     }
 
     if (run) {
-        if (SUCCEEDED(CoInitializeEx(0, COINIT_APARTMENTTHREADED))) {
+        if (SUCCEEDED(CoInitializeEx(nullptr, COINIT_APARTMENTTHREADED))) {
 #ifdef Q_CC_MINGW
             // define GlobalOptions class ID locally for MinGW, since it's missing from the distribution
             static const CLSID CLSID_GlobalOptions =
@@ -296,7 +296,7 @@ EXTERN_C int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE /* hPrevInstance */,
             // Disable C++ & SEH exception handling by the COM runtime for out-of-process COM controls.
             // Done to prevent silent crashes and enable crash dump generation.
             IGlobalOptions *globalOptions = nullptr;
-            if (SUCCEEDED(CoCreateInstance(CLSID_GlobalOptions, NULL, CLSCTX_INPROC_SERVER,
+            if (SUCCEEDED(CoCreateInstance(CLSID_GlobalOptions, nullptr, CLSCTX_INPROC_SERVER,
                                            IID_IGlobalOptions, reinterpret_cast<void **>(&globalOptions)))) {
                 globalOptions->Set(COMGLB_EXCEPTION_HANDLING, COMGLB_EXCEPTION_DONOT_HANDLE_ANY);
                 globalOptions->Release();
diff --git a/src/activeqt/shared/qaxtypes.cpp b/src/activeqt/shared/qaxtypes.cpp
index 6146c83..af39652 100644
--- a/src/activeqt/shared/qaxtypes.cpp
+++ b/src/activeqt/shared/qaxtypes.cpp
@@ -103,7 +103,7 @@ static IFontDisp *QFontToIFont(const QFont &font)
     HRESULT res = OleCreateFontIndirect(&fdesc, IID_IFontDisp, (void**)&f);
     if (res != S_OK) {
         if (f) f->Release();
-        f = 0;
+        f = nullptr;
 #if defined(QT_CHECK_STATE)
         qWarning("QFontToIFont: Failed to create IFont");
 #endif
@@ -143,14 +143,14 @@ Q_GUI_EXPORT QPixmap qt_pixmapFromWinHBITMAP(HBITMAP bitmap, int hbitmapFormat =
 
 static IPictureDisp *QPixmapToIPicture(const QPixmap &pixmap)
 {
-    IPictureDisp *pic = 0;
+    IPictureDisp *pic = nullptr;
 
     PICTDESC desc;
     desc.cbSizeofstruct = sizeof(PICTDESC);
     desc.picType = PICTYPE_BITMAP;
 
-    desc.bmp.hbitmap = 0;
-    desc.bmp.hpal = 0;
+    desc.bmp.hbitmap = nullptr;
+    desc.bmp.hpal = nullptr;
 
     if (!pixmap.isNull()) {
         desc.bmp.hbitmap = qt_pixmapToWinHBITMAP(pixmap);
@@ -160,7 +160,7 @@ static IPictureDisp *QPixmapToIPicture(const QPixmap &pixmap)
     HRESULT res = OleCreatePictureIndirect(&desc, IID_IPictureDisp, true, (void**)&pic);
     if (res != S_OK) {
         if (pic) pic->Release();
-        pic = 0;
+        pic = nullptr;
 #if defined(QT_CHECK_STATE)
         qWarning("QPixmapToIPicture: Failed to create IPicture");
 #endif
@@ -175,7 +175,7 @@ static QPixmap IPictureToQPixmap(IPicture *ipic)
     if (type != PICTYPE_BITMAP)
         return QPixmap();
 
-    HBITMAP hbm = 0;
+    HBITMAP hbm = nullptr;
     ipic->get_Handle((OLE_HANDLE*)&hbm);
     if (!hbm)
         return QPixmap();
@@ -475,7 +475,7 @@ bool QVariantToVARIANT(const QVariant &var, VARIANT &arg, const QByteArray &type
             default:
                 break;
             }
-            SAFEARRAY *array = 0;
+            SAFEARRAY *array = nullptr;
             bool is2D = false;
             // If the first element in the array is a list the whole list is
             // treated as a 2D array. The column count is taken from the 1st element.
@@ -917,13 +917,13 @@ QVariant VARIANTToQVariant(const VARIANT &arg, const QByteArray &typeName, uint
     case VT_DISPATCH|VT_BYREF:
         {
             // pdispVal and ppdispVal are a union
-            IDispatch *disp = 0;
+            IDispatch *disp = nullptr;
             if (arg.vt & VT_BYREF)
                 disp = *arg.ppdispVal;
             else
                 disp = arg.pdispVal;
             if (type == QVariant::Font || (!type && (typeName == "QFont" || typeName == "QFont*"))) {
-                IFont *ifont = 0;
+                IFont *ifont = nullptr;
                 if (disp)
                     disp->QueryInterface(IID_IFont, (void**)&ifont);
                 if (ifont) {
@@ -933,7 +933,7 @@ QVariant VARIANTToQVariant(const VARIANT &arg, const QByteArray &typeName, uint
                     var = QVariant::fromValue(QFont());
                 }
             } else if (type == QVariant::Pixmap || (!type && (typeName == "QPixmap" || typeName == "QPixmap*"))) {
-                IPicture *ipic = 0;
+                IPicture *ipic = nullptr;
                 if (disp)
                     disp->QueryInterface(IID_IPicture, (void**)&ipic);
                 if (ipic) {
@@ -987,7 +987,7 @@ QVariant VARIANTToQVariant(const VARIANT &arg, const QByteArray &typeName, uint
     case VT_UNKNOWN:
     case VT_UNKNOWN|VT_BYREF:
         {
-            IUnknown *unkn = 0;
+            IUnknown *unkn = nullptr;
             if (arg.vt & VT_BYREF)
                 unkn = *arg.ppunkVal;
             else
@@ -998,7 +998,7 @@ QVariant VARIANTToQVariant(const VARIANT &arg, const QByteArray &typeName, uint
     case VT_ARRAY|VT_VARIANT:
     case VT_ARRAY|VT_VARIANT|VT_BYREF:
         {
-            SAFEARRAY *array = 0;
+            SAFEARRAY *array = nullptr;
             if ( arg.vt & VT_BYREF )
                 array = *arg.pparray;
             else
@@ -1019,7 +1019,7 @@ QVariant VARIANTToQVariant(const VARIANT &arg, const QByteArray &typeName, uint
                         VariantInit( &var );
                         SafeArrayGetElement( array, &i, &var );
 
-                        QVariant qvar = VARIANTToQVariant( var, 0 );
+                        QVariant qvar = VARIANTToQVariant( var, nullptr );
                         clearVARIANT( &var );
                         list << qvar;
                     }
@@ -1049,7 +1049,7 @@ QVariant VARIANTToQVariant(const VARIANT &arg, const QByteArray &typeName, uint
                             dimIndices[1] = y;
                             SafeArrayGetElement(array, dimIndices, &var);
 
-                            QVariant qvar = VARIANTToQVariant(var, 0);
+                            QVariant qvar = VARIANTToQVariant(var, nullptr);
                             clearVARIANT(&var);
                             list << qvar;
                         }
@@ -1069,7 +1069,7 @@ QVariant VARIANTToQVariant(const VARIANT &arg, const QByteArray &typeName, uint
     case VT_ARRAY|VT_BSTR:
     case VT_ARRAY|VT_BSTR|VT_BYREF:
         {
-            SAFEARRAY *array = 0;
+            SAFEARRAY *array = nullptr;
             if (arg.vt & VT_BYREF)
                 array = *arg.pparray;
             else
@@ -1099,7 +1099,7 @@ QVariant VARIANTToQVariant(const VARIANT &arg, const QByteArray &typeName, uint
     case VT_ARRAY|VT_UI1:
     case VT_ARRAY|VT_UI1|VT_BYREF:
         {
-            SAFEARRAY *array = 0;
+            SAFEARRAY *array = nullptr;
             if (arg.vt & VT_BYREF)
                 array = *arg.pparray;
             else
@@ -1157,7 +1157,7 @@ QVariant VARIANTToQVariant(const VARIANT &arg, const QByteArray &typeName, uint
         // support for any SAFEARRAY(Type) where Type can be converted to a QVariant
         // -> QVariantList
         if (arg.vt & VT_ARRAY) {
-            SAFEARRAY *array = 0;
+            SAFEARRAY *array = nullptr;
             if (arg.vt & VT_BYREF)
                 array = *arg.pparray;
             else
@@ -1174,7 +1174,7 @@ QVariant VARIANTToQVariant(const VARIANT &arg, const QByteArray &typeName, uint
             VARIANT variant;
             SafeArrayGetVartype(array, &vt);
 
-            void *pElement = 0;
+            void *pElement = nullptr;
             switch(vt) {
             case VT_BSTR: Q_ASSERT(false); break; // already covered
             case VT_BOOL: pElement = &variant.boolVal; break;
@@ -1208,7 +1208,7 @@ QVariant VARIANTToQVariant(const VARIANT &arg, const QByteArray &typeName, uint
             for ( long i = lBound; i <= uBound; ++i ) {
                 variant.vt = vt;
                 SafeArrayGetElement(array, &i, pElement);
-                QVariant qvar = VARIANTToQVariant(variant, 0);
+                QVariant qvar = VARIANTToQVariant(variant, nullptr);
                 clearVARIANT(&variant);
                 list << qvar;
             }
diff --git a/src/activeqt/shared/qaxutils.cpp b/src/activeqt/shared/qaxutils.cpp
index c1f1e74..3514558 100644
--- a/src/activeqt/shared/qaxutils.cpp
+++ b/src/activeqt/shared/qaxutils.cpp
@@ -72,14 +72,14 @@ static inline QWindow *windowForWidget(QWidget *widget)
         return window;
     if (QWidget *nativeParent = widget->nativeParentWidget())
         return nativeParent->windowHandle();
-    return 0;
+    return nullptr;
 }
 
 HWND hwndForWidget(QWidget *widget)
 {
     if (QWindow *window = windowForWidget(widget))
         return static_cast<HWND> (QGuiApplication::platformNativeInterface()->nativeResourceForWindow("handle", window));
-    return 0;
+    return nullptr;
 }
 
 // Code courtesy of QWindowsXPStyle
@@ -149,9 +149,9 @@ void qaxClearCachedSystemLogicalDpi() // Call from WM_DISPLAYCHANGE
 static inline QDpi systemLogicalDpi()
 {
     if (cachedSystemLogicalDpi.first < 0) {
-        const HDC displayDC = GetDC(0);
+        const HDC displayDC = GetDC(nullptr);
         cachedSystemLogicalDpi = QDpi(GetDeviceCaps(displayDC, LOGPIXELSX), GetDeviceCaps(displayDC, LOGPIXELSY));
-        ReleaseDC(0, displayDC);
+        ReleaseDC(nullptr, displayDC);
     }
     return cachedSystemLogicalDpi;
 }
diff --git a/src/tools/idc/main.cpp b/src/tools/idc/main.cpp
index dddfeda..f38a51e 100644
--- a/src/tools/idc/main.cpp
+++ b/src/tools/idc/main.cpp
@@ -62,7 +62,7 @@ static bool prependPath()
 {
     enum { maxEnvironmentSize = 32767 };
     wchar_t buffer[maxEnvironmentSize];
-    if (!GetModuleFileName(NULL, buffer, maxEnvironmentSize))
+    if (!GetModuleFileName(nullptr, buffer, maxEnvironmentSize))
         return false;
     wchar_t *ptr = wcsrchr(buffer, L'\\');
     if (!ptr)
@@ -75,10 +75,10 @@ static bool prependPath()
 
 static QString errorString(DWORD errorCode)
 {
-    wchar_t *resultW = 0;
+    wchar_t *resultW = nullptr;
     FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER|FORMAT_MESSAGE_FROM_SYSTEM,
-                  NULL, errorCode, MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
-                  reinterpret_cast<LPWSTR>(&resultW), 0, NULL);
+                  nullptr, errorCode, MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
+                  reinterpret_cast<LPWSTR>(&resultW), 0, nullptr);
     const QString result = QString::fromWCharArray(resultW);
     LocalFree(resultW);
     return result;
@@ -107,7 +107,7 @@ static bool runWithQtInEnvironment(const QString &cmd)
     QScopedArrayPointer<wchar_t> commandLineW(new wchar_t[cmd.size() + 1]);
     cmd.toWCharArray(commandLineW.data());
     commandLineW[cmd.size()] = 0;
-    if (!CreateProcessW(0, commandLineW.data(), 0, 0, /* InheritHandles */ TRUE, 0, 0, 0, &si, &pi)) {
+    if (!CreateProcessW(nullptr, commandLineW.data(), nullptr, nullptr, /* InheritHandles */ TRUE, 0, nullptr, nullptr, &si, &pi)) {
         fprintf(stderr, "Unable to execute \"%s\": %s\n", qPrintable(cmd),
                 qPrintable(errorString(GetLastError())));
         return false;
@@ -139,7 +139,7 @@ static bool runWithQtInEnvironment(const QString &cmd)
 static bool attachTypeLibrary(const QString &applicationName, int resource, const QByteArray &data, QString *errorMessage)
 {
     HANDLE hExe = BeginUpdateResource(reinterpret_cast<const wchar_t *>(applicationName.utf16()), false);
-    if (hExe == 0) {
+    if (hExe == nullptr) {
         if (errorMessage)
             *errorMessage = QString::fromLatin1("Failed to attach type library to binary %1 - could not open file.").arg(applicationName);
         return false;
@@ -177,10 +177,10 @@ static HMODULE loadLibraryQt(const QString &input)
     // Load DLL with the folder containing the DLL temporarily added to the search path when loading dependencies
     const UINT oldErrorMode = SetErrorMode(SEM_FAILCRITICALERRORS);
     HMODULE result =
-        LoadLibraryEx(inputC, NULL, LOAD_LIBRARY_SEARCH_DLL_LOAD_DIR | LOAD_LIBRARY_SEARCH_DEFAULT_DIRS);
+        LoadLibraryEx(inputC, nullptr, LOAD_LIBRARY_SEARCH_DLL_LOAD_DIR | LOAD_LIBRARY_SEARCH_DEFAULT_DIRS);
     // If that fails, call with flags=0 to get LoadLibrary() behavior (search %PATH%).
     if (!result)
-        result = LoadLibraryEx(inputC, NULL, 0);
+        result = LoadLibraryEx(inputC, nullptr, 0);
     SetErrorMode(oldErrorMode);
     return result;
 }
diff --git a/tools/dumpcpp/main.cpp b/tools/dumpcpp/main.cpp
index 61ee3b1..534e3ee 100644
--- a/tools/dumpcpp/main.cpp
+++ b/tools/dumpcpp/main.cpp
@@ -45,7 +45,7 @@
 #include <private/qmetaobject_p.h>
 QT_BEGIN_NAMESPACE
 
-static ITypeInfo *currentTypeInfo = 0;
+static ITypeInfo *currentTypeInfo = nullptr;
 
 enum ProgramMode {
     GenerateMode,
@@ -564,7 +564,7 @@ const char *metaTypeEnumValueString(int type)
 QT_FOR_EACH_STATIC_TYPE(RETURN_METATYPENAME_STRING)
     }
 #undef RETURN_METATYPENAME_STRING
-    return 0;
+    return nullptr;
 }
 
 int nameToBuiltinType(const QByteArray &name)
@@ -910,7 +910,7 @@ static QByteArray classNameFromTypeInfo(ITypeInfo *typeinfo)
 {
     BSTR bstr;
     QByteArray result;
-    if (SUCCEEDED(typeinfo->GetDocumentation(-1, &bstr, 0, 0, 0))) {
+    if (SUCCEEDED(typeinfo->GetDocumentation(-1, &bstr, nullptr, nullptr, nullptr))) {
         result = QString::fromWCharArray(bstr).toLatin1();
         SysFreeString(bstr);
     }
@@ -963,7 +963,7 @@ bool generateTypeLibrary(QString typeLibFile, QString outname,
     QString libName = nameSpace;
     if (libName.isEmpty()) {
         BSTR nameString = nullptr;
-        if (SUCCEEDED(typelib->GetDocumentation(-1, &nameString, 0, 0, 0))) {
+        if (SUCCEEDED(typelib->GetDocumentation(-1, &nameString, nullptr, nullptr, nullptr))) {
             libName = QString::fromWCharArray(nameString);
             SysFreeString(nameString);
         }
@@ -972,7 +972,7 @@ bool generateTypeLibrary(QString typeLibFile, QString outname,
 
     QString libVersion(QLatin1String("1.0"));
 
-    TLIBATTR *tlibattr = 0;
+    TLIBATTR *tlibattr = nullptr;
     typelib->GetLibAttr(&tlibattr);
     if (tlibattr) {
         libVersion = QString::fromLatin1("%1.%2").arg(tlibattr->wMajorVerNum).arg(tlibattr->wMinorVerNum);
@@ -987,7 +987,7 @@ bool generateTypeLibrary(QString typeLibFile, QString outname,
         return false;
     }
 
-    QMetaObject *namespaceObject = qax_readEnumInfo(typelib, 0);
+    QMetaObject *namespaceObject = qax_readEnumInfo(typelib, nullptr);
 
     QTemporaryFile classImplFile;
     if (!classImplFile.open()) {
@@ -1043,7 +1043,7 @@ bool generateTypeLibrary(QString typeLibFile, QString outname,
             declOut << endl;
             declOut << "// Referenced namespace" << endl;
             for (UINT index = 0; index < typeCount; ++index) {
-                ITypeInfo *typeinfo = 0;
+                ITypeInfo *typeinfo = nullptr;
                 typelib->GetTypeInfo(index, &typeinfo);
                 if (!typeinfo)
                     continue;
@@ -1058,7 +1058,7 @@ bool generateTypeLibrary(QString typeLibFile, QString outname,
                 TYPEKIND typekind;
                 typelib->GetTypeInfoType(index, &typekind);
 
-                QMetaObject *metaObject = 0;
+                QMetaObject *metaObject = nullptr;
 
                 // trigger meta object to collect references to other type libraries
                 switch (typekind) {
@@ -1171,7 +1171,7 @@ bool generateTypeLibrary(QString typeLibFile, QString outname,
 
     UINT typeCount = typelib->GetTypeInfoCount();
     for (UINT index = 0; index < typeCount; ++index) {
-        ITypeInfo *typeinfo = 0;
+        ITypeInfo *typeinfo = nullptr;
         typelib->GetTypeInfo(index, &typeinfo);
         if (!typeinfo)
             continue;
@@ -1192,7 +1192,7 @@ bool generateTypeLibrary(QString typeLibFile, QString outname,
         else if (typeattr->wTypeFlags & TYPEFLAG_FCONTROL)
             object_category |= ActiveX;
 
-        QMetaObject *metaObject = 0;
+        QMetaObject *metaObject = nullptr;
         QUuid guid(typeattr->guid);
 
         if (!(object_category & ActiveX)) {
@@ -1257,7 +1257,7 @@ bool generateTypeLibrary(QString typeLibFile, QString outname,
                     generateClassImpl(classImplOut, metaObject, className, libName.toLatin1(),
                                       object_category);
             }
-            currentTypeInfo = 0;
+            currentTypeInfo = nullptr;
         }
 
         qax_deleteMetaObject(metaObject);
@@ -1532,7 +1532,7 @@ static void parseOptions(Options *options)
 
 int main(int argc, char **argv)
 {
-    if (FAILED(CoInitializeEx(0, COINIT_APARTMENTTHREADED))) {
+    if (FAILED(CoInitializeEx(nullptr, COINIT_APARTMENTTHREADED))) {
         qErrnoWarning("CoInitializeEx() failed.");
         return -1;
     }
diff --git a/tools/dumpdoc/main.cpp b/tools/dumpdoc/main.cpp
index 3f3dbd7..6e14ee6 100644
--- a/tools/dumpdoc/main.cpp
+++ b/tools/dumpdoc/main.cpp
@@ -35,7 +35,7 @@ QT_USE_NAMESPACE
 
 int main(int argc, char **argv)
 {
-    if (FAILED(CoInitializeEx(0, COINIT_APARTMENTTHREADED))) {
+    if (FAILED(CoInitializeEx(nullptr, COINIT_APARTMENTTHREADED))) {
         qErrnoWarning("CoInitializeEx() failed.");
         return -1;
     }
diff --git a/tools/testcon/ambientproperties.cpp b/tools/testcon/ambientproperties.cpp
index ec1311d..ae759f5 100644
--- a/tools/testcon/ambientproperties.cpp
+++ b/tools/testcon/ambientproperties.cpp
@@ -36,7 +36,7 @@
 QT_BEGIN_NAMESPACE
 
 AmbientProperties::AmbientProperties(QWidget *parent)
-: QDialog(parent), container(0)
+: QDialog(parent), container(nullptr)
 {
     setupUi(this);
 
diff --git a/tools/testcon/changeproperties.cpp b/tools/testcon/changeproperties.cpp
index 9b5cca2..4ec1332 100644
--- a/tools/testcon/changeproperties.cpp
+++ b/tools/testcon/changeproperties.cpp
@@ -39,7 +39,7 @@
 QT_BEGIN_NAMESPACE
 
 ChangeProperties::ChangeProperties(QWidget *parent)
-: QDialog(parent), activex(0)
+: QDialog(parent), activex(nullptr)
 {
     setupUi(this);
 
@@ -60,9 +60,9 @@ void ChangeProperties::setControl(QAxWidget *ax)
 
 void ChangeProperties::on_listProperties_currentItemChanged(QTreeWidgetItem *current)
 {
-    editValue->setEnabled(current != 0);
-    buttonSet->setEnabled(current != 0);
-    valueLabel->setEnabled(current != 0);
+    editValue->setEnabled(current != nullptr);
+    buttonSet->setEnabled(current != nullptr);
+    valueLabel->setEnabled(current != nullptr);
 
     if (!current)
         return;
diff --git a/tools/testcon/controlinfo.cpp b/tools/testcon/controlinfo.cpp
index 4c19fd1..2339895 100644
--- a/tools/testcon/controlinfo.cpp
+++ b/tools/testcon/controlinfo.cpp
@@ -51,7 +51,7 @@ void ControlInfo::setControl(QWidget *activex)
     group->setText(0, tr("Class Info"));
     group->setText(1, QString::number(mo->classInfoCount()));
 
-    QTreeWidgetItem *item = 0;
+    QTreeWidgetItem *item = nullptr;
     int i;
     int count;
     for (i = mo->classInfoOffset(); i < mo->classInfoCount(); ++i) {
diff --git a/tools/testcon/docuwindow.h b/tools/testcon/docuwindow.h
index bd133b7..a2849e5 100644
--- a/tools/testcon/docuwindow.h
+++ b/tools/testcon/docuwindow.h
@@ -39,7 +39,7 @@ class DocuWindow : public QMainWindow
 {
     Q_OBJECT
 public:
-    DocuWindow(const QString& docu, QWidget *parent = 0);
+    DocuWindow(const QString& docu, QWidget *parent = nullptr);
 
 public slots:
     void save();
diff --git a/tools/testcon/invokemethod.cpp b/tools/testcon/invokemethod.cpp
index 92c7a91..1aa74be 100644
--- a/tools/testcon/invokemethod.cpp
+++ b/tools/testcon/invokemethod.cpp
@@ -34,7 +34,7 @@
 QT_BEGIN_NAMESPACE
 
 InvokeMethod::InvokeMethod(QWidget *parent)
-: QDialog(parent), activex(0)
+: QDialog(parent), activex(nullptr)
 {
     setupUi(this);
 
@@ -136,8 +136,8 @@ void InvokeMethod::on_listParameters_currentItemChanged(QTreeWidgetItem *item)
 {
     if (!activex)
         return;
-    editValue->setEnabled(item != 0);
-    buttonSet->setEnabled(item != 0);
+    editValue->setEnabled(item != nullptr);
+    buttonSet->setEnabled(item != nullptr);
     if (!item)
         return;
     editValue->setText(item->text(2));
diff --git a/tools/testcon/mainwindow.cpp b/tools/testcon/mainwindow.cpp
index d77b589..bf426b5 100644
--- a/tools/testcon/mainwindow.cpp
+++ b/tools/testcon/mainwindow.cpp
@@ -102,7 +102,7 @@ QAxWidget *MainWindow::activeAxWidget() const
 {
     if (const QMdiSubWindow *activeSubWindow = m_mdiArea->currentSubWindow())
         return qobject_cast<QAxWidget*>(activeSubWindow->widget());
-    return 0;
+    return nullptr;
 }
 
 QList<QAxWidget *> MainWindow::axWidgets() const
@@ -126,7 +126,7 @@ struct LowIntegrity {
         if (!OpenProcessToken(GetCurrentProcess(), TOKEN_DUPLICATE | TOKEN_ADJUST_DEFAULT | TOKEN_QUERY | TOKEN_ASSIGN_PRIMARY, &cur_token))
             abort();
 
-        if (!DuplicateTokenEx(cur_token, 0, NULL, SecurityImpersonation, TokenPrimary, &m_token))
+        if (!DuplicateTokenEx(cur_token, 0, nullptr, SecurityImpersonation, TokenPrimary, &m_token))
             abort();
 
         CloseHandle(cur_token);
@@ -534,7 +534,7 @@ void MainWindow::updateGUI()
     actionFileNew->setEnabled(true);
     actionFileLoad->setEnabled(true);
     actionFileSave->setEnabled(hasControl);
-    actionContainerSet->setEnabled(container != 0);
+    actionContainerSet->setEnabled(container != nullptr);
     actionContainerClear->setEnabled(hasControl);
     actionControlProperties->setEnabled(hasControl);
     actionControlMethods->setEnabled(hasControl);
@@ -543,9 +543,9 @@ void MainWindow::updateGUI()
     actionControlPixmap->setEnabled(hasControl);
     VerbMenu->setEnabled(hasControl);
     if (m_dlgInvoke)
-        m_dlgInvoke->setControl(hasControl ? container : 0);
+        m_dlgInvoke->setControl(hasControl ? container : nullptr);
     if (m_dlgProperties)
-        m_dlgProperties->setControl(hasControl ? container : 0);
+        m_dlgProperties->setControl(hasControl ? container : nullptr);
 
     const QList<QAxWidget *> axw = axWidgets();
     for (QAxWidget *container : axw) {
@@ -584,7 +584,7 @@ void MainWindow::logSignal(const QString &signal, int argc, void *argv)
     VARIANT *params = (VARIANT*)argv;
     for (int a = argc-1; a >= 0; --a) {
         paramlist += QLatin1Char(' ');
-        paramlist += VARIANTToQVariant(params[a], 0).toString();
+        paramlist += VARIANTToQVariant(params[a], nullptr).toString();
         paramlist += a > 0 ? QLatin1Char(',') : QLatin1Char(' ');
     }
     if (argc)
diff --git a/tools/testcon/mainwindow.h b/tools/testcon/mainwindow.h
index 091aac1..b3be5c0 100644
--- a/tools/testcon/mainwindow.h
+++ b/tools/testcon/mainwindow.h
@@ -56,7 +56,7 @@ class MainWindow : public QMainWindow, public Ui::MainWindow
     Q_CLASSINFO("EventsID", "{02a268cd-24b4-4fd9-88ff-b01b683ef39d}")
 
 public:
-    MainWindow(QWidget *parent = 0);
+    MainWindow(QWidget *parent = nullptr);
     ~MainWindow();
 
     static MainWindow *instance() { return m_instance; }