From 2f84ec4bcd35855e33140d8c985d640d8ece62bc Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@qt.io>
Date: Thu, 6 Jun 2019 10:52:22 +0200
Subject: uic: Introduce nullptr

Apply Fixits by Qt Creator.

Change-Id: Ic2d65b2604d1d71d910773e02bcdf2466f49e52c
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
---
 src/tools/uic/cpp/cppwriteinitialization.cpp | 7 +++----
 src/tools/uic/cpp/cppwriteinitialization.h   | 2 +-
 src/tools/uic/driver.cpp                     | 2 +-
 src/tools/uic/main.cpp                       | 2 +-
 src/tools/uic/uic.cpp                        | 8 ++++----
 5 files changed, 10 insertions(+), 11 deletions(-)

(limited to 'src/tools/uic')

diff --git a/src/tools/uic/cpp/cppwriteinitialization.cpp b/src/tools/uic/cpp/cppwriteinitialization.cpp
index 440758cf41..96801abe6a 100644
--- a/src/tools/uic/cpp/cppwriteinitialization.cpp
+++ b/src/tools/uic/cpp/cppwriteinitialization.cpp
@@ -706,7 +706,7 @@ void WriteInitialization::acceptWidget(DomWidget *node)
         addWizardPage(varName, node, parentWidget);
     } else if (m_uic->customWidgetsInfo()->extends(parentClass, QLatin1String("QToolBox"))) {
         const DomProperty *plabel = attributes.value(QLatin1String("label"));
-        DomString *plabelString = plabel ? plabel->elementString() : 0;
+        DomString *plabelString = plabel ? plabel->elementString() : nullptr;
         QString icon;
         if (const DomProperty *picon = attributes.value(QLatin1String("icon")))
             icon = QLatin1String(", ") + iconCall(picon); // Side effect: Writes icon definition
@@ -729,7 +729,7 @@ void WriteInitialization::acceptWidget(DomWidget *node)
         }
     } else if (m_uic->customWidgetsInfo()->extends(parentClass, QLatin1String("QTabWidget"))) {
         const DomProperty *ptitle = attributes.value(QLatin1String("title"));
-        DomString *ptitleString = ptitle ? ptitle->elementString() : 0;
+        DomString *ptitleString = ptitle ? ptitle->elementString() : nullptr;
         QString icon;
         if (const DomProperty *picon = attributes.value(QLatin1String("icon")))
             icon = QLatin1String(", ") + iconCall(picon); // Side effect: Writes icon definition
@@ -844,7 +844,7 @@ void WriteInitialization::addButtonGroup(const DomWidget *buttonNode, const QStr
     const DomButtonGroup *group = m_driver->findButtonGroup(attributeName);
     // Legacy feature: Create missing groups on the fly as the UIC button group feature
     // was present before the actual Designer support (4.5)
-    const bool createGroupOnTheFly = group == 0;
+    const bool createGroupOnTheFly = group == nullptr;
     if (createGroupOnTheFly) {
         DomButtonGroup *newGroup = new DomButtonGroup;
         newGroup->setAttributeName(attributeName);
@@ -2619,7 +2619,6 @@ static void generateMultiDirectiveEnd(QTextStream &outputStream, const QSet<QStr
 
 WriteInitialization::Item::Item(const QString &itemClassName, const QString &indent, QTextStream &setupUiStream, QTextStream &retranslateUiStream, Driver *driver)
     :
-    m_parent(0),
     m_itemClassName(itemClassName),
     m_indent(indent),
     m_setupUiStream(setupUiStream),
diff --git a/src/tools/uic/cpp/cppwriteinitialization.h b/src/tools/uic/cpp/cppwriteinitialization.h
index 0ee001469c..af8b964777 100644
--- a/src/tools/uic/cpp/cppwriteinitialization.h
+++ b/src/tools/uic/cpp/cppwriteinitialization.h
@@ -188,7 +188,7 @@ private:
         ItemData m_setupUiData;
         ItemData m_retranslateUiData;
         QList<Item *> m_children;
-        Item *m_parent;
+        Item *m_parent = nullptr;
 
         const QString m_itemClassName;
         const QString m_indent;
diff --git a/src/tools/uic/driver.cpp b/src/tools/uic/driver.cpp
index eb88032e59..8b9b4806e6 100644
--- a/src/tools/uic/driver.cpp
+++ b/src/tools/uic/driver.cpp
@@ -256,7 +256,7 @@ bool Driver::uic(const QString &fileName, DomUI *ui, QTextStream *out)
 
     QTextStream *oldOutput = m_output;
 
-    m_output = out != 0 ? out : &m_stdout;
+    m_output = out != nullptr ? out : &m_stdout;
 
     Uic tool(this);
     const bool result = tool.write(ui);
diff --git a/src/tools/uic/main.cpp b/src/tools/uic/main.cpp
index 166fe78ff7..439789d221 100644
--- a/src/tools/uic/main.cpp
+++ b/src/tools/uic/main.cpp
@@ -137,7 +137,7 @@ int runUic(int argc, char *argv[])
         return !driver.printDependencies(inputFile);
     }
 
-    QTextStream *out = 0;
+    QTextStream *out = nullptr;
     QFile f;
     if (!driver.option().outputFile.isEmpty()) {
         f.setFileName(driver.option().outputFile);
diff --git a/src/tools/uic/uic.cpp b/src/tools/uic/uic.cpp
index b95f1a784b..207356f28d 100644
--- a/src/tools/uic/uic.cpp
+++ b/src/tools/uic/uic.cpp
@@ -69,7 +69,7 @@ bool Uic::printDependencies()
             return false;
     }
 
-    DomUI *ui = 0;
+    DomUI *ui = nullptr;
     {
         QXmlStreamReader reader;
         reader.setDevice(&f);
@@ -178,7 +178,7 @@ static double versionFromUiAttribute(QXmlStreamReader &reader)
 
 DomUI *Uic::parseUiFile(QXmlStreamReader &reader)
 {
-    DomUI *ui = 0;
+    DomUI *ui = nullptr;
 
     const QString uiElement = QLatin1String("ui");
     while (!reader.atEnd()) {
@@ -189,7 +189,7 @@ DomUI *Uic::parseUiFile(QXmlStreamReader &reader)
                 if (version < 4.0) {
                     const QString msg = QString::fromLatin1("uic: File generated with too old version of Qt Designer (%1)").arg(version);
                     fprintf(stderr, "%s\n", qPrintable(msg));
-                    return 0;
+                    return nullptr;
                 }
 
                 ui = new DomUI();
@@ -201,7 +201,7 @@ DomUI *Uic::parseUiFile(QXmlStreamReader &reader)
     }
     if (reader.hasError()) {
         delete ui;
-        ui = 0;
+        ui = nullptr;
         fprintf(stderr, "%s\n", qPrintable(QString::fromLatin1("uic: Error in line %1, column %2 : %3")
                                     .arg(reader.lineNumber()).arg(reader.columnNumber())
                                     .arg(reader.errorString())));
-- 
cgit v1.2.3