dryark/strawberry
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove some uses of auto

Browse Source
This commit is contained in:
Jonas Kvinge
2021-08-22 23:27:25 +02:00
parent 72d381e9ed
commit 671e636aef
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/device/udisks2lister.cpp
View File

@@ -113,7 +113,7 @@ QVariantMap Udisks2Lister::DeviceHardwareInfo(const QString &id) {
QVariantMap result; QVariantMap result;
const auto &data = device_data_[id]; const PartitionData &data = device_data_[id];
result[QT_TR_NOOP("D-Bus path")] = data.dbus_path; result[QT_TR_NOOP("D-Bus path")] = data.dbus_path;
result[QT_TR_NOOP("Serial number")] = data.serial; result[QT_TR_NOOP("Serial number")] = data.serial;
result[QT_TR_NOOP("Mount points")] = data.mount_paths.join(", "); result[QT_TR_NOOP("Mount points")] = data.mount_paths.join(", ");
@@ -195,7 +195,7 @@ bool Udisks2Lister::Init() {
QList<QDBusObjectPath> paths = reply.value().keys(); QList<QDBusObjectPath> paths = reply.value().keys();
for (const QDBusObjectPath &path : paths) { for (const QDBusObjectPath &path : paths) {
auto partition_data = ReadPartitionData(path); Udisks2Lister::PartitionData partition_data = ReadPartitionData(path);
if (!partition_data.dbus_path.isEmpty()) { if (!partition_data.dbus_path.isEmpty()) {
QWriteLocker locker(&device_data_lock_); QWriteLocker locker(&device_data_lock_);
@@ -310,7 +310,7 @@ void Udisks2Lister::JobCompleted(const bool success, const QString &message) {
Q_UNUSED(message); Q_UNUSED(message);
auto job = qobject_cast<OrgFreedesktopUDisks2JobInterface*>(sender()); OrgFreedesktopUDisks2JobInterface *job = qobject_cast<OrgFreedesktopUDisks2JobInterface*>(sender());
QDBusObjectPath jobPath(job->path()); QDBusObjectPath jobPath(job->path());
if (!job->isValid() || !success || !mounting_jobs_.contains(jobPath)) return; if (!job->isValid() || !success || !mounting_jobs_.contains(jobPath)) return;
@@ -340,7 +340,7 @@ void Udisks2Lister::HandleFinishedUnmountJob(const Udisks2Lister::PartitionData
QWriteLocker locker(&device_data_lock_); QWriteLocker locker(&device_data_lock_);
QString id; QString id;
for (auto &data : device_data_) { for (PartitionData &data : device_data_) {
if (data.mount_paths.contains(mounted_object.path())) { if (data.mount_paths.contains(mounted_object.path())) {
qLog(Debug) << "UDisks2 umount job finished, found corresponding device: Drive = " << data.dbus_drive_path << " | Partition = " << data.dbus_path; qLog(Debug) << "UDisks2 umount job finished, found corresponding device: Drive = " << data.dbus_drive_path << " | Partition = " << data.dbus_path;
data.mount_paths.removeOne(mounted_object.path()); data.mount_paths.removeOne(mounted_object.path());