Commit abafa451 authored by Mathieu Westphal's avatar Mathieu Westphal Committed by Kitware Robot

Merge topic 'CorrectWidgetNullParenting'

7fc311d7 Corrects some widget that were null parented with no reason
Acked-by: Kitware Robot's avatarKitware Robot <kwrobot@kitware.com>
Acked-by: Utkarsh Ayachit's avatarUtkarsh Ayachit <utkarsh.ayachit@kitware.com>
Acked-by: Michael Migliore's avatarMichael Migliore <michael.migliore@kitware.com>
Acked-by: Joachim Pouderoux's avatarJoachim Pouderoux <joachim.pouderoux@kitware.com>
Merge-request: !2581
parents 486877f5 7fc311d7
Pipeline #109387 failed with stage
in 0 seconds
......@@ -89,7 +89,6 @@ public:
{
if (child->widget())
{
child->widget()->setParent(0);
delete child->widget();
}
delete child;
......@@ -120,7 +119,6 @@ public:
if (child->widget() && child->widget()->objectName() == "LightsEditor")
{
child = this->Ui.verticalLayout->takeAt(0);
child->widget()->setParent(0);
delete child->widget();
delete child;
}
......@@ -128,7 +126,6 @@ public:
{
if (child->widget())
{
child->widget()->setParent(0);
delete child->widget();
}
delete child;
......
......@@ -649,7 +649,6 @@ void pqMultiViewWidget::reload()
{
if (aWidget && !newWidgets.contains(aWidget))
{
aWidget->setParent(NULL);
delete aWidget;
}
}
......
......@@ -97,7 +97,6 @@ public:
this->Panel->setObjectName(QString("HiddenProxyPanel%1").arg(this->MyId));
this->Panel->hide();
this->Panel->parentWidget()->layout()->removeWidget(this->Panel);
this->Panel->setParent(NULL);
}
void show(QWidget* parentWdg)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment