peranger/qskinny
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

memory leak fixed - buttons were not deleted in case of dialogs, that

Browse Source 
have never been shown
This commit is contained in:
Uwe Rathmann 2018-05-08 10:32:22 +02:00
parent c46b105879
commit 8ed1036839
1 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/dialogs/QskDialogButtonBox.cpp
View File

@ -90,17 +90,6 @@ void QskDialogButtonBox::setOrientation( Qt::Orientation orientation )
if ( m_data->layoutBox && m_data->layoutBox->orientation() == orientation ) if ( m_data->layoutBox && m_data->layoutBox->orientation() == orientation )
return; return;
for ( int i = 0; i < QskDialog::NButtonRoles; i++ )
{
for ( QskPushButton* button : qskAsConst( m_data->buttonLists[i] ) )
{
// avoid that buttons get deleted
// together with the layout
button->setParent( nullptr );
}
}
delete m_data->layoutBox; delete m_data->layoutBox;
m_data->layoutBox = new QskLinearBox( orientation, this ); m_data->layoutBox = new QskLinearBox( orientation, this );
@ -263,11 +252,18 @@ void QskDialogButtonBox::addButton( QskPushButton* button, QskDialog::ButtonRole
if ( role < 0 || role >= QskDialog::NButtonRoles ) if ( role < 0 || role >= QskDialog::NButtonRoles )
return; return;
connect( button, &QskPushButton::clicked, this, &QskDialogButtonBox::onButtonClicked ); if ( button )
{
if ( button->parent() == nullptr )
button->setParent( this );
connect( button, &QskPushButton::clicked, this,
&QskDialogButtonBox::onButtonClicked );
m_data->buttonLists[role] += button; m_data->buttonLists[role] += button;
invalidateLayout(); invalidateLayout();
} }
}
void QskDialogButtonBox::addButton( QskDialog::StandardButton standardButton ) void QskDialogButtonBox::addButton( QskDialog::StandardButton standardButton )
{ {