andrius
/
partitionmanager
1
0
Fork 0
Code Pull Requests Releases Activity

Wrap some very long lines. 

svn path=/trunk/extragear/sysadmin/partitionmanager/; revision=1328021
This commit is contained in:
Andrius Štikonas 2012-12-10 18:44:45 +00:00
parent ebf4c75855
commit 4d724a3998
2 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/plugins/libparted/libpartedbackend.cpp
View File

@ -435,7 +435,12 @@ static quint32 countDevices(const QList<Solid::Device>& driveList)
foreach(const Solid::Device& solidDevice, driveList)
{
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++;
}
@ -455,7 +460,12 @@ QList<Device*> LibPartedBackend::scanDevices()
{
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;
const Solid::Block* solidBlock = solidDevice.as<Solid::Block>();

4
src/util/helpers.cpp
View File

@ -232,7 +232,9 @@ bool checkAccessibleDevices()
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();
if (args->count() > 0)