diff --git a/src/plugins/libparted/libpartedbackend.cpp b/src/plugins/libparted/libpartedbackend.cpp index 221c477..c52b6ce 100644 --- a/src/plugins/libparted/libpartedbackend.cpp +++ b/src/plugins/libparted/libpartedbackend.cpp @@ -435,7 +435,12 @@ static quint32 countDevices(const QList& driveList) foreach(const Solid::Device& solidDevice, driveList) { const Solid::StorageDrive* solidDrive = solidDevice.as(); - if (solidDrive->driveType() == Solid::StorageDrive::HardDisk || solidDrive->driveType() == Solid::StorageDrive::CompactFlash || solidDrive->driveType() == Solid::StorageDrive::MemoryStick || solidDrive->driveType() == Solid::StorageDrive::SmartMedia || solidDrive->driveType() == Solid::StorageDrive::SdMmc || solidDrive->driveType() == Solid::StorageDrive::Xd) + if (solidDrive->driveType() == Solid::StorageDrive::HardDisk || + solidDrive->driveType() == Solid::StorageDrive::CompactFlash || + solidDrive->driveType() == Solid::StorageDrive::MemoryStick || + solidDrive->driveType() == Solid::StorageDrive::SmartMedia || + solidDrive->driveType() == Solid::StorageDrive::SdMmc || + solidDrive->driveType() == Solid::StorageDrive::Xd) rval++; } @@ -455,7 +460,12 @@ QList LibPartedBackend::scanDevices() { const Solid::StorageDrive* solidDrive = solidDevice.as(); - if (solidDrive->driveType() != Solid::StorageDrive::HardDisk && solidDrive->driveType() != Solid::StorageDrive::CompactFlash && solidDrive->driveType() != Solid::StorageDrive::MemoryStick && solidDrive->driveType() != Solid::StorageDrive::SmartMedia && solidDrive->driveType() != Solid::StorageDrive::SdMmc && solidDrive->driveType() != Solid::StorageDrive::Xd) + if (solidDrive->driveType() != Solid::StorageDrive::HardDisk && + solidDrive->driveType() != Solid::StorageDrive::CompactFlash && + solidDrive->driveType() != Solid::StorageDrive::MemoryStick && + solidDrive->driveType() != Solid::StorageDrive::SmartMedia && + solidDrive->driveType() != Solid::StorageDrive::SdMmc && + solidDrive->driveType() != Solid::StorageDrive::Xd) continue; const Solid::Block* solidBlock = solidDevice.as(); diff --git a/src/util/helpers.cpp b/src/util/helpers.cpp index fbb112c..1743943 100644 --- a/src/util/helpers.cpp +++ b/src/util/helpers.cpp @@ -232,7 +232,9 @@ bool checkAccessibleDevices() QList getSolidDeviceList() { - QString predicate = "[ [ [ StorageDrive.driveType == 'HardDisk' OR StorageDrive.driveType == 'CompactFlash'] OR [ StorageDrive.driveType == 'MemoryStick' OR StorageDrive.driveType == 'SmartMedia'] ] OR [ StorageDrive.driveType == 'SdMmc' OR StorageDrive.driveType == 'Xd'] ]"; + QString predicate = "[ [ [ StorageDrive.driveType == 'HardDisk' OR StorageDrive.driveType == 'CompactFlash'] OR " + "[ StorageDrive.driveType == 'MemoryStick' OR StorageDrive.driveType == 'SmartMedia'] ] OR " + "[ StorageDrive.driveType == 'SdMmc' OR StorageDrive.driveType == 'Xd'] ]"; KCmdLineArgs* args = KCmdLineArgs::parsedArgs(); if (args->count() > 0)