mirror of
https://github.com/parchlinux/calamares.git
synced 2025-06-27 17:35:37 -04:00
Revert to runtime singal-slot syntax for easy disconnects.
This commit is contained in:
parent
3cb293aa75
commit
296bb412a8
2 changed files with 6 additions and 5 deletions
|
@ -415,6 +415,7 @@ ChoicePage::applyDeviceChoice()
|
|||
void
|
||||
ChoicePage::applyActionChoice( ChoicePage::Choice choice )
|
||||
{
|
||||
m_beforePartitionBarsView->disconnect( SIGNAL( currentRowChanged( QModelIndex, QModelIndex ) ) );
|
||||
switch ( choice )
|
||||
{
|
||||
case Erase:
|
||||
|
@ -444,8 +445,8 @@ ChoicePage::applyActionChoice( ChoicePage::Choice choice )
|
|||
this );
|
||||
}
|
||||
|
||||
connect( m_beforePartitionBarsView->selectionModel(), &QItemSelectionModel::currentRowChanged,
|
||||
this, &ChoicePage::doReplaceSelectedPartition,
|
||||
connect( m_beforePartitionBarsView->selectionModel(), SIGNAL( currentRowChanged( QModelIndex, QModelIndex ) ),
|
||||
this, SLOT( doReplaceSelectedPartition( QModelIndex, QModelIndex ) ),
|
||||
Qt::UniqueConnection );
|
||||
break;
|
||||
case NoChoice:
|
||||
|
@ -627,8 +628,6 @@ ChoicePage::updateActionChoicePreview( ChoicePage::Choice choice )
|
|||
break;
|
||||
default:
|
||||
previewSelectionMode = QAbstractItemView::NoSelection;
|
||||
m_beforePartitionBarsView->disconnect( SIGNAL( clicked() ) );
|
||||
m_beforePartitionLabelsView->disconnect( SIGNAL( clicked() ) );
|
||||
}
|
||||
|
||||
m_beforePartitionBarsView->setSelectionMode( previewSelectionMode );
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue