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

Partitions: use an enum with clear semantics instead of bool

Browse Source
This commit is contained in:
Adriaan de Groot 2017-07-12 05:41:29 -04:00 committed by Philip
parent 42d5e6d1c4
commit a62143f62b
3 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/modules/partition/core/DeviceList.cpp
View File

@ -16,7 +16,7 @@
* along with Calamares. If not, see <http://www.gnu.org/licenses/>. * along with Calamares. If not, see <http://www.gnu.org/licenses/>.
*/ */
#include "PartUtils.h" #include "DeviceList.h"
#include "PartitionCoreModule.h" #include "PartitionCoreModule.h"
@ -98,8 +98,10 @@ isIso9660( const Device* device )
} }
QList< Device* > getDevices( bool writableOnly ) QList< Device* > getDevices( DeviceType which )
{ {
bool writableOnly = (which == DeviceType::WritableOnly);
using DeviceList = QList< Device* >; using DeviceList = QList< Device* >;
CoreBackend* backend = CoreBackendManager::self()->backend(); CoreBackend* backend = CoreBackendManager::self()->backend();

8
src/modules/partition/core/DeviceList.h
View File

@ -28,13 +28,17 @@ class Device;
namespace PartUtils namespace PartUtils
{ {
enum class DeviceType { All, WritableOnly };
/** /**
* @brief Gets a list of storage devices. * @brief Gets a list of storage devices.
* @param writableOnly if set to true, only devices which can be overwritten * @param which Can be used to select from all the devices in
* the system, filtering out those that do not meet a criterium.
* If set to WritableOnly, only devices which can be overwritten
* safely are returned (e.g. RO-media are ignored, as are mounted partitions). * safely are returned (e.g. RO-media are ignored, as are mounted partitions).
* @return a list of Devices meeting this criterium. * @return a list of Devices meeting this criterium.
*/ */
QList< Device* > getDevices( bool writableOnly = false ); QList< Device* > getDevices( DeviceType which = DeviceType::All );
} }

2
src/modules/partition/core/PartitionCoreModule.cpp
View File

@ -116,7 +116,7 @@ PartitionCoreModule::doInit()
FileSystemFactory::init(); FileSystemFactory::init();
using DeviceList = QList< Device* >; using DeviceList = QList< Device* >;
DeviceList devices = PartUtils::getDevices( true ); DeviceList devices = PartUtils::getDevices( PartUtils::DeviceType::WritableOnly );
cDebug() << "LIST OF DETECTED DEVICES:"; cDebug() << "LIST OF DETECTED DEVICES:";
cDebug() << "node\tcapacity\tname\tprettyName"; cDebug() << "node\tcapacity\tname\tprettyName";