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

Use smart pointers for CoreBackendPartitionTable.

This commit is contained in:
Andrius Štikonas 2018-03-31 21:49:20 +01:00
parent 2527b3ecc3
commit 279159ca6f
16 changed files with 25 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/backend/corebackend.h
View File

@ -132,9 +132,7 @@ public:
/**
* Open a device for reading.
* @param deviceNode The path of the device that is to be opened (e.g. /dev/sda)
* @return a pointer to a CoreBackendDevice or nullptr if the open failed. If a pointer to
* an instance is returned, it's the caller's responsibility to delete the
* object.
* @return a pointer to a CoreBackendDevice or nullptr if the open failed.
*/
virtual std::unique_ptr<CoreBackendDevice> openDevice(const Device& d) = 0;

3
src/backend/corebackenddevice.h
View File

@ -19,6 +19,7 @@
#define KPMCORE_COREBACKENDDEVICE_H
#include <memory>
#include <QString>
class CoreBackendPartition;
@ -81,7 +82,7 @@ public:
* @return a pointer to the CoreBackendPartitionTable for this device or nullptr in case
* of errors
*/
virtual CoreBackendPartitionTable* openPartitionTable() = 0;
virtual std::unique_ptr<CoreBackendPartitionTable> openPartitionTable() = 0;
/**
* Create a new partition table on this device.

9
src/backend/corebackendmanager.cpp
View File

@ -18,7 +18,6 @@
*************************************************************************/
#include "backend/corebackendmanager.h"
#include "backend/corebackendmanager_p.h"
#include "backend/corebackend.h"
#include <QCoreApplication>
@ -35,6 +34,14 @@
#include <KPluginLoader>
#include <KPluginMetaData>
struct CoreBackendManagerPrivate
{
KAuth::ExecuteJob *m_job;
CoreBackend *m_Backend;
QString m_Uuid;
};
CoreBackendManager::CoreBackendManager() :
d(std::make_unique<CoreBackendManagerPrivate>())
{

30
src/backend/corebackendmanager_p.h
View File

@ -1,30 +0,0 @@
/*************************************************************************
* Copyright (C) 2018 by Andrius Štikonas <andrius@stikonas.eu> *
* *
* This program is free software; you can redistribute it and/or *
* modify it under the terms of the GNU General Public License as *
* published by the Free Software Foundation; either version 3 of *
* the License, or (at your option) any later version. *
* *
* This program is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of *
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
* GNU General Public License for more details. *
* *
* You should have received a copy of the GNU General Public License *
* along with this program. If not, see <http://www.gnu.org/licenses/>.*
*************************************************************************/
#ifndef KPMCORE_COREBACKENDMANAGER_P_H
#define KPMCORE_COREBACKENDMANAGER_P_H
struct CoreBackendManagerPrivate
{
KAuth::ExecuteJob *m_job;
CoreBackend *m_Backend;
QString m_Uuid;
};
#endif

4
src/jobs/createfilesystemjob.cpp
View File

@ -63,7 +63,7 @@ bool CreateFileSystemJob::run(Report& parent)
std::unique_ptr<CoreBackendDevice> backendDevice = CoreBackendManager::self()->backend()->openDevice(device());
if (backendDevice) {
CoreBackendPartitionTable* backendPartitionTable = backendDevice->openPartitionTable();
std::unique_ptr<CoreBackendPartitionTable> backendPartitionTable = backendDevice->openPartitionTable();
if (backendPartitionTable) {
if (backendPartitionTable->setPartitionSystemType(*report, partition())) {
@ -71,8 +71,6 @@ bool CreateFileSystemJob::run(Report& parent)
backendPartitionTable->commit();
} else
report->line() << xi18nc("@info:progress", "Failed to set the system type for the file system on partition <filename>%1</filename>.", partition().deviceNode());
delete backendPartitionTable;
} else
report->line() << xi18nc("@info:progress", "Could not open partition table on device <filename>%1</filename> to set the system type for partition <filename>%2</filename>.", device().deviceNode(), partition().deviceNode());
} else

4
src/jobs/createpartitionjob.cpp
View File

@ -54,7 +54,7 @@ bool CreatePartitionJob::run(Report& parent)
std::unique_ptr<CoreBackendDevice> backendDevice = CoreBackendManager::self()->backend()->openDevice(device());
if (backendDevice) {
CoreBackendPartitionTable* backendPartitionTable = backendDevice->openPartitionTable();
std::unique_ptr<CoreBackendPartitionTable> backendPartitionTable = backendDevice->openPartitionTable();
if (backendPartitionTable) {
QString partitionPath = backendPartitionTable->createPartition(*report, partition());
@ -66,8 +66,6 @@ bool CreatePartitionJob::run(Report& parent)
backendPartitionTable->commit();
} else
report->line() << xi18nc("@info/plain", "Failed to add partition <filename>%1</filename> to device <filename>%2</filename>.", partition().deviceNode(), device().deviceNode());
delete backendPartitionTable;
} else
report->line() << xi18nc("@info:progress", "Could not open partition table on device <filename>%1</filename> to create new partition <filename>%2</filename>.", device().deviceNode(), partition().deviceNode());
} else

