From 5433294a5b708cc7a538c9adc750dbe34fda1f72 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andrius=20=C5=A0tikonas?= Date: Mon, 11 Sep 2017 00:29:30 +0100 Subject: [PATCH] Fix more minor clang issues. --- src/core/partition.h | 2 +- src/core/partitiontable.h | 2 +- src/fs/luks.h | 4 ++-- src/fs/lvm2_pv.h | 8 ++++---- src/fs/ntfs.cpp | 2 +- src/plugins/dummy/dummydevice.h | 2 +- src/plugins/dummy/dummypartition.h | 2 +- src/plugins/libparted/libparteddevice.h | 2 +- src/plugins/libparted/libpartedpartition.h | 2 +- src/util/helpers.h | 2 +- 10 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/core/partition.h b/src/core/partition.h index 95469aa..ec67a18 100644 --- a/src/core/partition.h +++ b/src/core/partition.h @@ -114,7 +114,7 @@ public: }; 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 = StateNone); - ~Partition(); + ~Partition() override; Partition(const Partition& other, PartitionNode* parent = nullptr); Partition& operator=(const Partition&); diff --git a/src/core/partitiontable.h b/src/core/partitiontable.h index 0c92d3f..60acf9c 100644 --- a/src/core/partitiontable.h +++ b/src/core/partitiontable.h @@ -97,7 +97,7 @@ public: public: PartitionTable(TableType type, qint64 firstUsable, qint64 lastUsable); PartitionTable(const PartitionTable& other); - ~PartitionTable(); + ~PartitionTable() override; public: PartitionNode* parent() override { diff --git a/src/fs/luks.h b/src/fs/luks.h index 7f9fb08..737c5f1 100644 --- a/src/fs/luks.h +++ b/src/fs/luks.h @@ -41,7 +41,7 @@ class LIBKPMCORE_EXPORT luks : public FileSystem { public: luks(qint64 firstsector, qint64 lastsector, qint64 sectorsused, const QString& label); - virtual ~luks(); + ~luks() override; public: void init() override; @@ -171,7 +171,7 @@ public: void getMapperName(const QString& deviceNode); void getLuksInfo(const QString& deviceNode); - FileSystem* innerFS() const { return m_innerFs; }; // avoid calling this unless necessary + FileSystem* innerFS() const { return m_innerFs; } // avoid calling this unless necessary QString outerUuid() const; QString mapperName() const { return m_MapperName; } diff --git a/src/fs/lvm2_pv.h b/src/fs/lvm2_pv.h index e053204..895d26e 100644 --- a/src/fs/lvm2_pv.h +++ b/src/fs/lvm2_pv.h @@ -155,10 +155,10 @@ public: static QList getPVinNode(const PartitionNode* parent); static QList getPVs(const QList& devices); - qint64 allocatedPE() const { return m_AllocatedPE; }; - qint64 freePE() const { return m_TotalPE - m_AllocatedPE; }; - qint64 totalPE() const { return m_TotalPE; }; - qint64 peSize() const { return m_PESize; }; + qint64 allocatedPE() const { return m_AllocatedPE; } + qint64 freePE() const { return m_TotalPE - m_AllocatedPE; } + qint64 totalPE() const { return m_TotalPE; } + qint64 peSize() const { return m_PESize; } private: void getPESize(const QString& deviceNode); // return PE size in bytes diff --git a/src/fs/ntfs.cpp b/src/fs/ntfs.cpp index 293491b..7e40ae2 100644 --- a/src/fs/ntfs.cpp +++ b/src/fs/ntfs.cpp @@ -181,7 +181,7 @@ bool ntfs::updateBootSector(Report& report, const QString& deviceNode) const { report.line() << xi18nc("@info:progress", "Updating boot sector for NTFS file system on partition %1.", deviceNode); - quint32 n = firstSector(); + qint64 n = firstSector(); char* s = reinterpret_cast(&n); #if Q_BYTE_ORDER == Q_BIG_ENDIAN diff --git a/src/plugins/dummy/dummydevice.h b/src/plugins/dummy/dummydevice.h index b46b129..bdf8e32 100644 --- a/src/plugins/dummy/dummydevice.h +++ b/src/plugins/dummy/dummydevice.h @@ -30,7 +30,7 @@ class CoreBackendPartitionTable; class DummyDevice : public CoreBackendDevice { - Q_DISABLE_COPY(DummyDevice); + Q_DISABLE_COPY(DummyDevice) public: DummyDevice(const QString& device_node); diff --git a/src/plugins/dummy/dummypartition.h b/src/plugins/dummy/dummypartition.h index 293a80b..d560fe8 100644 --- a/src/plugins/dummy/dummypartition.h +++ b/src/plugins/dummy/dummypartition.h @@ -27,7 +27,7 @@ class Report; class DummyPartition : public CoreBackendPartition { - Q_DISABLE_COPY(DummyPartition); + Q_DISABLE_COPY(DummyPartition) public: DummyPartition(); diff --git a/src/plugins/libparted/libparteddevice.h b/src/plugins/libparted/libparteddevice.h index 2833169..5958844 100644 --- a/src/plugins/libparted/libparteddevice.h +++ b/src/plugins/libparted/libparteddevice.h @@ -32,7 +32,7 @@ class CoreBackendPartitionTable; class LibPartedDevice : public CoreBackendDevice { - Q_DISABLE_COPY(LibPartedDevice); + Q_DISABLE_COPY(LibPartedDevice) public: LibPartedDevice(const QString& deviceNode); diff --git a/src/plugins/libparted/libpartedpartition.h b/src/plugins/libparted/libpartedpartition.h index f03cd54..60b61a1 100644 --- a/src/plugins/libparted/libpartedpartition.h +++ b/src/plugins/libparted/libpartedpartition.h @@ -29,7 +29,7 @@ class Report; class LibPartedPartition : public CoreBackendPartition { - Q_DISABLE_COPY(LibPartedPartition); + Q_DISABLE_COPY(LibPartedPartition) public: LibPartedPartition(PedPartition* ped_partition); diff --git a/src/util/helpers.h b/src/util/helpers.h index d309f98..1b38633 100644 --- a/src/util/helpers.h +++ b/src/util/helpers.h @@ -46,7 +46,7 @@ LIBKPMCORE_EXPORT KAboutData aboutKPMcore(); /** Pointer to the file system (which might be inside LUKS container) contained in the partition * @param p Partition where we look for file system - * @return pointer to the FileSystem + * @param fs inner FileSystem object */ template inline LIBKPMCORE_EXPORT void innerFS (const Partition* p, T& fs)