From b5d1529370b1d144ee9ad951eeb621d03637d012 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andrius=20=C5=A0tikonas?= Date: Fri, 22 Jul 2016 13:18:34 +0100 Subject: [PATCH] excludeReadOnly->excludeLoop. --- src/backend/corebackend.h | 2 +- src/plugins/dummy/dummybackend.cpp | 4 ++-- src/plugins/libparted/libpartedbackend.cpp | 4 ++-- src/plugins/libparted/libpartedbackend.h | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/backend/corebackend.h b/src/backend/corebackend.h index b873641..142921a 100644 --- a/src/backend/corebackend.h +++ b/src/backend/corebackend.h @@ -90,7 +90,7 @@ public: * @return a QList of pointers to Device instances. The caller is responsible * for deleting these objects. */ - virtual QList scanDevices(bool excludeReadOnly = false) = 0; + virtual QList scanDevices(bool excludeLoop = false) = 0; /** * Scan a single device in the system. diff --git a/src/plugins/dummy/dummybackend.cpp b/src/plugins/dummy/dummybackend.cpp index 43d1011..6e16222 100644 --- a/src/plugins/dummy/dummybackend.cpp +++ b/src/plugins/dummy/dummybackend.cpp @@ -46,9 +46,9 @@ void DummyBackend::initFSSupport() { } -QList DummyBackend::scanDevices(bool excludeReadOnly) +QList DummyBackend::scanDevices(bool excludeLoop) { - Q_UNUSED(excludeReadOnly) + Q_UNUSED(excludeLoop) QList result; result.append(scanDevice(QStringLiteral("/dev/sda"))); diff --git a/src/plugins/libparted/libpartedbackend.cpp b/src/plugins/libparted/libpartedbackend.cpp index 0dbae60..c3bd691 100644 --- a/src/plugins/libparted/libpartedbackend.cpp +++ b/src/plugins/libparted/libpartedbackend.cpp @@ -308,7 +308,7 @@ Device* LibPartedBackend::scanDevice(const QString& deviceNode) return d; } -QList LibPartedBackend::scanDevices(bool excludeReadOnly) +QList LibPartedBackend::scanDevices(bool excludeLoop) { QList result; @@ -317,7 +317,7 @@ QList LibPartedBackend::scanDevices(bool excludeReadOnly) QStringLiteral("--noheadings"), QStringLiteral("--output"), QString::fromLatin1("name"), QStringLiteral("--paths"), - QStringLiteral("--include"), excludeReadOnly ? QStringLiteral("3,8") : QStringLiteral("3,7,8") }); + QStringLiteral("--include"), excludeLoop ? QStringLiteral("3,8") : QStringLiteral("3,7,8") }); if (cmd.run(-1) && cmd.exitCode() == 0) { QStringList devices = cmd.output().split(QString::fromLatin1("\n")); devices.removeLast(); diff --git a/src/plugins/libparted/libpartedbackend.h b/src/plugins/libparted/libpartedbackend.h index 041ab0f..5b3906d 100644 --- a/src/plugins/libparted/libpartedbackend.h +++ b/src/plugins/libparted/libpartedbackend.h @@ -65,7 +65,7 @@ public: CoreBackendDevice* openDeviceExclusive(const QString& deviceNode) override; bool closeDevice(CoreBackendDevice* core_device) override; Device* scanDevice(const QString& deviceNode) override; - QList scanDevices(bool excludeReadOnly = false) override; + QList scanDevices(bool excludeLoop = false) override; FileSystem::Type detectFileSystem(const QString& partitionPath) override; static QString lastPartedExceptionMessage();