5
src/jobs/deletefilesystemjob.cpp
View File

@ -77,7 +77,7 @@ bool DeleteFileSystemJob::run(Report& parent)
std::unique_ptr<CoreBackendDevice> backendDevice = CoreBackendManager::self()->backend()->openDevice(device());
if (backendDevice) {
CoreBackendPartitionTable* backendPartitionTable = backendDevice->openPartitionTable();
std::unique_ptr<CoreBackendPartitionTable> backendPartitionTable = backendDevice->openPartitionTable();
if (backendPartitionTable) {
rval = backendPartitionTable->clobberFileSystem(*report, partition());
@ -86,9 +86,6 @@ bool DeleteFileSystemJob::run(Report& parent)
report->line() << xi18nc("@info:progress", "Could not delete file system on <filename>%1</filename>.", partition().deviceNode());
else
backendPartitionTable->commit();
delete backendPartitionTable;
} else
report->line() << xi18nc("@info:progress", "Could not open partition table on device <filename>%1</filename> to delete file system on <filename>%2</filename>.", device().deviceNode(), partition().deviceNode());

5
src/jobs/deletepartitionjob.cpp
View File

@ -61,7 +61,7 @@ bool DeletePartitionJob::run(Report& parent)
std::unique_ptr<CoreBackendDevice> backendDevice = CoreBackendManager::self()->backend()->openDevice(device());
if (backendDevice) {
CoreBackendPartitionTable* backendPartitionTable = backendDevice->openPartitionTable();
std::unique_ptr<CoreBackendPartitionTable> backendPartitionTable = backendDevice->openPartitionTable();
if (backendPartitionTable) {
rval = backendPartitionTable->deletePartition(*report, partition());
@ -70,9 +70,6 @@ bool DeletePartitionJob::run(Report& parent)
report->line() << xi18nc("@info:progress", "Could not delete partition <filename>%1</filename>.", partition().deviceNode());
else
backendPartitionTable->commit();
delete backendPartitionTable;
} else
report->line() << xi18nc("@info:progress", "Could not open partition table on device <filename>%1</filename> to delete partition <filename>%2</filename>.", device().deviceNode(), partition().deviceNode());
} else

4
src/jobs/resizefilesystemjob.cpp
View File

@ -117,7 +117,7 @@ bool ResizeFileSystemJob::resizeFileSystemBackend(Report& report)
std::unique_ptr<CoreBackendDevice> backendDevice = CoreBackendManager::self()->backend()->openDevice(device());
if (backendDevice) {
CoreBackendPartitionTable* backendPartitionTable = backendDevice->openPartitionTable();
std::unique_ptr<CoreBackendPartitionTable> backendPartitionTable = backendDevice->openPartitionTable();
if (backendPartitionTable) {
connect(CoreBackendManager::self()->backend(), &CoreBackend::progress, this, &ResizeFileSystemJob::progress);
@ -128,8 +128,6 @@ bool ResizeFileSystemJob::resizeFileSystemBackend(Report& report)
report.line() << xi18nc("@info:progress", "Successfully resized file system using internal backend functions.");
backendPartitionTable->commit();
}
delete backendPartitionTable;
} else
report.line() << xi18nc("@info:progress", "Could not open partition <filename>%1</filename> while trying to resize the file system.", partition().deviceNode());

2
src/jobs/restorefilesystemjob.cpp
View File

@ -85,7 +85,7 @@ bool RestoreFileSystemJob::run(Report& parent)
FileSystem::Type t = FileSystem::Unknown;
if (backendDevice) {
CoreBackendPartitionTable* backendPartitionTable = backendDevice->openPartitionTable();
std::unique_ptr<CoreBackendPartitionTable> backendPartitionTable = backendDevice->openPartitionTable();
if (backendPartitionTable)
t = backendPartitionTable->detectFileSystemBySector(*report, targetDevice(), targetPartition().firstSector());

4
src/jobs/setpartflagsjob.cpp
View File

@ -59,7 +59,7 @@ bool SetPartFlagsJob::run(Report& parent)
std::unique_ptr<CoreBackendDevice> backendDevice = CoreBackendManager::self()->backend()->openDevice(device());
if (backendDevice) {
CoreBackendPartitionTable* backendPartitionTable = backendDevice->openPartitionTable();
std::unique_ptr<CoreBackendPartitionTable> backendPartitionTable = backendDevice->openPartitionTable();
if (backendPartitionTable) {
int count = 0;
@ -81,8 +81,6 @@ bool SetPartFlagsJob::run(Report& parent)
if (rval)
backendPartitionTable->commit();
delete backendPartitionTable;
} else
report->line() << xi18nc("@info:progress", "Could not open partition table on device <filename>%1</filename> to set partition flags for partition <filename>%2</filename>.", device().deviceNode(), partition().deviceNode());
} else

4
src/jobs/setpartgeometryjob.cpp
View File

@ -59,7 +59,7 @@ bool SetPartGeometryJob::run(Report& parent)
std::unique_ptr<CoreBackendDevice> backendDevice = CoreBackendManager::self()->backend()->openDevice(device());
if (backendDevice) {
CoreBackendPartitionTable* backendPartitionTable = backendDevice->openPartitionTable();
std::unique_ptr<CoreBackendPartitionTable> backendPartitionTable = backendDevice->openPartitionTable();
if (backendPartitionTable) {
rval = backendPartitionTable->updateGeometry(*report, partition(), newStart(), newStart() + newLength() - 1);
@ -69,8 +69,6 @@ bool SetPartGeometryJob::run(Report& parent)
partition().setLastSector(newStart() + newLength() - 1);
backendPartitionTable->commit();
}
delete backendPartitionTable;
}
} else
report->line() << xi18nc("@info:progress", "Could not open device <filename>%1</filename> while trying to resize/move partition <filename>%2</filename>.", device().deviceNode(), partition().deviceNode());

11
src/plugins/dummy/dummydevice.cpp
View File

@ -47,16 +47,9 @@ bool DummyDevice::close()
return true;
}
CoreBackendPartitionTable* DummyDevice::openPartitionTable()
std::unique_ptr<CoreBackendPartitionTable> DummyDevice::openPartitionTable()
{
CoreBackendPartitionTable* ptable = new DummyPartitionTable();
if (ptable == nullptr || !ptable->open()) {
delete ptable;
ptable = nullptr;
}
return ptable;
return std::make_unique<DummyPartitionTable>(DummyPartitionTable());
}
bool DummyDevice::createPartitionTable(Report& report, const PartitionTable& ptable)

