From bac8e84ee732c73481c562378341d795b8dc41ce Mon Sep 17 00:00:00 2001 From: J-P Nurmi Date: Fri, 6 Jan 2017 09:52:33 +0100 Subject: QQuickXxxPrivate::deleteDelegate(): don't store null pointers Avoid unnecessarily allocating extra data and/or pendingDeletions. Change-Id: I41d68af513c078a48bbe4f026bfe25e9c45ba3a8 Reviewed-by: Mitch Curtis --- src/quicktemplates2/qquickcontrol.cpp | 2 +- src/quicktemplates2/qquicklabel.cpp | 2 +- src/quicktemplates2/qquicktextarea.cpp | 2 +- src/quicktemplates2/qquicktextfield.cpp | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/quicktemplates2/qquickcontrol.cpp b/src/quicktemplates2/qquickcontrol.cpp index d8088f24..9aa310ff 100644 --- a/src/quicktemplates2/qquickcontrol.cpp +++ b/src/quicktemplates2/qquickcontrol.cpp @@ -850,7 +850,7 @@ void QQuickControlPrivate::deleteDelegate(QObject *delegate) { if (componentComplete) delete delegate; - else + else if (delegate) extra.value().pendingDeletions.append(delegate); } diff --git a/src/quicktemplates2/qquicklabel.cpp b/src/quicktemplates2/qquicklabel.cpp index ebd1755a..37a0842f 100644 --- a/src/quicktemplates2/qquicklabel.cpp +++ b/src/quicktemplates2/qquicklabel.cpp @@ -175,7 +175,7 @@ void QQuickLabelPrivate::deleteDelegate(QObject *delegate) { if (componentComplete) delete delegate; - else + else if (delegate) pendingDeletions.append(delegate); } diff --git a/src/quicktemplates2/qquicktextarea.cpp b/src/quicktemplates2/qquicktextarea.cpp index 56a538ee..4a0c4a72 100644 --- a/src/quicktemplates2/qquicktextarea.cpp +++ b/src/quicktemplates2/qquicktextarea.cpp @@ -410,7 +410,7 @@ void QQuickTextAreaPrivate::deleteDelegate(QObject *delegate) { if (componentComplete) delete delegate; - else + else if (delegate) pendingDeletions.append(delegate); } diff --git a/src/quicktemplates2/qquicktextfield.cpp b/src/quicktemplates2/qquicktextfield.cpp index 2bb902a1..a4f14d48 100644 --- a/src/quicktemplates2/qquicktextfield.cpp +++ b/src/quicktemplates2/qquicktextfield.cpp @@ -289,7 +289,7 @@ void QQuickTextFieldPrivate::deleteDelegate(QObject *delegate) { if (componentComplete) delete delegate; - else + else if (delegate) pendingDeletions.append(delegate); } -- cgit v1.2.3