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

[partition] Simplify DeviceModel sorting

Browse Source
This commit is contained in:
Adriaan de Groot 2019-04-01 08:53:35 -04:00
parent 544131c4bc
commit cccd4402d8
1 changed files with 12 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/modules/partition/core/DeviceModel.cpp
View File

@ -36,6 +36,15 @@
// STL
#include <algorithm>
static void
sortDevices( DeviceModel::DeviceList& l )
{
std::sort( l.begin(), l.end(), []( const Device* dev1, const Device* dev2 )
{
return dev1->deviceNode() < dev2->deviceNode();
} );
}
DeviceModel::DeviceModel( QObject* parent )
: QAbstractListModel( parent )
{
@ -50,10 +59,7 @@ DeviceModel::init( const DeviceList& devices )
{
beginResetModel();
m_devices = devices;
std::sort( m_devices.begin(), m_devices.end(), []( const Device* dev1, const Device* dev2 )
{
return dev1->deviceNode() < dev2->deviceNode();
} );
sortDevices( m_devices );
endResetModel();
}
@ -131,13 +137,8 @@ void
DeviceModel::addDevice( Device *device )
{
beginResetModel();
m_devices << device;
std::sort( m_devices.begin(), m_devices.end(), []( const Device* dev1, const Device* dev2 )
{
return dev1->deviceNode() < dev2->deviceNode();
} );
sortDevices( m_devices );
endResetModel();
}
@ -145,12 +146,7 @@ void
DeviceModel::removeDevice( Device *device )
{
beginResetModel();
m_devices.removeAll( device );
std::sort( m_devices.begin(), m_devices.end(), []( const Device* dev1, const Device* dev2 )
{
return dev1->deviceNode() < dev2->deviceNode();
} );
sortDevices( m_devices );
endResetModel();
}