Introduce nullptr

Apply Fixits by Qt Creator with some amendments.

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

9 files changed, 30 insertions, 30 deletions

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; }