napcok/calamares
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Reduce Qt runtime warnings.

Browse Source 
- deleteLater() doesn't like nullptr (produces a warning, but is harmless)
 - reparenting across threads doesn't work, comment on that but leave
   it in, since this may be relevant for memory management.
This commit is contained in:
Adriaan de Groot 2017-09-07 04:04:50 -04:00 committed by Philip
parent 83e6dfc81e
commit d348633b14
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/modules/partition/gui/ChoicePage.cpp
View File

@ -806,9 +806,12 @@ ChoicePage::updateDeviceStatePreview()
cDebug() << "Updating partitioning state widgets."; cDebug() << "Updating partitioning state widgets.";
qDeleteAll( m_previewBeforeFrame->children() ); qDeleteAll( m_previewBeforeFrame->children() );
m_previewBeforeFrame->layout()->deleteLater();
QVBoxLayout* layout = new QVBoxLayout; auto layout = m_previewBeforeFrame->layout();
if ( layout )
layout->deleteLater(); // Doesn't like nullptr
layout = new QVBoxLayout;
m_previewBeforeFrame->setLayout( layout ); m_previewBeforeFrame->setLayout( layout );
CalamaresUtils::unmarginLayout( layout ); CalamaresUtils::unmarginLayout( layout );
layout->setSpacing( 6 ); layout->setSpacing( 6 );
@ -829,7 +832,7 @@ ChoicePage::updateDeviceStatePreview()
// The QObject parents tree is meaningful for memory management here, // The QObject parents tree is meaningful for memory management here,
// see qDeleteAll above. // see qDeleteAll above.
deviceBefore->setParent( model ); deviceBefore->setParent( model ); // Can't reparent across threads
model->setParent( m_beforePartitionBarsView ); model->setParent( m_beforePartitionBarsView );
m_beforePartitionBarsView->setModel( model ); m_beforePartitionBarsView->setModel( model );
@ -838,7 +841,8 @@ ChoicePage::updateDeviceStatePreview()
// Make the bars and labels view use the same selectionModel. // Make the bars and labels view use the same selectionModel.
auto sm = m_beforePartitionLabelsView->selectionModel(); auto sm = m_beforePartitionLabelsView->selectionModel();
m_beforePartitionLabelsView->setSelectionModel( m_beforePartitionBarsView->selectionModel() ); m_beforePartitionLabelsView->setSelectionModel( m_beforePartitionBarsView->selectionModel() );
sm->deleteLater(); if ( sm )
sm->deleteLater();
switch ( m_choice ) switch ( m_choice )
{ {
@ -874,7 +878,10 @@ ChoicePage::updateActionChoicePreview( ChoicePage::Choice choice )
cDebug() << "Updating partitioning preview widgets."; cDebug() << "Updating partitioning preview widgets.";
qDeleteAll( m_previewAfterFrame->children() ); qDeleteAll( m_previewAfterFrame->children() );
m_previewAfterFrame->layout()->deleteLater();
auto oldlayout = m_previewAfterFrame->layout();
if ( oldlayout )
oldlayout->deleteLater();
QVBoxLayout* layout = new QVBoxLayout; QVBoxLayout* layout = new QVBoxLayout;
m_previewAfterFrame->setLayout( layout ); m_previewAfterFrame->setLayout( layout );