Fix more minor clang issues.
This commit is contained in:
parent
f7e5f7c7bf
commit
5433294a5b
|
@ -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(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(const Partition& other, PartitionNode* parent = nullptr);
|
||||||
Partition& operator=(const Partition&);
|
Partition& operator=(const Partition&);
|
||||||
|
|
|
@ -97,7 +97,7 @@ public:
|
||||||
public:
|
public:
|
||||||
PartitionTable(TableType type, qint64 firstUsable, qint64 lastUsable);
|
PartitionTable(TableType type, qint64 firstUsable, qint64 lastUsable);
|
||||||
PartitionTable(const PartitionTable& other);
|
PartitionTable(const PartitionTable& other);
|
||||||
~PartitionTable();
|
~PartitionTable() override;
|
||||||
|
|
||||||
public:
|
public:
|
||||||
PartitionNode* parent() override {
|
PartitionNode* parent() override {
|
||||||
|
|
|
@ -41,7 +41,7 @@ class LIBKPMCORE_EXPORT luks : public FileSystem
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
luks(qint64 firstsector, qint64 lastsector, qint64 sectorsused, const QString& label);
|
luks(qint64 firstsector, qint64 lastsector, qint64 sectorsused, const QString& label);
|
||||||
virtual ~luks();
|
~luks() override;
|
||||||
|
|
||||||
public:
|
public:
|
||||||
void init() override;
|
void init() override;
|
||||||
|
@ -171,7 +171,7 @@ public:
|
||||||
void getMapperName(const QString& deviceNode);
|
void getMapperName(const QString& deviceNode);
|
||||||
void getLuksInfo(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 outerUuid() const;
|
||||||
|
|
||||||
QString mapperName() const { return m_MapperName; }
|
QString mapperName() const { return m_MapperName; }
|
||||||
|
|
|
@ -155,10 +155,10 @@ public:
|
||||||
static QList<LvmPV> getPVinNode(const PartitionNode* parent);
|
static QList<LvmPV> getPVinNode(const PartitionNode* parent);
|
||||||
static QList<LvmPV> getPVs(const QList<Device*>& devices);
|
static QList<LvmPV> getPVs(const QList<Device*>& devices);
|
||||||
|
|
||||||
qint64 allocatedPE() const { return m_AllocatedPE; };
|
qint64 allocatedPE() const { return m_AllocatedPE; }
|
||||||
qint64 freePE() const { return m_TotalPE - m_AllocatedPE; };
|
qint64 freePE() const { return m_TotalPE - m_AllocatedPE; }
|
||||||
qint64 totalPE() const { return m_TotalPE; };
|
qint64 totalPE() const { return m_TotalPE; }
|
||||||
qint64 peSize() const { return m_PESize; };
|
qint64 peSize() const { return m_PESize; }
|
||||||
|
|
||||||
private:
|
private:
|
||||||
void getPESize(const QString& deviceNode); // return PE size in bytes
|
void getPESize(const QString& deviceNode); // return PE size in bytes
|
||||||
|
|
|
@ -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 <filename>%1</filename>.", deviceNode);
|
report.line() << xi18nc("@info:progress", "Updating boot sector for NTFS file system on partition <filename>%1</filename>.", deviceNode);
|
||||||
|
|
||||||
quint32 n = firstSector();
|
qint64 n = firstSector();
|
||||||
char* s = reinterpret_cast<char*>(&n);
|
char* s = reinterpret_cast<char*>(&n);
|
||||||
|
|
||||||
#if Q_BYTE_ORDER == Q_BIG_ENDIAN
|
#if Q_BYTE_ORDER == Q_BIG_ENDIAN
|
||||||
|
|
|
@ -30,7 +30,7 @@ class CoreBackendPartitionTable;
|
||||||
|
|
||||||
class DummyDevice : public CoreBackendDevice
|
class DummyDevice : public CoreBackendDevice
|
||||||
{
|
{
|
||||||
Q_DISABLE_COPY(DummyDevice);
|
Q_DISABLE_COPY(DummyDevice)
|
||||||
|
|
||||||
public:
|
public:
|
||||||
DummyDevice(const QString& device_node);
|
DummyDevice(const QString& device_node);
|
||||||
|
|
|
@ -27,7 +27,7 @@ class Report;
|
||||||
|
|
||||||
class DummyPartition : public CoreBackendPartition
|
class DummyPartition : public CoreBackendPartition
|
||||||
{
|
{
|
||||||
Q_DISABLE_COPY(DummyPartition);
|
Q_DISABLE_COPY(DummyPartition)
|
||||||
|
|
||||||
public:
|
public:
|
||||||
DummyPartition();
|
DummyPartition();
|
||||||
|
|
|
@ -32,7 +32,7 @@ class CoreBackendPartitionTable;
|
||||||
|
|
||||||
class LibPartedDevice : public CoreBackendDevice
|
class LibPartedDevice : public CoreBackendDevice
|
||||||
{
|
{
|
||||||
Q_DISABLE_COPY(LibPartedDevice);
|
Q_DISABLE_COPY(LibPartedDevice)
|
||||||
|
|
||||||
public:
|
public:
|
||||||
LibPartedDevice(const QString& deviceNode);
|
LibPartedDevice(const QString& deviceNode);
|
||||||
|
|
|
@ -29,7 +29,7 @@ class Report;
|
||||||
|
|
||||||
class LibPartedPartition : public CoreBackendPartition
|
class LibPartedPartition : public CoreBackendPartition
|
||||||
{
|
{
|
||||||
Q_DISABLE_COPY(LibPartedPartition);
|
Q_DISABLE_COPY(LibPartedPartition)
|
||||||
|
|
||||||
public:
|
public:
|
||||||
LibPartedPartition(PedPartition* ped_partition);
|
LibPartedPartition(PedPartition* ped_partition);
|
||||||
|
|
|
@ -46,7 +46,7 @@ LIBKPMCORE_EXPORT KAboutData aboutKPMcore();
|
||||||
|
|
||||||
/** Pointer to the file system (which might be inside LUKS container) contained in the partition
|
/** Pointer to the file system (which might be inside LUKS container) contained in the partition
|
||||||
* @param p Partition where we look for file system
|
* @param p Partition where we look for file system
|
||||||
* @return pointer to the FileSystem
|
* @param fs inner FileSystem object
|
||||||
*/
|
*/
|
||||||
template <typename T>
|
template <typename T>
|
||||||
inline LIBKPMCORE_EXPORT void innerFS (const Partition* p, T& fs)
|
inline LIBKPMCORE_EXPORT void innerFS (const Partition* p, T& fs)
|
||||||
|
|
Loading…
Reference in New Issue