The containerWidget is used by ViewSplit, which calls addWidget, which in turn sets the parent. So don't delete it if it has already been deleted.

If we are sure that the containerWidget will be parented, we can avoid the QPointer

svn path=/trunk/KDE/kdebase/apps/konsole/; revision=869659
This commit is contained in:
Thiago Macieira
2008-10-09 16:44:11 +00:00
parent 8487a9255c
commit 156c585181
2 changed files with 7 additions and 4 deletions

View File

@@ -585,7 +585,8 @@ void TabbedViewContainer::dynamicTabBarVisibility()
}
TabbedViewContainer::~TabbedViewContainer()
{
_containerWidget->deleteLater();
if (!_containerWidget.isNull())
_containerWidget->deleteLater();
}
void TabbedViewContainer::startTabDrag(int tab)
@@ -780,7 +781,8 @@ StackedViewContainer::StackedViewContainer(QObject* parent)
}
StackedViewContainer::~StackedViewContainer()
{
_containerWidget->deleteLater();
if (!_containerWidget.isNull())
_containerWidget->deleteLater();
}
QWidget* StackedViewContainer::containerWidget() const
{