Wrap some very long lines.
svn path=/trunk/extragear/sysadmin/partitionmanager/; revision=1328021
This commit is contained in:
parent
ebf4c75855
commit
4d724a3998
|
@ -435,7 +435,12 @@ static quint32 countDevices(const QList<Solid::Device>& driveList)
|
||||||
foreach(const Solid::Device& solidDevice, driveList)
|
foreach(const Solid::Device& solidDevice, driveList)
|
||||||
{
|
{
|
||||||
const Solid::StorageDrive* solidDrive = solidDevice.as<Solid::StorageDrive>();
|
const Solid::StorageDrive* solidDrive = solidDevice.as<Solid::StorageDrive>();
|
||||||
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++;
|
rval++;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -455,7 +460,12 @@ QList<Device*> LibPartedBackend::scanDevices()
|
||||||
{
|
{
|
||||||
const Solid::StorageDrive* solidDrive = solidDevice.as<Solid::StorageDrive>();
|
const Solid::StorageDrive* solidDrive = solidDevice.as<Solid::StorageDrive>();
|
||||||
|
|
||||||
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;
|
continue;
|
||||||
|
|
||||||
const Solid::Block* solidBlock = solidDevice.as<Solid::Block>();
|
const Solid::Block* solidBlock = solidDevice.as<Solid::Block>();
|
||||||
|
|
|
@ -232,7 +232,9 @@ bool checkAccessibleDevices()
|
||||||
|
|
||||||
QList<Solid::Device> getSolidDeviceList()
|
QList<Solid::Device> 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();
|
KCmdLineArgs* args = KCmdLineArgs::parsedArgs();
|
||||||
if (args->count() > 0)
|
if (args->count() > 0)
|
||||||
|
|
Loading…
Reference in New Issue