andrius
/
kpmcore
1
0
Fork 0
Code Pull Requests Releases Activity

Make Filesystem::create non-const.

This commit is contained in:
Andrius Štikonas 2016-09-05 12:10:56 +01:00
parent b3e82d7c75
commit d83ec394b1
47 changed files with 49 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/fs/btrfs.cpp
View File

@ -126,7 +126,7 @@ bool btrfs::check(Report& report, const QString& deviceNode) const
return cmd.run(-1) && cmd.exitCode() == 0;
}
bool btrfs::create(Report& report, const QString& deviceNode) const
bool btrfs::create(Report& report, const QString& deviceNode)
{
ExternalCommand cmd(report, QStringLiteral("mkfs.btrfs"), { QStringLiteral("--force"), deviceNode });
return cmd.run(-1) && cmd.exitCode() == 0;

2
src/fs/btrfs.h
View File

@ -45,7 +45,7 @@ public:
qint64 readUsedCapacity(const QString& deviceNode) const override;
bool check(Report& report, const QString& deviceNode) const override;
bool create(Report& report, const QString& deviceNode) const override;
bool create(Report& report, const QString& deviceNode) override;
bool resize(Report& report, const QString& deviceNode, qint64 length) const override;
bool resizeOnline(Report& report, const QString& deviceNode, const QString& mountPoint, qint64 length) const override;
bool writeLabel(Report& report, const QString& deviceNode, const QString& newLabel) override;

2
src/fs/exfat.cpp
View File

@ -98,7 +98,7 @@ bool exfat::check(Report& report, const QString& deviceNode) const
return cmd.run(-1) && cmd.exitCode() == 0;
}
bool exfat::create(Report& report, const QString& deviceNode) const
bool exfat::create(Report& report, const QString& deviceNode)
{
ExternalCommand cmd(report, QStringLiteral("mkfs.exfat"), { deviceNode });
return cmd.run(-1) && cmd.exitCode() == 0;

2
src/fs/exfat.h
View File

@ -44,7 +44,7 @@ public:
// qint64 readUsedCapacity(const QString& deviceNode) const override;
bool check(Report& report, const QString& deviceNode) const override;
bool create(Report& report, const QString& deviceNode) const override;
bool create(Report& report, const QString& deviceNode) override;
// bool resize(Report& report, const QString& deviceNode, qint64 length) const override;
bool writeLabel(Report& report, const QString& deviceNode, const QString& newLabel) override;
bool updateUUID(Report& report, const QString& deviceNode) const override;

2
src/fs/ext2.cpp
View File

@ -131,7 +131,7 @@ bool ext2::check(Report& report, const QString& deviceNode) const
return cmd.run(-1) && (cmd.exitCode() == 0 || cmd.exitCode() == 1 || cmd.exitCode() == 2 || cmd.exitCode() == 256);
}
bool ext2::create(Report& report, const QString& deviceNode) const
bool ext2::create(Report& report, const QString& deviceNode)
{
ExternalCommand cmd(report, QStringLiteral("mkfs.ext2"), { QStringLiteral("-qF"), deviceNode });
return cmd.run(-1) && cmd.exitCode() == 0;

2
src/fs/ext2.h
View File

@ -44,7 +44,7 @@ public:
qint64 readUsedCapacity(const QString& deviceNode) const override;
bool check(Report& report, const QString& deviceNode) const override;
bool create(Report& report, const QString& deviceNode) const override;
bool create(Report& report, const QString& deviceNode) override;
bool resize(Report& report, const QString& deviceNode, qint64 length) const override;
bool writeLabel(Report& report, const QString& deviceNode, const QString& newLabel) override;
bool updateUUID(Report& report, const QString& deviceNode) const override;

2
src/fs/ext3.cpp
View File

@ -34,7 +34,7 @@ qint64 ext3::maxCapacity() const
return 16 * Capacity::unitFactor(Capacity::Byte, Capacity::TiB) - Capacity::unitFactor(Capacity::Byte, Capacity::MiB);
}
bool ext3::create(Report& report, const QString& deviceNode) const
bool ext3::create(Report& report, const QString& deviceNode)
{
ExternalCommand cmd(report, QStringLiteral("mkfs.ext3"), QStringList() << QStringLiteral("-qF") << deviceNode);
return cmd.run(-1) && cmd.exitCode() == 0;

2
src/fs/ext3.h
View File

@ -43,7 +43,7 @@ public:
ext3(qint64 firstsector, qint64 lastsector, qint64 sectorsused, const QString& label);
public:
bool create(Report& report, const QString& deviceNode) const override;
bool create(Report& report, const QString& deviceNode) override;
bool resizeOnline(Report& report, const QString& deviceNode, const QString& mountPoint, qint64 length) const override;
qint64 maxCapacity() const override;

2
src/fs/ext4.cpp
View File

@ -34,7 +34,7 @@ qint64 ext4::maxCapacity() const
return Capacity::unitFactor(Capacity::Byte, Capacity::EiB);
}
bool ext4::create(Report& report, const QString& deviceNode) const
bool ext4::create(Report& report, const QString& deviceNode)
{
ExternalCommand cmd(report, QStringLiteral("mkfs.ext4"), QStringList() << QStringLiteral("-qF") << deviceNode);
return cmd.run(-1) && cmd.exitCode() == 0;

2
src/fs/ext4.h
View File

@ -43,7 +43,7 @@ public:
ext4(qint64 firstsector, qint64 lastsector, qint64 sectorsused, const QString& label);
public:
bool create(Report& report, const QString& deviceNode) const override;
bool create(Report& report, const QString& deviceNode) override;
bool resizeOnline(Report& report, const QString& deviceNode, const QString& mountPoint, qint64 length) const override;
qint64 maxCapacity() const override;

2
src/fs/extended.cpp
View File

@ -29,7 +29,7 @@ extended::extended(qint64 firstsector, qint64 lastsector, qint64 sectorsused, co
{
}
bool extended::create(Report&, const QString&) const
bool extended::create(Report&, const QString&)
{
return true;
}

2
src/fs/extended.h
View File

@ -44,7 +44,7 @@ public:
public:
bool create(Report&, const QString&) const override;
bool create(Report&, const QString&) override;
CommandSupportType supportCreate() const override {
return m_Create;

2
src/fs/f2fs.cpp
View File

@ -113,7 +113,7 @@ bool f2fs::check(Report& report, const QString& deviceNode) const
return cmd.run(-1) && cmd.exitCode() == 0;
}
bool f2fs::create(Report& report, const QString& deviceNode) const
bool f2fs::create(Report& report, const QString& deviceNode)
{
ExternalCommand cmd(report, QStringLiteral("mkfs.f2fs"), { deviceNode });
return cmd.run(-1) && cmd.exitCode() == 0;

2
src/fs/f2fs.h
View File

@ -44,7 +44,7 @@ public:
// qint64 readUsedCapacity(const QString& deviceNode) const override;
bool check(Report& report, const QString& deviceNode) const override;
bool create(Report& report, const QString& deviceNode) const override;
bool create(Report& report, const QString& deviceNode) override;
// qint64 readUsedCapacity(const QString& deviceNode) const override;
// bool resize(Report& report, const QString& deviceNode, qint64 length) const override;
// bool writeLabel(Report& report, const QString& deviceNode, const QString& newLabel) override;

2
src/fs/fat16.cpp
View File

@ -144,7 +144,7 @@ bool fat16::check(Report& report, const QString& deviceNode) const
return cmd.run(-1) && cmd.exitCode() == 0;
}
bool fat16::create(Report& report, const QString& deviceNode) const
bool fat16::create(Report& report, const QString& deviceNode)
{
ExternalCommand cmd(report, QStringLiteral("mkfs.msdos"), { QStringLiteral("-F16"), QStringLiteral("-I"), QStringLiteral("-v"), deviceNode });
return cmd.run(-1) && cmd.exitCode() == 0;

2
src/fs/fat16.h
View File

@ -44,7 +44,7 @@ public:
qint64 readUsedCapacity(const QString& deviceNode) const override;
bool check(Report& report, const QString& deviceNode) const override;
bool create(Report& report, const QString& deviceNode) const override;
bool create(Report& report, const QString& deviceNode) override;
bool updateUUID(Report& report, const QString& deviceNode) const override;
bool writeLabel(Report& report, const QString& deviceNode, const QString& newLabel) override;

2
src/fs/fat32.cpp
View File

@ -40,7 +40,7 @@ qint64 fat32::maxCapacity() const
return 16 * Capacity::unitFactor(Capacity::Byte, Capacity::TiB) - Capacity::unitFactor(Capacity::Byte, Capacity::MiB);
}
bool fat32::create(Report& report, const QString& deviceNode) const
bool fat32::create(Report& report, const QString& deviceNode)
{
ExternalCommand cmd(report, QStringLiteral("mkfs.msdos"), { QStringLiteral("-F32"), QStringLiteral("-I"), QStringLiteral("-v"), deviceNode });
return cmd.run(-1) && cmd.exitCode() == 0;

2
src/fs/fat32.h
View File

@ -43,7 +43,7 @@ public:
fat32(qint64 firstsector, qint64 lastsector, qint64 sectorsused, const QString& label);
public:
bool create(Report& report, const QString& deviceNode) const override;
bool create(Report& report, const QString& deviceNode) override;
bool updateUUID(Report& report, const QString& deviceNode) const override;
qint64 minCapacity() const override;

2
src/fs/filesystem.cpp
View File

@ -132,7 +132,7 @@ QString FileSystem::readLabel(const QString& deviceNode) const
@param deviceNode the device node for the Partition to create the FileSystem on
@return true if successful
*/
bool FileSystem::create(Report& report, const QString& deviceNode) const
bool FileSystem::create(Report& report, const QString& deviceNode)
{
Q_UNUSED(report);
Q_UNUSED(deviceNode);

2
src/fs/filesystem.h
View File

@ -111,7 +111,7 @@ public:
virtual void scan(const QString& deviceNode);
virtual qint64 readUsedCapacity(const QString& deviceNode) const;
virtual QString readLabel(const QString& deviceNode) const;
virtual bool create(Report& report, const QString& deviceNode) const;
virtual bool create(Report& report, const QString& deviceNode);
virtual bool resize(Report& report, const QString& deviceNode, qint64 newLength) const;
virtual bool resizeOnline(Report& report, const QString& deviceNode, const QString& mountPoint, qint64 newLength) const;
virtual bool move(Report& report, const QString& deviceNode, qint64 newStartSector) const;

2
src/fs/hfs.cpp
View File

@ -87,7 +87,7 @@ bool hfs::check(Report& report, const QString& deviceNode) const
return cmd.run(-1) && cmd.exitCode() == 0;
}
bool hfs::create(Report& report, const QString& deviceNode) const
bool hfs::create(Report& report, const QString& deviceNode)
{
ExternalCommand cmd(report, QStringLiteral("hformat"), { deviceNode });
return cmd.run(-1) && cmd.exitCode() == 0;

2
src/fs/hfs.h
View File

@ -43,7 +43,7 @@ public:
void init() override;
bool check(Report& report, const QString& deviceNode) const override;
bool create(Report& report, const QString& deviceNode) const override;
bool create(Report& report, const QString& deviceNode) override;
CommandSupportType supportGetUsed() const override {
return m_GetUsed;

2
src/fs/hfsplus.cpp
View File

@ -87,7 +87,7 @@ bool hfsplus::check(Report& report, const QString& deviceNode) const
return cmd.run(-1) && cmd.exitCode() == 0;
}
bool hfsplus::create(Report& report, const QString& deviceNode) const
bool hfsplus::create(Report& report, const QString& deviceNode)
{
ExternalCommand cmd(report, QStringLiteral("newfs_hfs"), { deviceNode });
return cmd.run(-1) && cmd.exitCode() == 0;

2
src/fs/hfsplus.h
View File

@ -43,7 +43,7 @@ public:
void init() override;
bool check(Report& report, const QString& deviceNode) const override;
bool create(Report& report, const QString& deviceNode) const override;
bool create(Report& report, const QString& deviceNode) override;
CommandSupportType supportGetLabel() const override {
return m_GetLabel;

2
src/fs/jfs.cpp
View File

@ -146,7 +146,7 @@ bool jfs::check(Report& report, const QString& deviceNode) const
return cmd.run(-1) && (cmd.exitCode() == 0 || cmd.exitCode() == 1);
}
bool jfs::create(Report& report, const QString& deviceNode) const
bool jfs::create(Report& report, const QString& deviceNode)
{
ExternalCommand cmd(report, QStringLiteral("mkfs.jfs"), { QStringLiteral("-q"), deviceNode });
return cmd.run(-1) && cmd.exitCode() == 0;

2
src/fs/jfs.h
View File

@ -44,7 +44,7 @@ public:
qint64 readUsedCapacity(const QString& deviceNode) const override;
bool check(Report& report, const QString& deviceNode) const override;
bool create(Report& report, const QString& deviceNode) const override;
bool create(Report& report, const QString& deviceNode) override;
bool resize(Report& report, const QString& deviceNode, qint64 length) const override;
bool resizeOnline(Report& report, const QString& deviceNode, const QString& mountPoint, qint64 length) const override;
bool writeLabel(Report& report, const QString& deviceNode, const QString& newLabel) override;

2
src/fs/linuxswap.cpp
View File

@ -80,7 +80,7 @@ qint64 linuxswap::maxLabelLength() const
return 15;
}
bool linuxswap::create(Report& report, const QString& deviceNode) const
bool linuxswap::create(Report& report, const QString& deviceNode)
{
ExternalCommand cmd(report, QStringLiteral("mkswap"), { deviceNode });
return cmd.run(-1) && cmd.exitCode() == 0;

2
src/fs/linuxswap.h
View File

@ -42,7 +42,7 @@ public:
public:
void init() override;
bool create(Report& report, const QString& deviceNode) const override;
bool create(Report& report, const QString& deviceNode) override;
bool resize(Report& report, const QString& deviceNode, qint64 length) const override;
bool writeLabel(Report& report, const QString& deviceNode, const QString& newLabel) override;
bool copy(Report& report, const QString& targetDeviceNode, const QString& sourceDeviceNode) const override;

4
src/fs/luks.cpp
View File

@ -113,7 +113,7 @@ FileSystem::SupportTool luks::supportToolName() const
QUrl(QStringLiteral("https://code.google.com/p/cryptsetup/")));
}
bool luks::create(Report& report, const QString& deviceNode) const
bool luks::create(Report& report, const QString& deviceNode)
{
Q_ASSERT(m_innerFs);
Q_ASSERT(!m_passphrase.isEmpty());
@ -142,7 +142,7 @@ bool luks::create(Report& report, const QString& deviceNode) const
if (mapperName().isEmpty())
return false;
// FIXME scan(deviceNode);
scan(deviceNode);
if (!m_innerFs->create(report, mapperName()))
return false;

2
src/fs/luks.h
View File

@ -110,7 +110,7 @@ public:
}
bool check(Report& report, const QString& deviceNode) const override;
bool create(Report& report, const QString& deviceNode) const override;
bool create(Report& report, const QString& deviceNode) override;
SupportTool supportToolName() const override;
bool supportToolFound() const override;
QString readUUID(const QString& deviceNode) const override;

2
src/fs/lvm2_pv.cpp
View File

@ -106,7 +106,7 @@ bool lvm2_pv::check(Report& report, const QString& deviceNode) const
return cmd.run(-1) && cmd.exitCode() == 0;
}
bool lvm2_pv::create(Report& report, const QString& deviceNode) const
bool lvm2_pv::create(Report& report, const QString& deviceNode)
{
ExternalCommand cmd(report, QStringLiteral("lvm"), { QStringLiteral("pvcreate"), QStringLiteral("--force"), deviceNode });
return cmd.run(-1) && cmd.exitCode() == 0;

2
src/fs/lvm2_pv.h
View File

@ -45,7 +45,7 @@ public:
qint64 readUsedCapacity(const QString& deviceNode) const override;
bool check(Report& report, const QString& deviceNode) const override;
bool create(Report& report, const QString& deviceNode) const override;
bool create(Report& report, const QString& deviceNode) override;
bool remove(Report& report, const QString& deviceNode) const override;
bool resize(Report& report, const QString& deviceNode, qint64 length) const override;
// bool writeLabel(Report& report, const QString& deviceNode, const QString& newLabel) override;

2
src/fs/nilfs2.cpp
View File

@ -115,7 +115,7 @@ bool nilfs2::check(Report& report, const QString& deviceNode) const
return cmd.run(-1) && cmd.exitCode() == 0;
}
bool nilfs2::create(Report& report, const QString& deviceNode) const
bool nilfs2::create(Report& report, const QString& deviceNode)
{
ExternalCommand cmd(report, QStringLiteral("mkfs.nilfs2"), { deviceNode });
return cmd.run(-1) && cmd.exitCode() == 0;

2
src/fs/nilfs2.h
View File

@ -45,7 +45,7 @@ public:
// qint64 readUsedCapacity(const QString& deviceNode) const override;
bool check(Report& report, const QString& deviceNode) const override;
bool create(Report& report, const QString& deviceNode) const override;
bool create(Report& report, const QString& deviceNode) override;
qint64 readUsedCapacity(const QString& deviceNode) const override;
bool resize(Report& report, const QString& deviceNode, qint64 length) const override;
bool resizeOnline(Report& report, const QString& deviceNode, const QString& mountPoint, qint64 length) const override;

2
src/fs/ntfs.cpp
View File

@ -140,7 +140,7 @@ bool ntfs::check(Report& report, const QString& deviceNode) const
return cmd.run(-1) && cmd.exitCode() == 0;
}
bool ntfs::create(Report& report, const QString& deviceNode) const
bool ntfs::create(Report& report, const QString& deviceNode)
{
ExternalCommand cmd(report, QStringLiteral("mkfs.ntfs"), { QStringLiteral("--quick"), QStringLiteral("--verbose"), deviceNode });
return cmd.run(-1) && cmd.exitCode() == 0;

2
src/fs/ntfs.h
View File

@ -44,7 +44,7 @@ public:
qint64 readUsedCapacity(const QString& deviceNode) const override;
bool check(Report& report, const QString& deviceNode) const override;
bool create(Report& report, const QString& deviceNode) const override;
bool create(Report& report, const QString& deviceNode) override;
bool copy(Report& report, const QString& targetDeviceNode, const QString& sourceDeviceNode) const override;
bool resize(Report& report, const QString& deviceNode, qint64 length) const override;
bool writeLabel(Report& report, const QString& deviceNode, const QString& newLabel) override;

2
src/fs/ocfs2.cpp
View File

@ -109,7 +109,7 @@ bool ocfs2::check(Report& report, const QString& deviceNode) const
return cmd.run(-1) && (cmd.exitCode() == 0 || cmd.exitCode() == 1 || cmd.exitCode() == 2);
}
bool ocfs2::create(Report& report, const QString& deviceNode) const
bool ocfs2::create(Report& report, const QString& deviceNode)
{
ExternalCommand cmd(report, QStringLiteral("mkfs.ocfs2"), { deviceNode });

2
src/fs/ocfs2.h
View File

@ -44,7 +44,7 @@ public:
qint64 readUsedCapacity(const QString& deviceNode) const override;
bool check(Report& report, const QString& deviceNode) const override;
bool create(Report& report, const QString& deviceNode) const override;
bool create(Report& report, const QString& deviceNode) override;
bool resize(Report& report, const QString& deviceNode, qint64 length) const override;
bool writeLabel(Report& report, const QString& deviceNode, const QString& newLabel) override;
bool updateUUID(Report& report, const QString& deviceNode) const override;

2
src/fs/reiser4.cpp
View File

@ -122,7 +122,7 @@ bool reiser4::check(Report& report, const QString& deviceNode) const
return cmd.run(-1) && cmd.exitCode() == 0;
}
bool reiser4::create(Report& report, const QString& deviceNode) const
bool reiser4::create(Report& report, const QString& deviceNode)
{
ExternalCommand cmd(report, QStringLiteral("mkfs.reiser4"), { QStringLiteral("--yes"), QStringLiteral("--force"), deviceNode });
return cmd.run(-1) && cmd.exitCode() == 0;

2
src/fs/reiser4.h
View File

@ -44,7 +44,7 @@ public:
qint64 readUsedCapacity(const QString& deviceNode) const override;
bool check(Report& report, const QString& deviceNode) const override;
bool create(Report& report, const QString& deviceNode) const override;
bool create(Report& report, const QString& deviceNode) override;
CommandSupportType supportGetUsed() const override {
return m_GetUsed;

2
src/fs/reiserfs.cpp
View File

@ -143,7 +143,7 @@ bool reiserfs::check(Report& report, const QString& deviceNode) const
return cmd.run(-1) && (cmd.exitCode() == 0 || cmd.exitCode() == 1 || cmd.exitCode() == 256);
}
bool reiserfs::create(Report& report, const QString& deviceNode) const
bool reiserfs::create(Report& report, const QString& deviceNode)
{
ExternalCommand cmd(report, QStringLiteral("mkfs.reiserfs"), { QStringLiteral("-f"), deviceNode });
return cmd.run(-1) && cmd.exitCode() == 0;

2
src/fs/reiserfs.h
View File

@ -46,7 +46,7 @@ public:
qint64 readUsedCapacity(const QString& deviceNode) const override;
bool check(Report& report, const QString& deviceNode) const override;
bool create(Report& report, const QString& deviceNode) const override;
bool create(Report& report, const QString& deviceNode) override;
bool resize(Report& report, const QString& deviceNode, qint64 length) const override;
bool resizeOnline(Report& report, const QString& deviceNode, const QString& mountPoint, qint64 length) const override;
bool writeLabel(Report& report, const QString& deviceNode, const QString& newLabel) override;

2
src/fs/unformatted.cpp
View File

@ -26,7 +26,7 @@ unformatted::unformatted(qint64 firstsector, qint64 lastsector, qint64 sectorsus
{
}
bool unformatted::create(Report&, const QString&) const
bool unformatted::create(Report&, const QString&)
{
return true;
}

2
src/fs/unformatted.h
View File

@ -40,7 +40,7 @@ public:
unformatted(qint64 firstsector, qint64 lastsector, qint64 sectorsused, const QString& label);
public:
bool create(Report&, const QString&) const override;
bool create(Report&, const QString&) override;
CommandSupportType supportCreate() const override {
return m_Create;

2
src/fs/xfs.cpp
View File

@ -143,7 +143,7 @@ bool xfs::check(Report& report, const QString& deviceNode) const
return cmd.run(-1) && cmd.exitCode() == 0;
}
bool xfs::create(Report& report, const QString& deviceNode) const
bool xfs::create(Report& report, const QString& deviceNode)
{
ExternalCommand cmd(report, QStringLiteral("mkfs.xfs"), { QStringLiteral("-f"), deviceNode });
return cmd.run(-1) && cmd.exitCode() == 0;

2
src/fs/xfs.h
View File

@ -44,7 +44,7 @@ public:
qint64 readUsedCapacity(const QString& deviceNode) const override;
bool check(Report& report, const QString& deviceNode) const override;
bool create(Report& report, const QString& deviceNode) const override;
bool create(Report& report, const QString& deviceNode) override;
bool copy(Report& report, const QString&, const QString&) const override;
bool resize(Report& report, const QString& deviceNode, qint64 length) const override;
bool resizeOnline(Report& report, const QString& deviceNode, const QString& mountPoint, qint64 length) const override;

2
src/util/externalcommand.cpp
View File

@ -22,6 +22,7 @@
#include <cstdlib>
#include <QDebug>
#include <QString>
#include <QStringList>
@ -73,6 +74,7 @@ void ExternalCommand::setup()
*/
bool ExternalCommand::start(int timeout)
{
qDebug() << "ExternalCommand" << command() << args();
QProcess::start(command(), args());
if (report()) {