39 changed files with 145 additions and 258 deletions
--- a/.krazy
+++ b/.krazy
@ -1,3 +0,0 @@
-#the krazy i18ncheckarg hangs on this file due to extra double-quotes in a QRegularExpression.
-#No idea how to fix properly so let's just skip the file
-SKIP /src/fs/fat12.cpp
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -23,16 +23,16 @@ set(CMAKE_BUILD_WITH_INSTALL_RPATH ON)

 # Dependencies
 set(QT_MIN_VERSION "5.10.0")
-set(KF5_MIN_VERSION "5.56")
-set(BLKID_MIN_VERSION "2.33.2")
+set(KF5_MIN_VERSION "5.25")
+set(BLKID_MIN_VERSION "2.32")
 # Qca-qt5 (tested with botan and ossl backends)

 # Runtime
 # smartmontools 7.0
 # Qca plugin (botan or ossl)

-set(VERSION_MAJOR "4")
-set(VERSION_MINOR "0")
+set(VERSION_MAJOR "3")
+set(VERSION_MINOR "80")
 set(VERSION_RELEASE "0")
 set(VERSION ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_RELEASE})
 set(SOVERSION "8")
--- a/INSTALL.md
+++ b/INSTALL.md
@ -3,20 +3,20 @@ Building and installing KDE Partition Manager Core Library from source

 ## Dependencies

