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

Port away from toAscii which is not available in Qt5.

This commit is contained in:
Andrius Štikonas 2014-05-14 00:05:15 +01:00
parent ed431cfcd5
commit f2f5295f1b
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -143,7 +143,7 @@ typedef struct _GPTDiskData GPTDiskData;
*/
static quint64 firstUsableSector(const Device& d)
{
PedDevice* pedDevice = ped_device_get(d.deviceNode().toAscii());
PedDevice* pedDevice = ped_device_get(d.deviceNode().toLatin1());
PedDisk* pedDisk = pedDevice ? ped_disk_new(pedDevice) : NULL;
quint64 rval = pedDisk->dev->bios_geom.sectors;
@ -168,7 +168,7 @@ static quint64 firstUsableSector(const Device& d)
*/
static quint64 lastUsableSector(const Device& d)
{
PedDevice* pedDevice = ped_device_get(d.deviceNode().toAscii());
PedDevice* pedDevice = ped_device_get(d.deviceNode().toLatin1());
PedDisk* pedDisk = pedDevice ? ped_disk_new(pedDevice) : NULL;
quint64 rval = pedDisk->dev->bios_geom.sectors * pedDisk->dev->bios_geom.heads * pedDisk->dev->bios_geom.cylinders - 1;

6
src/plugins/libparted/libparteddevice.cpp
View File

@ -48,7 +48,7 @@ bool LibPartedDevice::open()
if (pedDevice())
return false;
m_PedDevice = ped_device_get(deviceNode().toAscii());
m_PedDevice = ped_device_get(deviceNode().toLatin1());
return m_PedDevice != NULL;
}
@ -92,7 +92,7 @@ CoreBackendPartitionTable* LibPartedDevice::openPartitionTable()
bool LibPartedDevice::createPartitionTable(Report& report, const PartitionTable& ptable)
{
PedDiskType* pedDiskType = ped_disk_type_get(ptable.typeName().toAscii());
PedDiskType* pedDiskType = ped_disk_type_get(ptable.typeName().toLatin1());
if (pedDiskType == NULL)
{
@ -100,7 +100,7 @@ bool LibPartedDevice::createPartitionTable(Report& report, const PartitionTable&
return false;
}
PedDevice* dev = ped_device_get(deviceNode().toAscii());
PedDevice* dev = ped_device_get(deviceNode().toLatin1());
if (dev == NULL)
{

4
src/plugins/libparted/libpartedpartitiontable.cpp
View File

@ -52,7 +52,7 @@ LibPartedPartitionTable::~LibPartedPartitionTable()
bool LibPartedPartitionTable::open()
{
m_PedDisk = ped_disk_new(pedDevice());
return m_PedDisk != NULL;
}
@ -137,7 +137,7 @@ static PedFileSystemType* getPedFileSystemType(FileSystem::Type t)
{
for (quint32 i = 0; i < sizeof(mapFileSystemTypeToLibPartedName) / sizeof(mapFileSystemTypeToLibPartedName[0]); i++)
if (mapFileSystemTypeToLibPartedName[i].type == t)
return ped_file_system_type_get(mapFileSystemTypeToLibPartedName[i].name.toAscii());
return ped_file_system_type_get(mapFileSystemTypeToLibPartedName[i].name.toLatin1());
// if we didn't find anything, go with ext2 as a safe fallback
return ped_file_system_type_get("ext2");