diff options
author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-06-03 16:40:05 +0200 |
---|---|---|
committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-06-05 10:26:08 +0200 |
commit | 13f0365a960538693ee4b52f9e02864d08845fae (patch) | |
tree | cea2924f8113152ff10bdc126ebe5a0c8d3c4f95 /src/designer/src/lib/shared/qdesigner_widgetbox.cpp | |
parent | fac0dcbeef6a0c23e780b9751c17883ec9918d6f (diff) |
Qt Designer: Introduce nullptr
Apply Fixits by Qt Creator with some amendments.
Change-Id: Idc948b1132fbb61c3ae6706b71659e2e8790fbc6
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
Diffstat (limited to 'src/designer/src/lib/shared/qdesigner_widgetbox.cpp')
-rw-r--r-- | src/designer/src/lib/shared/qdesigner_widgetbox.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/designer/src/lib/shared/qdesigner_widgetbox.cpp b/src/designer/src/lib/shared/qdesigner_widgetbox.cpp index ec1bd5471..1ca79d777 100644 --- a/src/designer/src/lib/shared/qdesigner_widgetbox.cpp +++ b/src/designer/src/lib/shared/qdesigner_widgetbox.cpp @@ -183,7 +183,7 @@ DomUI *QDesignerWidgetBox::xmlToUi(const QString &name, const QString &xml, bool QString *errorMessage) { QXmlStreamReader reader(xml); - DomUI *ui = 0; + DomUI *ui = nullptr; // The xml description must either contain a root element "ui" with a child element "widget" // or "widget" as the root element (4.3 legacy) @@ -216,14 +216,14 @@ DomUI *QDesignerWidgetBox::xmlToUi(const QString &name, const QString &xml, bool "specified for the widget %3: %4\n%5") .arg(reader.lineNumber()).arg(reader.columnNumber()) .arg(name, reader.errorString(), xml); - return 0; + return nullptr; } if (!ui || !ui->elementWidget()) { delete ui; *errorMessage = tr("The XML code specified for the widget %1 does not contain " "any widget elements.\n%2").arg(name, xml); - return 0; + return nullptr; } if (insertFakeTopLevel) { |