-* [util-linux](https://github.com/karelzak/util-linux) 2.34
+* [util-linux](https://github.com/karelzak/util-linux) 2.32

 * [Qt](https://www.qt.io/) 5.10

 * QCA

-* Tier 2 [KDE Frameworks](https://www.kde.org/products/frameworks/) 5.56
+* Tier 2 [KDE Frameworks](https://www.kde.org/products/frameworks/) 5.25

 ## Configure

 KPMcore is built with [cmake](https://cmake.org/). It is recommended to build out of tree:
 After unpacking the source, create a separate build directory and run cmake there:

-```bash
+```
 $ tar xf kpmcore-x.y.z.tar.xz
 $ cd kpmcore-x.y.z
 $ mkdir build
@ -35,7 +35,7 @@ configure a different install path by passing
 `-DCMAKE_INSTALL_PREFIX=<your_path>` to cmake when configuring. To change the
 install path after configuring and building, run

-```bash
+```
 $ ccmake .
 ```

--- a/README.md
+++ b/README.md
@ -28,7 +28,7 @@ KPMcore supports CMake as (meta-)build system and installs suitable
 CMake support files. Typical use of of KPMcore in a `CMakeLists.txt`
 looks like this:

-```cmake
+```
    find_package( KPMcore 3.2 REQUIRED )
    include_directories( ${KPMCORE_INCLUDE_DIR} )
    target_link_libraries( target kpmcore )
@ -44,7 +44,7 @@ environment variable `KPMCORE_BACKEND` names a backend,
 and typical initialization code will look like this (or use the
 class `KPMCoreInitializer` from `test/helpers.h`):

-```cpp
+```
    #include <backend/corebackendmanager.h>
    #include <QDebug>

@ -76,7 +76,7 @@ result in undefined behavior.
 After the backend is initialized you can scan for available devices.
 If you only want devices from the loaded backend you can call

-```cpp
+```
    QList<Device*> devices = backend->scanDevices( excludeReadOnly );
 ```

@ -87,7 +87,7 @@ read only devices.

 Alternatively, you can use KPMcore device scanner

-```cpp
+```
    #include <core/device.h>
    #include <core/devicescanner.h>
    #include <core/operationstack.h>
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@ -49,7 +49,7 @@ target_link_libraries( kpmcore PUBLIC
    KF5::I18n
    KF5::CoreAddons
    KF5::WidgetsAddons
-    KF5::AuthCore
+    KF5::Auth
 )

 install(TARGETS kpmcore EXPORT KPMcoreTargets  ${INSTALL_TARGETS_DEFAULT_ARGS})
--- a/src/backend/corebackend.h
+++ b/src/backend/corebackend.h
@ -36,13 +36,6 @@ class PartitionTable;

 class QString;

-enum class ScanFlag : uint8_t {
-    includeReadOnly = 0x1, /**< devices that are read-only according to the kernel */
-    includeLoopback = 0x2,
-};
-Q_DECLARE_FLAGS(ScanFlags, ScanFlag)
-Q_DECLARE_OPERATORS_FOR_FLAGS(ScanFlags)
-
 /**
  * Interface class for backend plugins.
  * @author Volker Lanz <vl@fidra.de>
@ -93,7 +86,8 @@ public:

    /**
      * Scan for devices in the system.
-      * @param excludeReadOnly when true,  are left out of the list.
+      * @param excludeReadOnly when true, devices that are read-only
+      *         according to the kernel are left out of the list.
      *         When false (the default) all devices, writable or
      *         not, including CD ROM devices, are returned.
      * @return a QList of pointers to Device instances. The caller is responsible
@ -101,17 +95,7 @@ public:
      * @note A Device object is a description of the device, not
      *         an object to operate on. See openDevice().
      */
-    [[deprecated("port to scanDevices(ScanFlags)")]] virtual QList<Device*> scanDevices(bool excludeReadOnly = false) = 0;
-
-    /**
-      * Scan for devices in the system.
-      * @param scanFlags can be used to expand the list of scanned devices.
-      * @return a QList of pointers to Device instances. The caller is responsible
-      *         for deleting these objects.
-      * @note A Device object is a description of the device, not
-      *         an object to operate on. See openDevice().
-      */
-    virtual QList<Device*> scanDevices(const ScanFlags scanFlags) = 0;
+    virtual QList<Device*> scanDevices(bool excludeReadOnly = false) = 0;

    /**
      * Scan a single device in the system.
--- a/src/core/devicescanner.cpp
+++ b/src/core/devicescanner.cpp
@ -63,7 +63,7 @@ void DeviceScanner::scan()

    clear();

-    const QList<Device*> deviceList = CoreBackendManager::self()->backend()->scanDevices(ScanFlag::includeLoopback);
+    const QList<Device*> deviceList = CoreBackendManager::self()->backend()->scanDevices();

    for (const auto &d : deviceList)
        operationStack().addDevice(d);
--- a/src/core/lvmdevice.cpp
+++ b/src/core/lvmdevice.cpp
@ -193,7 +193,7 @@ Partition* LvmDevice::scanPartition(const QString& lvPath, PartitionTable* pTabl
                    startSector,
                    endSector,
                    lvPath,
-                    PartitionTable::Flag::None,
+                    PartitionTable::Flag::FlagNone,
                    mountPoint,
                    mounted);
    return part;
--- a/src/core/lvmdevice.h
+++ b/src/core/lvmdevice.h
@ -45,8 +45,6 @@ class LIBKPMCORE_EXPORT LvmDevice : public VolumeManagerDevice
 {
    Q_DISABLE_COPY(LvmDevice)

-    friend class VolumeManagerDevice;
-
 public:
    LvmDevice(const QString& name, const QString& iconName = QString());
    ~LvmDevice();
@ -59,6 +57,8 @@ public:
    static QVector<const Partition*> s_DirtyPVs;
    static QVector<const Partition*> s_OrphanPVs;

+    static void scanSystemLVM(QList<Device*>& devices);
+
    static const QStringList getVGs();
    static const QStringList getLVs(const QString& vgName);

@ -105,9 +105,6 @@ public:

 protected:
    std::unique_ptr<QHash<QString, qint64>>& LVSizeMap() const;
-
-private:
-    static void scanSystemLVM(QList<Device*>& devices);
 };

 #endif
--- a/src/core/operationrunner.h
+++ b/src/core/operationrunner.h
@ -44,7 +44,7 @@ public:
    OperationRunner(QObject* parent, OperationStack& ostack);

 public:
-    void run() override;
+    void run();
    qint32 numJobs() const;
    qint32 numOperations() const;
    qint32 numProgressSub() const;
--- a/src/core/partition.h
+++ b/src/core/partition.h
@ -86,7 +86,7 @@ public:
        StateRestore [[deprecated("Use Partition::State::Restore")]] = Restore
    };

-    Partition(PartitionNode* parent, const Device& device, const PartitionRole& role, FileSystem* fs, qint64 sectorStart, qint64 sectorEnd, QString partitionPath, PartitionTable::Flags availableFlags = PartitionTable::Flag::None, const QString& mountPoint = QString(), bool mounted = false, PartitionTable::Flags activeFlags = PartitionTable::Flag::None, State state = State::None);
+    Partition(PartitionNode* parent, const Device& device, const PartitionRole& role, FileSystem* fs, qint64 sectorStart, qint64 sectorEnd, QString partitionPath, PartitionTable::Flags availableFlags = PartitionTable::FlagNone, const QString& mountPoint = QString(), bool mounted = false, PartitionTable::Flags activeFlags = PartitionTable::FlagNone, State state = State::None);
    ~Partition() override;

    Partition(const Partition& other, PartitionNode* parent = nullptr);
@ -238,10 +238,10 @@ public:
    void setMounted(bool b);

    void setFlag(PartitionTable::Flag f) {
-        m_ActiveFlags = m_ActiveFlags.setFlag(f);
+        m_ActiveFlags |= f;
    }
    void unsetFlag(PartitionTable::Flag f) {
-        m_ActiveFlags = m_ActiveFlags.setFlag(f, false);
+        m_ActiveFlags &= ~f;
    }
    void setParent(PartitionNode* p) {
        m_Parent = p;
--- a/src/core/partitiontable.cpp
+++ b/src/core/partitiontable.cpp
@ -182,39 +182,39 @@ void PartitionTable::append(Partition* partition)
 QString PartitionTable::flagName(Flag f)
 {
    switch (f) {
-    case PartitionTable::Flag::Boot:
+    case PartitionTable::FlagBoot:
        return xi18nc("@item partition flag", "boot");
-    case PartitionTable::Flag::Root:
+    case PartitionTable::FlagRoot:
        return xi18nc("@item partition flag", "root");
-    case PartitionTable::Flag::Swap:
+    case PartitionTable::FlagSwap:
        return xi18nc("@item partition flag", "swap");
-    case PartitionTable::Flag::Hidden:
+    case PartitionTable::FlagHidden:
        return xi18nc("@item partition flag", "hidden");
-    case PartitionTable::Flag::Raid:
+    case PartitionTable::FlagRaid:
        return xi18nc("@item partition flag", "raid");
-    case PartitionTable::Flag::Lvm:
+    case PartitionTable::FlagLvm:
        return xi18nc("@item partition flag", "lvm");
-    case PartitionTable::Flag::Lba:
+    case PartitionTable::FlagLba:
        return xi18nc("@item partition flag", "lba");
-    case PartitionTable::Flag::HpService:
+    case PartitionTable::FlagHpService:
        return xi18nc("@item partition flag", "hpservice");
-    case PartitionTable::Flag::Palo:
+    case PartitionTable::FlagPalo:
        return xi18nc("@item partition flag", "palo");
-    case PartitionTable::Flag::Prep:
+    case PartitionTable::FlagPrep:
        return xi18nc("@item partition flag", "prep");
-    case PartitionTable::Flag::MsftReserved:
+    case PartitionTable::FlagMsftReserved:
        return xi18nc("@item partition flag", "msft-reserved");
-    case PartitionTable::Flag::BiosGrub:
+    case PartitionTable::FlagBiosGrub:
        return xi18nc("@item partition flag", "bios-grub");
-    case PartitionTable::Flag::AppleTvRecovery:
+    case PartitionTable::FlagAppleTvRecovery:
        return xi18nc("@item partition flag", "apple-tv-recovery");
-    case PartitionTable::Flag::Diag:
+    case PartitionTable::FlagDiag:
        return xi18nc("@item partition flag", "diag");
-    case PartitionTable::Flag::LegacyBoot:
+    case PartitionTable::FlagLegacyBoot:
        return xi18nc("@item partition flag", "legacy-boot");
-    case PartitionTable::Flag::MsftData:
+    case PartitionTable::FlagMsftData:
        return xi18nc("@item partition flag", "msft-data");
-    case PartitionTable::Flag::Irst:
+    case PartitionTable::FlagIrst:
        return xi18nc("@item partition flag", "irst");
    default:
        break;
@ -228,23 +228,23 @@ const QList<PartitionTable::Flag> PartitionTable::flagList()
 {
    QList<PartitionTable::Flag> rval;

-    rval.append(PartitionTable::Flag::Boot);
-    rval.append(PartitionTable::Flag::Root);
-    rval.append(PartitionTable::Flag::Swap);
-    rval.append(PartitionTable::Flag::Hidden);
-    rval.append(PartitionTable::Flag::Raid);
-    rval.append(PartitionTable::Flag::Lvm);
-    rval.append(PartitionTable::Flag::Lba);
-    rval.append(PartitionTable::Flag::HpService);
-    rval.append(PartitionTable::Flag::Palo);
-    rval.append(PartitionTable::Flag::Prep);
-    rval.append(PartitionTable::Flag::MsftReserved);
-    rval.append(PartitionTable::Flag::BiosGrub);
-    rval.append(PartitionTable::Flag::AppleTvRecovery);
-    rval.append(PartitionTable::Flag::Diag);
-    rval.append(PartitionTable::Flag::LegacyBoot);
-    rval.append(PartitionTable::Flag::MsftData);
-    rval.append(PartitionTable::Flag::Irst);
+    rval.append(PartitionTable::FlagBoot);
+    rval.append(PartitionTable::FlagRoot);
+    rval.append(PartitionTable::FlagSwap);
+    rval.append(PartitionTable::FlagHidden);
+    rval.append(PartitionTable::FlagRaid);
+    rval.append(PartitionTable::FlagLvm);
+    rval.append(PartitionTable::FlagLba);
+    rval.append(PartitionTable::FlagHpService);
+    rval.append(PartitionTable::FlagPalo);
+    rval.append(PartitionTable::FlagPrep);
+    rval.append(PartitionTable::FlagMsftReserved);
+    rval.append(PartitionTable::FlagBiosGrub);
+    rval.append(PartitionTable::FlagAppleTvRecovery);
+    rval.append(PartitionTable::FlagDiag);
+    rval.append(PartitionTable::FlagLegacyBoot);
+    rval.append(PartitionTable::FlagMsftData);
+    rval.append(PartitionTable::FlagIrst);

    return rval;
 }
@ -269,20 +269,6 @@ QStringList PartitionTable::flagNames(Flags flags)
    return rval;
 }

-/** @param list QStringList of the flags' names
-    @returns flags corresponding to names
-*/
-PartitionTable::Flags PartitionTable::flagsFromList(const QStringList list)
-{
-    Flags flags;
-
-    for (const auto &flag : flagList())
-        if (list.contains(flagName(flag)))
-            flags.setFlag(flag);
-
-    return flags;
-}
-
 bool PartitionTable::getUnallocatedRange(const Device& d, PartitionNode& parent, qint64& start, qint64& end)
 {
    if (d.type() == Device::Type::Disk_Device) {
--- a/src/core/partitiontable.h
+++ b/src/core/partitiontable.h
@ -16,7 +16,8 @@
 *  along with this program.  If not, see <http://www.gnu.org/licenses/>.*
 *************************************************************************/

-#ifndef KPMCORE_PARTITIONTABLE_H
+#if !defined(KPMCORE_PARTITIONTABLE_H)
+
 #define KPMCORE_PARTITIONTABLE_H

 #include "util/libpartitionmanagerexport.h"
@ -49,7 +50,7 @@ class LIBKPMCORE_EXPORT PartitionTable : public PartitionNode
    friend LIBKPMCORE_EXPORT QTextStream& operator<<(QTextStream& stream, const PartitionTable& ptable);

 public:
-    enum TableType : int8_t {
+    enum TableType : qint8 {
        unknownTableType = -1,

        aix,
@ -68,47 +69,30 @@ public:
    };

    /** Partition flags */
-    enum Flag : uint32_t {
-        None = 0x0,
-        Boot = 0x1,
-        Root = 0x2,
-        Swap = 0x4,
-        Hidden = 0x8,
-        Raid = 0x10,
-        Lvm = 0x20,
-        Lba = 0x40,
-        HpService = 0x80,
-        Palo = 0x100,
-        Prep = 0x200,
-        MsftReserved = 0x400,
-        BiosGrub = 0x800,
-        AppleTvRecovery = 0x1000,
-        Diag = 0x2000,
-        LegacyBoot = 0x4000,
-        MsftData = 0x8000,
-        Irst = 0x100000,
-        FlagNone [[deprecated("Use PartitionTable::Flag::None")]] = None,
-        FlagBoot [[deprecated("Use PartitionTable::Flag::Boot")]] = Boot,
-        FlagRoot [[deprecated("Use PartitionTable::Flag::Root")]] = Root,
-        FlagSwap [[deprecated("Use PartitionTable::Flag::Swap")]] = Swap,
-        FlagHidden [[deprecated("Use PartitionTable::Flag::Hidden")]] = Hidden,
-        FlagRaid [[deprecated("Use PartitionTable::Flag::Raid")]] = Raid,
-        FlagLvm [[deprecated("Use PartitionTable::Flag::Lvm")]] = Lvm,
-        FlagLba [[deprecated("Use PartitionTable::Flag::Lba")]] = Lba,
-        FlagHpService [[deprecated("Use PartitionTable::Flag::HpService")]] = HpService,
-        FlagPalo [[deprecated("Use PartitionTable::Flag::Palo")]] = Palo,
-        FlagPrep [[deprecated("Use PartitionTable::Flag::Prep")]] = Prep,
-        FlagMsftReserved [[deprecated("Use PartitionTable::Flag::MsftReserved")]] = MsftReserved,
-        FlagBiosGrub [[deprecated("Use PartitionTable::Flag::BiosGrub")]] = BiosGrub,
-        FlagAppleTvRecovery [[deprecated("Use PartitionTable::Flag::AppleTvRecovery")]] = AppleTvRecovery,
-        FlagDiag [[deprecated("Use PartitionTable::Flag::Diag")]] = Diag,
-        FlagLegacyBoot [[deprecated("Use PartitionTable::Flag::LegacyBoot")]] = LegacyBoot,
-        FlagMsftData [[deprecated("Use PartitionTable::Flag::MsftData")]] = MsftData,
-        FlagIrst [[deprecated("Use PartitionTable::Flag::Irst")]] = Irst,
-        FlagEsp [[deprecated("Use PartitionTable::Flag::Boot")]] = Boot
+    enum Flag : qint32 {
+        FlagNone = 0,
+        FlagBoot = 1,
+        FlagRoot = 2,
+        FlagSwap = 4,
+        FlagHidden = 8,
+        FlagRaid = 16,
+        FlagLvm = 32,
+        FlagLba = 64,
+        FlagHpService = 128,
+        FlagPalo = 256,
+        FlagPrep = 512,
+        FlagMsftReserved = 1024,
+        FlagBiosGrub = 2048,
+        FlagAppleTvRecovery = 4096,
+        FlagDiag = 8192,
+        FlagLegacyBoot = 16384,
+        FlagMsftData = 32768,
+        FlagIrst = 65536,
+        FlagEsp [[deprecated]] = FlagBoot
    };

    Q_DECLARE_FLAGS(Flags, Flag)
+    Q_FLAG(Flag)

 public:
    PartitionTable(TableType type, qint64 firstUsable, qint64 lastUsable);
@ -184,7 +168,6 @@ public:
    static const QList<Flag> flagList();
    static QString flagName(Flag f);
    static QStringList flagNames(Flags f);
-    static PartitionTable::Flags flagsFromList(const QStringList list);

    static bool getUnallocatedRange(const Device& device, PartitionNode& parent, qint64& start, qint64& end);

--- a/src/core/raid/softwareraid.h
+++ b/src/core/raid/softwareraid.h
@ -26,8 +26,6 @@ class LIBKPMCORE_EXPORT SoftwareRAID : public VolumeManagerDevice
 {
    Q_DISABLE_COPY(SoftwareRAID)

-    friend class VolumeManagerDevice;
-
 public:
    enum class Status {
        Active,
@ -63,6 +61,8 @@ public:
    void setStatus(SoftwareRAID::Status status);

 public:
+    static void scanSoftwareRAID(QList<Device*>& devices);
+
    static qint32 getRaidLevel(const QString& path);
    static qint64 getChunkSize(const QString& path);
    static qint64 getTotalChunk(const QString& path);
@ -95,8 +95,6 @@ protected:
    qint64 mappedSector(const QString &partitionPath, qint64 sector) const override;

 private:
-    static void scanSoftwareRAID(QList<Device*>& devices);
-
    static QString getDetail(const QString& path);

    static QString getRAIDConfiguration(const QString& configurationPath);
--- a/src/core/volumemanagerdevice.cpp
+++ b/src/core/volumemanagerdevice.cpp
@ -19,8 +19,6 @@
 #include "core/device_p.h"
 #include "core/volumemanagerdevice.h"
 #include "core/volumemanagerdevice_p.h"
-#include "core/lvmdevice.h"
-#include "core/raid/softwareraid.h"

 /** Constructs an abstract Volume Manager Device with an empty PartitionTable.
 *
@ -39,12 +37,6 @@ VolumeManagerDevice::VolumeManagerDevice(std::shared_ptr<VolumeManagerDevicePriv
 {
 }

-void VolumeManagerDevice::scanDevices(QList<Device*>& devices)
-{
-    SoftwareRAID::scanSoftwareRAID(devices);
-    LvmDevice::scanSystemLVM(devices); // LVM scanner needs all other devices, so should be last
-}
-
 QString VolumeManagerDevice::prettyDeviceNodeList() const
 {
    return deviceNodes().join(QStringLiteral(", "));
--- a/src/core/volumemanagerdevice.h
+++ b/src/core/volumemanagerdevice.h
@ -80,8 +80,6 @@ protected:

 public:

-    static void scanDevices(QList<Device*>& devices);
-
    /** join deviceNodes together into comma-separated list
     *
     *  @return comma-separated list of deviceNodes
--- a/src/fs/fat16.cpp
+++ b/src/fs/fat16.cpp
@ -24,6 +24,7 @@

 #include <KLocalizedString>

+#include <QRegularExpression>
 #include <QString>
 #include <QStringList>

--- a/src/fs/unknown.cpp
+++ b/src/fs/unknown.cpp
@ -19,9 +19,6 @@

 namespace FS
 {
-
-FileSystem::CommandSupportType unknown::m_Move = FileSystem::cmdSupportNone;
-
 unknown::unknown(qint64 firstsector, qint64 lastsector, qint64 sectorsused, const QString& label) :
    FileSystem(firstsector, lastsector, sectorsused, label, FileSystem::Type::Unknown)
 {
--- a/src/fs/unknown.h
+++ b/src/fs/unknown.h
@ -15,7 +15,8 @@
 *  along with this program.  If not, see <http://www.gnu.org/licenses/>.*
 *************************************************************************/

-#ifndef KPMCORE_UNKNOWN_H
+#if !defined(KPMCORE_UNKNOWN_H)
+
 #define KPMCORE_UNKNOWN_H

 #include "util/libpartitionmanagerexport.h"
@ -39,12 +40,6 @@ public:
        return true;
    }
    bool canMount(const QString & deviceNode, const QString & mountPoint) const override;
-
-    CommandSupportType supportMove() const override {
-        return m_Move;
-    }
-
-    static CommandSupportType m_Move;
 };
 }

--- a/src/gui/partresizerwidget.h
+++ b/src/gui/partresizerwidget.h
@ -142,11 +142,11 @@ protected:
        m_Device = &d;
    }

-    void paintEvent(QPaintEvent* event) override;
-    void resizeEvent(QResizeEvent* event) override;
-    void mousePressEvent(QMouseEvent* event) override;
-    void mouseMoveEvent(QMouseEvent* event) override;
-    void mouseReleaseEvent(QMouseEvent* event) override;
+    void paintEvent(QPaintEvent* event);
+    void resizeEvent(QResizeEvent* event);
+    void mousePressEvent(QMouseEvent* event);
+    void mouseMoveEvent(QMouseEvent* event);
+    void mouseReleaseEvent(QMouseEvent* event);

    PartWidget& partWidget() {
        Q_ASSERT(m_PartWidget);
--- a/src/gui/partwidget.h
+++ b/src/gui/partwidget.h
@ -64,8 +64,8 @@ public:
    void setFileSystemColorCode( const std::vector<QColor>& colorCode );

 protected:
-    void paintEvent(QPaintEvent* event) override;
-    void resizeEvent(QResizeEvent* event) override;
+    void paintEvent(QPaintEvent* event);
+    void resizeEvent(QResizeEvent* event);

    QColor activeColor(const QColor& col) const;

--- a/src/ops/copyoperation.cpp
+++ b/src/ops/copyoperation.cpp
@ -267,7 +267,7 @@ Partition* CopyOperation::createCopy(const Partition& target, const Partition& s
    p->fileSystem().setFirstSector(p->firstSector());
    p->fileSystem().setLastSector(p->lastSector());

-    p->setFlags(PartitionTable::Flag::None);
+    p->setFlags(PartitionTable::FlagNone);

    return p;
 }
--- a/src/ops/newoperation.cpp
+++ b/src/ops/newoperation.cpp
@ -66,7 +66,7 @@ NewOperation::NewOperation(Device& d, Partition* p) :
        addJob(createFileSystemJob());

        if (fs.type() == FileSystem::Type::Lvm2_PV) {
-            m_SetPartFlagsJob = new SetPartFlagsJob(targetDevice(), newPartition(), PartitionTable::Flag::Lvm);
+            m_SetPartFlagsJob = new SetPartFlagsJob(targetDevice(), newPartition(), PartitionTable::FlagLvm);
            addJob(setPartFlagsJob());
        }

--- a/src/plugins/dummy/dummybackend.cpp
+++ b/src/plugins/dummy/dummybackend.cpp
@ -46,21 +46,15 @@ void DummyBackend::initFSSupport()
 {
 }

-QList<Device*> DummyBackend::scanDevices(bool excludeReadOnly)
+QList<Device*> DummyBackend::scanDevices(bool excludeLoop)
 {
-    Q_UNUSED(excludeReadOnly)
-    return scanDevices(ScanFlags());
-}
-
-QList<Device*> DummyBackend::scanDevices(const ScanFlags scanFlags)
-{
-    Q_UNUSED(scanFlags)
+    Q_UNUSED(excludeLoop)
    QList<Device*> result;
    result.append(scanDevice(QStringLiteral("/dev/sda")));

    emitScanProgress(QStringLiteral("/dev/sda"), 100);

-    return scanDevices(false);
+    return result;
 }

 Device* DummyBackend::scanDevice(const QString& deviceNode)
--- a/src/plugins/dummy/dummybackend.h
+++ b/src/plugins/dummy/dummybackend.h
@ -45,7 +45,6 @@ public:
    void initFSSupport() override;

    QList<Device*> scanDevices(bool excludeReadOnly = false) override;
-    QList<Device*> scanDevices(const ScanFlags scanFlags) override;
    std::unique_ptr<CoreBackendDevice> openDevice(const Device& d) override;
    std::unique_ptr<CoreBackendDevice> openDeviceExclusive(const Device& d) override;
    bool closeDevice(std::unique_ptr<CoreBackendDevice> coreDevice) override;
--- a/src/plugins/dummy/pmdummybackendplugin.json
+++ b/src/plugins/dummy/pmdummybackendplugin.json
@ -8,7 +8,6 @@
                "Name[ca@valencia]": "Volker Lanz",
                "Name[ca]": "Volker Lanz",
                "Name[cs]": "Volker Lanz",
-                "Name[da]": "Volker Lanz",
                "Name[de]": "Volker Lanz",
                "Name[el]": "Volker Lanz",
                "Name[en_GB]": "Volker Lanz",
@ -24,13 +23,11 @@
                "Name[pl]": "Volker Lanz",
                "Name[pt]": "Volker Lanz",
                "Name[pt_BR]": "Volker Lanz",
-                "Name[ru]": "Volker Lanz",
                "Name[sk]": "Volker Lanz",
                "Name[sv]": "Volker Lanz",
                "Name[uk]": "Volker Lanz",
                "Name[x-test]": "xxVolker Lanzxx",
-                "Name[zh_CN]": "Volker Lanz",
-                "Name[zh_TW]": "Volker Lanz"
+                "Name[zh_CN]": "Volker Lanz"
            }
        ],
        "Category": "BackendPlugin",
@ -38,7 +35,6 @@
        "Description[ca@valencia]": "Un dorsal fals del gestor de particions del KDE amb la finalitat de fer proves.",
        "Description[ca]": "Un dorsal fals del gestor de particions del KDE amb la finalitat de fer proves.",
        "Description[cs]": "Falešná podpůrná vrstva pro správce diskových oddílů KDE pro testovací účely.",
-        "Description[da]": "En KDE-partitionshåndtering med attrap-backend til testformål.",
        "Description[de]": "Ein Dummy-Backend für die KDE-Partitionsverwaltung zu Testzwecken.",
        "Description[el]": "Ένα εικονικό σύστημα υποστήριξης διαχειριστή κατατμήσεων του KDE για δοκιμές.",
        "Description[en_GB]": "A KDE Partition Manager dummy backend for testing purposes.",
@ -58,7 +54,6 @@
        "Description[uk]": "Тестовий додаток сервера Керування розділами KDE.",
        "Description[x-test]": "xxA KDE Partition Manager dummy backend for testing purposes.xx",
        "Description[zh_CN]": "测试用的 KDE 分区管理器的虚拟后端",
-        "Description[zh_TW]": "使用虛設後端的 KDE 磁碟分割區管理員，可用來測試。",
        "EnabledByDefault": true,
        "Icon": "preferences-plugin",
        "Id": "pmdummybackendplugin",
@ -67,7 +62,6 @@
        "Name[ca@valencia]": "Dorsal fals del gestor de particions del KDE",
        "Name[ca]": "Dorsal fals del gestor de particions del KDE",
        "Name[cs]": "Podpůrná vrstva pro správce diskových oddílů pro KDE",
-        "Name[da]": "KDE-partitionshåndtering med attrap-backend",
        "Name[de]": "KDE-Partitionsverwaltung Dummy-Backend",
        "Name[el]": "KDE Εικονικό σύστημα υποστήριξης διαχειριστή κατατμήσεων",
        "Name[en_GB]": "KDE Partition Manager Dummy Backend",
@ -88,7 +82,6 @@
        "Name[uk]": "Тестовий додаток сервера Керування розділами KDE",
        "Name[x-test]": "xxKDE Partition Manager Dummy Backendxx",
        "Name[zh_CN]": "KDE 分区管理器虚拟后端",
-        "Name[zh_TW]": "KDE 磁碟分割區管理員 (虛設後端)",
        "ServiceTypes": [
            "PartitionManager/Plugin"
        ],
--- a/src/plugins/sfdisk/pmsfdiskbackendplugin.json
+++ b/src/plugins/sfdisk/pmsfdiskbackendplugin.json
@ -8,7 +8,6 @@
                "Name[ca@valencia]": "Andrius Štikonas",
                "Name[ca]": "Andrius Štikonas",
                "Name[cs]": "Andrius Štikonas",
-                "Name[da]": "Andrius Štikonas",
                "Name[de]": "Andrius Štikonas",
                "Name[el]": "Andrius Štikonas",
                "Name[en_GB]": "Andrius Štikonas",
@ -24,13 +23,11 @@
                "Name[pl]": "Andrius Štikonas",
                "Name[pt]": "Andrius Štikonas",
                "Name[pt_BR]": "Andrius Štikonas",
-                "Name[ru]": "Andrius Štikonas",
                "Name[sk]": "Andrius Štikonas",
                "Name[sv]": "Andrius Štikonas",
                "Name[uk]": "Andrius Štikonas",
                "Name[x-test]": "xxAndrius Štikonasxx",
-                "Name[zh_CN]": "Andrius Štikonas",
-                "Name[zh_TW]": "Andrius Štikonas"
+                "Name[zh_CN]": "Andrius Štikonas"
            }
        ],
        "Category": "BackendPlugin",
@ -38,7 +35,6 @@
        "Description[ca@valencia]": "Un dorsal «sfdisk» del gestor de particions del KDE.",
        "Description[ca]": "Un dorsal «sfdisk» del gestor de particions del KDE.",
        "Description[cs]": "Podpůrná vrstva sfdisk pro správce diskových oddílů pro KDE.",
-        "Description[da]": "En KDE-partitionshåndtering med sfdisk-backend.",
        "Description[de]": "Ein sfdisk-Backend für die KDE-Partitionsverwaltung.",
        "Description[el]": "Σύστημα υποστήριξης sfdisk διαχειριστή κατατμήσεων του KDE.",
        "Description[en_GB]": "A KDE Partition Manager sfdisk backend.",
@ -57,7 +53,6 @@
        "Description[sv]": "Ett sfdisk bakgrundsprogram till KDE:s partitionshanterare",
        "Description[uk]": "Додаток sfdisk сервера Керування розділами KDE.",
        "Description[x-test]": "xxA KDE Partition Manager sfdisk backend.xx",
-        "Description[zh_TW]": "使用 sfdisk 作為後端的 KDE 磁碟分割區管理員。",
        "EnabledByDefault": true,
        "Icon": "preferences-plugin",
        "Id": "pmsfdiskbackendplugin",
@ -66,7 +61,6 @@
        "Name[ca@valencia]": "Dorsal «sfdisk» del gestor de particions del KDE",
        "Name[ca]": "Dorsal «sfdisk» del gestor de particions del KDE",
        "Name[cs]": "Podpůrná vrstva sfdisk pro správce diskových oddílů pro KDE",
-        "Name[da]": "KDE-partitionshåndtering med sfdisk-backend",
        "Name[de]": "KDE-Partitionsverwaltung sfdisk-Backend",
        "Name[el]": "KDE Σύστημα υποστήριξης sfdisk διαχειριστή κατατμήσεων",
        "Name[en_GB]": "KDE Partition Manager sfdisk Backend",
@ -85,7 +79,6 @@
        "Name[sv]": "KDE:s partitionshanterare sfdisk bakgrundsprogram",
        "Name[uk]": "Додаток sfdisk сервера Керування розділами KDE",
        "Name[x-test]": "xxKDE Partition Manager sfdisk Backendxx",
-        "Name[zh_TW]": "KDE 磁碟分割區管理員 (sfdisk 後端)",
        "ServiceTypes": [
            "PartitionManager/Plugin"
        ],
--- a/src/plugins/sfdisk/sfdiskbackend.cpp
+++ b/src/plugins/sfdisk/sfdiskbackend.cpp
@ -64,14 +64,7 @@ void SfdiskBackend::initFSSupport()

 QList<Device*> SfdiskBackend::scanDevices(bool excludeReadOnly)
 {
-    return scanDevices(excludeReadOnly ? ScanFlags() : ScanFlag::includeReadOnly);
-}
-
-QList<Device*> SfdiskBackend::scanDevices(const ScanFlags scanFlags)
-{
-    const bool includeReadOnly = scanFlags.testFlag(ScanFlag::includeReadOnly);
-    const bool includeLoopback = scanFlags.testFlag(ScanFlag::includeLoopback);
-
+//  TODO: add another bool option for loopDevices
    QList<Device*> result;
    QStringList deviceNodes;

@ -89,14 +82,11 @@ QList<Device*> SfdiskBackend::scanDevices(const ScanFlags scanFlags)
        const QJsonArray jsonArray = jsonObject[QLatin1String("blockdevices")].toArray();
        for (const auto &deviceLine : jsonArray) {
            QJsonObject deviceObject = deviceLine.toObject();
-            if (! (deviceObject[QLatin1String("type")].toString() == QLatin1String("disk")
-                || (includeLoopback && deviceObject[QLatin1String("type")].toString() == QLatin1String("loop")) ))
-            {
+            if (deviceObject[QLatin1String("type")].toString() != QLatin1String("disk"))
                continue;
-            }

            const QString deviceNode = deviceObject[QLatin1String("name")].toString();
-            if (!includeReadOnly) {
+            if (excludeReadOnly) {
                QString deviceName = deviceNode;
                deviceName.remove(QStringLiteral("/dev/"));
                QFile f(QStringLiteral("/sys/block/%1/ro").arg(deviceName));
@ -117,15 +107,14 @@ QList<Device*> SfdiskBackend::scanDevices(const ScanFlags scanFlags)
                result.append(device);
            }
        }
-        
-    }

-    VolumeManagerDevice::scanDevices(result); // scan all types of VolumeManagerDevices
+        SoftwareRAID::scanSoftwareRAID(result);
+        LvmDevice::scanSystemLVM(result); // LVM scanner needs all other devices, so should be last
+    }

    return result;
 }

-
 /** Create a Device for the given device_node and scan it for partitions.
    @param deviceNode the device node (e.g. "/dev/sda")
    @return the created Device object. callers need to free this.
@ -224,6 +213,8 @@ Device* SfdiskBackend::scanDevice(const QString& deviceNode)
        {
            QList<Device *> availableDevices = scanDevices();

+            LvmDevice::scanSystemLVM(availableDevices);
+
            for (Device *device : qAsConst(availableDevices))
                if (device->deviceNode() == deviceNode)
                    return device;
@ -249,19 +240,18 @@ void SfdiskBackend::scanDevicePartitions(Device& d, const QJsonArray& jsonPartit
        const qint64 start = partitionObject[QLatin1String("start")].toVariant().toLongLong();
        const qint64 size = partitionObject[QLatin1String("size")].toVariant().toLongLong();
        const QString partitionType = partitionObject[QLatin1String("type")].toString();
-        PartitionTable::Flags activeFlags = partitionObject[QLatin1String("bootable")].toBool() ? PartitionTable::Flag::Boot : PartitionTable::Flag::None;
+        PartitionTable::Flags activeFlags = partitionObject[QLatin1String("bootable")].toBool() ? PartitionTable::FlagBoot : PartitionTable::FlagNone;

        if (partitionType == QStringLiteral("C12A7328-F81F-11D2-BA4B-00A0C93EC93B"))
-            activeFlags |= PartitionTable::Flag::Boot;
+            activeFlags |= PartitionTable::FlagBoot;
        else if (partitionType == QStringLiteral("21686148-6449-6E6F-744E-656564454649"))
-            activeFlags |= PartitionTable::Flag::BiosGrub;
+            activeFlags |= PartitionTable::FlagBiosGrub;

        FileSystem::Type type = FileSystem::Type::Unknown;
        type = detectFileSystem(partitionNode);
        PartitionRole::Roles r = PartitionRole::Primary;

-        if ( (d.partitionTable()->type() == PartitionTable::msdos || d.partitionTable()->type() == PartitionTable::msdos_sectorbased) &&
-            ( partitionType == QStringLiteral("5") || partitionType == QStringLiteral("f") ) ) {
+        if ( (d.partitionTable()->type() == PartitionTable::msdos || d.partitionTable()->type() == PartitionTable::msdos_sectorbased) && partitionType.toInt() == 5 ) {
            r = PartitionRole::Extended;
            type = FileSystem::Type::Extended;
        }
@ -327,15 +317,16 @@ bool SfdiskBackend::updateDevicePartitionTable(Device &d, const QJsonObject &jso
    QString tableType = jsonPartitionTable[QLatin1String("label")].toString();
    const PartitionTable::TableType type = PartitionTable::nameToTableType(tableType);

-    qint64 firstUsableSector = 0;
-    qint64 lastUsableSector;
+    qint64 firstUsableSector = 0, lastUsableSector;

-    if (d.type() == Device::Type::Disk_Device) {
+    if ( d.type() == Device::Type::Disk_Device )
+    {
        const DiskDevice* diskDevice = static_cast<const DiskDevice*>(&d);

        lastUsableSector = diskDevice->totalSectors();
    }
-    else if (d.type() == Device::Type::SoftwareRAID_Device) {
+    else if ( d.type() == Device::Type::SoftwareRAID_Device )
+    {
        const SoftwareRAID* raidDevice = static_cast<const SoftwareRAID*>(&d);

        lastUsableSector = raidDevice->totalLogical() - 1;
@ -370,7 +361,6 @@ bool SfdiskBackend::updateDevicePartitionTable(Device &d, const QJsonObject &jso
        else
            maxEntries = 128;
        CoreBackend::setPartitionTableMaxPrimaries(*d.partitionTable(), maxEntries);
-        break;
    }
    default:
        break;
@ -504,11 +494,11 @@ PartitionTable::Flags SfdiskBackend::availableFlags(PartitionTable::TableType ty
    if (type == PartitionTable::gpt) {
        // These are not really flags but for now keep them for compatibility
        // We should implement changing partition type
-        flags = PartitionTable::Flag::BiosGrub |
-                PartitionTable::Flag::Boot;
+        flags = PartitionTable::Flag::FlagBiosGrub |
+                PartitionTable::Flag::FlagBoot;
    }
    else if (type == PartitionTable::msdos || type == PartitionTable::msdos_sectorbased)
-        flags = PartitionTable::Flag::Boot;
+        flags = PartitionTable::FlagBoot;

    return flags;
 }
--- a/src/plugins/sfdisk/sfdiskbackend.h
+++ b/src/plugins/sfdisk/sfdiskbackend.h
@ -47,7 +47,6 @@ public:
    void initFSSupport() override;

    QList<Device*> scanDevices(bool excludeReadOnly = false) override;
-    QList<Device*> scanDevices(const ScanFlags scanFlags) override;
    std::unique_ptr<CoreBackendDevice> openDevice(const Device& d) override;
    std::unique_ptr<CoreBackendDevice> openDeviceExclusive(const Device& d) override;
    bool closeDevice(std::unique_ptr<CoreBackendDevice> coreDevice) override;
--- a/src/plugins/sfdisk/sfdiskpartitiontable.cpp
+++ b/src/plugins/sfdisk/sfdiskpartitiontable.cpp
@ -227,13 +227,13 @@ bool SfdiskPartitionTable::setFlag(Report& report, const Partition& partition, P
    if (m_device->partitionTable()->type() == PartitionTable::TableType::msdos ||
         m_device->partitionTable()->type() == PartitionTable::TableType::msdos_sectorbased) {
        // We only allow setting one active partition per device
-        if (flag == PartitionTable::Flag::Boot && state == true) {
+        if (flag == PartitionTable::Flag::FlagBoot && state == true) {
            ExternalCommand sfdiskCommand(report, QStringLiteral("sfdisk"), { QStringLiteral("--activate"), m_device->deviceNode(), QString::number(partition.number()) } );
            if (sfdiskCommand.run(-1) && sfdiskCommand.exitCode() == 0)
                return true;
            else
                return false;
-        } else if (flag == PartitionTable::Flag::Boot && state == false) {
+        } else if (flag == PartitionTable::Flag::FlagBoot && state == false) {
            ExternalCommand sfdiskCommand(report, QStringLiteral("sfdisk"), { QStringLiteral("--activate"), m_device->deviceNode(), QStringLiteral("-") } );
            if (sfdiskCommand.run(-1) && sfdiskCommand.exitCode() == 0)
                return true;
@ -242,7 +242,7 @@ bool SfdiskPartitionTable::setFlag(Report& report, const Partition& partition, P
        }
    }

-    if (flag == PartitionTable::Flag::Boot && state == true) {
+    if (flag == PartitionTable::Flag::FlagBoot && state == true) {
        ExternalCommand sfdiskCommand(report, QStringLiteral("sfdisk"), { QStringLiteral("--part-type"), m_device->deviceNode(), QString::number(partition.number()),
                QStringLiteral("C12A7328-F81F-11D2-BA4B-00A0C93EC93B") } );
        if (sfdiskCommand.run(-1) && sfdiskCommand.exitCode() == 0)
@ -250,10 +250,10 @@ bool SfdiskPartitionTable::setFlag(Report& report, const Partition& partition, P
        else
            return false;
    }
-    if (flag == PartitionTable::Flag::Boot && state == false)
+    if (flag == PartitionTable::Flag::FlagBoot && state == false)
        setPartitionSystemType(report, partition);

-    if (flag == PartitionTable::Flag::BiosGrub && state == true) {
+    if (flag == PartitionTable::Flag::FlagBiosGrub && state == true) {
        ExternalCommand sfdiskCommand(report, QStringLiteral("sfdisk"), { QStringLiteral("--part-type"), m_device->deviceNode(), QString::number(partition.number()),
                QStringLiteral("21686148-6449-6E6F-744E-656564454649") } );
        if (sfdiskCommand.run(-1) && sfdiskCommand.exitCode() == 0)
@ -261,7 +261,7 @@ bool SfdiskPartitionTable::setFlag(Report& report, const Partition& partition, P
        else
            return false;
    }
-    if (flag == PartitionTable::Flag::BiosGrub && state == false)
+    if (flag == PartitionTable::Flag::FlagBiosGrub && state == false)
        setPartitionSystemType(report, partition);

    return true;
--- a/src/util/CMakeLists.txt
+++ b/src/util/CMakeLists.txt
@ -45,7 +45,7 @@ target_link_libraries(kpmcore_externalcommand
    qca-qt5
    Qt5::Core
    Qt5::DBus
-    KF5::AuthCore
+    KF5::Auth
    KF5::I18n
 )

--- a/src/util/capacity.h
+++ b/src/util/capacity.h
@ -36,11 +36,11 @@ class LIBKPMCORE_EXPORT Capacity
 {
 public:
    /** Units we can deal with */
-    enum class Unit : uint8_t {Byte, KiB, MiB, GiB, TiB, PiB, EiB, ZiB, YiB };
+    enum Unit : uint { Byte, KiB, MiB, GiB, TiB, PiB, EiB, ZiB, YiB };
    /** Type of capacity to print */
-    enum class Type : uint8_t { Used, Available, Total };
+    enum class Type { Used, Available, Total };
    /** Flags for printing */
-    enum class Flag : uint8_t { NoFlags = 0, AppendUnit = 1, AppendBytes = 2 };
+    enum class Flag { NoFlags = 0, AppendUnit = 1, AppendBytes = 2 };
    Q_DECLARE_FLAGS(Flags, Flag)

 public:
--- a/src/util/externalcommand.cpp
+++ b/src/util/externalcommand.cpp
@ -183,7 +183,7 @@ bool ExternalCommand::start(int timeout)
    return rval;
 }

-bool ExternalCommand::copyBlocks(const CopySource& source, CopyTarget& target)
+bool ExternalCommand::copyBlocks(CopySource& source, CopyTarget& target)
 {
    bool rval = true;
    const qint64 blockSize = 10 * 1024 * 1024; // number of bytes per block to copy
@ -293,8 +293,6 @@ bool ExternalCommand::writeData(Report& commandReport, const QByteArray& buffer,

 bool ExternalCommand::write(const QByteArray& input)
 {
-    if ( qEnvironmentVariableIsSet( "KPMCORE_DEBUG" ))
-        qDebug() << "Command input:" << QString::fromLocal8Bit(input);
    d->m_Input = input;
    return true;
 }
@ -377,7 +375,7 @@ void ExternalCommand::setExitCode(int i)
 bool ExternalCommand::startHelper()
 {
    if (!QDBusConnection::systemBus().isConnected()) {
-        qWarning() << "Could not connect to DBus system bus";
+        qWarning() << "Could not connect to DBus session bus";
        return false;
    }
    QDBusInterface iface(QStringLiteral("org.kde.kpmcore.helperinterface"), QStringLiteral("/Helper"), QStringLiteral("org.kde.kpmcore.externalcommand"), QDBusConnection::systemBus());
@ -450,7 +448,7 @@ quint64 ExternalCommand::getNonce(QDBusInterface& iface)
        QDBusPendingCall pcall = iface.asyncCall(QStringLiteral("getNonce"));
        QDBusPendingCallWatcher *watcher = new QDBusPendingCallWatcher(pcall);
        QEventLoop loop;
-        quint64 rval = 0;
+        unsigned long long rval = 0;

        auto exitLoop = [&] (QDBusPendingCallWatcher *watcher) {
            loop.exit();
@ -458,7 +456,7 @@ quint64 ExternalCommand::getNonce(QDBusInterface& iface)
            if (watcher->isError())
                qWarning() << watcher->error();
            else {
-                QDBusPendingReply<quint64> reply = *watcher;
+                QDBusPendingReply<unsigned long long> reply = *watcher;
                rval = reply;
            }
        };
--- a/src/util/externalcommand.h
+++ b/src/util/externalcommand.h
@ -68,8 +68,8 @@ public:
    ~ExternalCommand();

 public:
-    bool copyBlocks(const CopySource& source, CopyTarget& target);
-    bool writeData(Report& commandReport, const QByteArray& buffer, const QString& deviceNode, const quint64 firstByte); // same as copyBlocks but from QByteArray
+    bool copyBlocks(CopySource& source, CopyTarget& target);
+    bool writeData(Report& report, const QByteArray& buffer, const QString& deviceNode, const quint64 firstByte); // same as copyBlocks but from QByteArray

    /**< @param cmd the command to run */
    void setCommand(const QString& cmd);
--- a/src/util/externalcommandhelper.cpp
+++ b/src/util/externalcommandhelper.cpp
@ -90,7 +90,7 @@ ActionReply ExternalCommandHelper::init(const QVariantMap& args)
 */
 quint64 ExternalCommandHelper::getNonce()
 {
-    const quint64 nonce = m_Generator.generate();
+    quint64 nonce = m_Generator.generate();
    m_Nonces.insert(nonce);
    return nonce;
 }
@ -102,7 +102,7 @@ quint64 ExternalCommandHelper::getNonce()
    @param size the number of bytes to read
    @return true on success
 */
-bool ExternalCommandHelper::readData(const QString& sourceDevice, QByteArray& buffer, const qint64 offset, const qint64 size)
+bool ExternalCommandHelper::readData(const QString& sourceDevice, QByteArray& buffer, qint64 offset, qint64 size)
 {
    QFile device(sourceDevice);

@ -132,10 +132,9 @@ bool ExternalCommandHelper::readData(const QString& sourceDevice, QByteArray& bu
    @param offset offset where to begin writing
    @return true on success
 */
-bool ExternalCommandHelper::writeData(const QString &targetDevice, const QByteArray& buffer, const qint64 offset)
+bool ExternalCommandHelper::writeData(const QString &targetDevice, const QByteArray& buffer, qint64 offset)
 {
    QFile device(targetDevice);
-
    if (!device.open(QIODevice::WriteOnly | QIODevice::Append | QIODevice::Unbuffered)) {
        qCritical() << xi18n("Could not open device <filename>%1</filename> for writing.", targetDevice);
        return false;
@ -150,7 +149,6 @@ bool ExternalCommandHelper::writeData(const QString &targetDevice, const QByteAr
        qCritical() << xi18n("Could not write to device <filename>%1</filename>.", targetDevice);
        return false;
    }
-
    return true;
 }

--- a/src/util/externalcommandhelper.h
+++ b/src/util/externalcommandhelper.h
@ -42,8 +42,8 @@ Q_SIGNALS:
    void quit();

 public:
-    bool readData(const QString& sourceDevice, QByteArray& buffer, const qint64 offset, const qint64 size);
-    bool writeData(const QString& targetDevice, const QByteArray& buffer, const qint64 offset);
+    bool readData(const QString& sourceDevice, QByteArray& buffer, qint64 offset, qint64 size);
+    bool writeData(const QString& targetDevice, const QByteArray& buffer, qint64 offset);

 public Q_SLOTS:
    ActionReply init(const QVariantMap& args);
--- a/src/util/org.kde.kpmcore.externalcommand.actions
+++ b/src/util/org.kde.kpmcore.externalcommand.actions
@ -6,7 +6,6 @@ Name=Start external command daemon
 Name[ca]=Inicia el dimoni d'ordres externes
 Name[ca@valencia]=Inicia el dimoni d'ordres externes
 Name[cs]=Spustit démona externích příkazů
-Name[da]=Start ekstern kommando-dæmon
 Name[de]=Externen Befehlsdienst starten
 Name[el]=Εκκίνηση διεργασίας με εξωτερική εντολή
 Name[en_GB]=Start external command daemon
@ -20,18 +19,15 @@ Name[lt]=Paleisti išorinių komandų tarnybą
 Name[nl]=Start externe opdrachtdaemon
 Name[pl]=Rozpocznij usługę zewnętrznego polecenia
 Name[pt]=Iniciar o servidor de comandos externos
-Name[pt_BR]=Iniciar comando externo do daemon
 Name[sk]=Spustiť externé démony príkazov
 Name[sv]=Starta extern kommandodemon
 Name[uk]=Запуск фонової служби зовнішньої команди
 Name[x-test]=xxStart external command daemonxx
-Name[zh_TW]=啟動外部指令守護程式
 Description=Administrative privileges are required to manage disks
 Description[ast]=Ríquense los privilexos alministrativos pa xestionar discos
 Description[ca]=Es requereixen privilegis d'administrador per gestionar discs
 Description[ca@valencia]=Es requereixen privilegis d'administrador per gestionar discs
 Description[cs]=Pro správu disků jsou potřeba práva administrátora
-Description[da]=Der kræves administrative rettigheder for at håndtere diske
 Description[de]=Systemverwalterrechte sind zur Verwaltung von Festplatten erforderlich
 Description[el]=Απαιτούνται δικαιώματα διαχειριστή για τη διαχείριση δίσκων
 Description[en_GB]=Administrative privileges are required to manage disks
@ -49,6 +45,5 @@ Description[pt_BR]=São necessários privilégios administrativos para gerenciar
 Description[sv]=Administratörsprivilegier krävs för att hantera diskar
 Description[uk]=Для керування дисками потрібні права доступу адміністратора (root)
 Description[x-test]=xxAdministrative privileges are required to manage disksxx
-Description[zh_TW]=管理硬碟需要管理員權限
 Policy=auth_admin
 Persistence=session
--- a/test/testexternalcommand.cpp
+++ b/test/testexternalcommand.cpp
@ -29,7 +29,7 @@
 class runcmd : public QThread {
 public:

-void run() override
+void run()
 {
    ExternalCommand blkidCmd(QStringLiteral("blkid"), {});
    blkidCmd.run();
@ -41,7 +41,7 @@ void run() override
 class runcmd2 : public QThread {
 public:

-void run() override
+void run()
 {
    ExternalCommand lsblkCmd(QStringLiteral("lsblk"), { QStringLiteral("--nodeps"), QStringLiteral("--json") });
    lsblkCmd.run();
--- a/test/testlist.cpp
+++ b/test/testlist.cpp
@ -86,7 +86,7 @@ int main( int argc, char **argv )
        return 1;
    }

-    const auto devices = backend->scanDevices(ScanFlag::includeLoopback);
+    const auto devices = backend->scanDevices();
    qDebug() << "Found" << devices.length() << "devices.";
    for (const auto pdev : devices)
    {