2
src/plugins/dummy/dummydevice.h
View File

@ -41,7 +41,7 @@ public:
bool openExclusive() override;
bool close() override;
CoreBackendPartitionTable* openPartitionTable() override;
std::unique_ptr<CoreBackendPartitionTable> openPartitionTable() override;
bool createPartitionTable(Report& report, const PartitionTable& ptable) override;
};

4
src/plugins/sfdisk/sfdiskdevice.cpp
View File

@ -58,9 +58,9 @@ bool SfdiskDevice::close()
return true;
}
CoreBackendPartitionTable* SfdiskDevice::openPartitionTable()
std::unique_ptr<CoreBackendPartitionTable> SfdiskDevice::openPartitionTable()
{
return new SfdiskPartitionTable(m_device);
return std::make_unique<SfdiskPartitionTable>(m_device);
}
bool SfdiskDevice::createPartitionTable(Report& report, const PartitionTable& ptable)

2
src/plugins/sfdisk/sfdiskdevice.h
View File

@ -42,7 +42,7 @@ public:
bool openExclusive() override;
bool close() override;
CoreBackendPartitionTable* openPartitionTable() override;
std::unique_ptr<CoreBackendPartitionTable> openPartitionTable() override;
bool createPartitionTable(Report& report, const PartitionTable& ptable) override;