applications/calamares
2
0
Fork 0
mirror of https://github.com/parchlinux/calamares.git synced 2025-06-28 01:45:36 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Clang: warnings--

Browse source
This commit is contained in:
Adriaan de Groot 2017-09-14 06:34:07 -04:00
parent 9f1cca5ec7
commit c6297f1db5
6 changed files with 9 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/libcalamaresui/viewpages/ViewStep.h
View file

@ -45,7 +45,7 @@ class UIDLLEXPORT ViewStep : public QObject
Q_OBJECT Q_OBJECT
public: public:
explicit ViewStep( QObject* parent = nullptr ); explicit ViewStep( QObject* parent = nullptr );
virtual ~ViewStep(); virtual ~ViewStep() override;
virtual QString prettyName() const = 0; virtual QString prettyName() const = 0;

2
src/modules/dracutlukscfg/DracutLuksCfgJob.h
View file

@ -34,7 +34,7 @@ class PLUGINDLLEXPORT DracutLuksCfgJob : public Calamares::CppJob
public: public:
explicit DracutLuksCfgJob( QObject* parent = nullptr ); explicit DracutLuksCfgJob( QObject* parent = nullptr );
virtual ~DracutLuksCfgJob(); virtual ~DracutLuksCfgJob() override;
QString prettyName() const override; QString prettyName() const override;

2
src/modules/interactiveterminal/InteractiveTerminalViewStep.h
View file

@ -34,7 +34,7 @@ class PLUGINDLLEXPORT InteractiveTerminalViewStep : public Calamares::ViewStep
public: public:
explicit InteractiveTerminalViewStep( QObject* parent = nullptr ); explicit InteractiveTerminalViewStep( QObject* parent = nullptr );
virtual ~InteractiveTerminalViewStep(); virtual ~InteractiveTerminalViewStep() override;
QString prettyName() const override; QString prettyName() const override;

7
src/modules/partition/jobs/CreatePartitionJob.cpp
View file

@ -20,6 +20,7 @@
#include "jobs/CreatePartitionJob.h" #include "jobs/CreatePartitionJob.h"
#include "utils/Logger.h" #include "utils/Logger.h"
#include "utils/Units.h"
// KPMcore // KPMcore
#include <kpmcore/backend/corebackend.h> #include <kpmcore/backend/corebackend.h>
@ -47,7 +48,7 @@ CreatePartitionJob::prettyName() const
{ {
return tr( "Create new %2MB partition on %4 (%3) with file system %1." ) return tr( "Create new %2MB partition on %4 (%3) with file system %1." )
.arg( m_partition->fileSystem().name() ) .arg( m_partition->fileSystem().name() )
.arg( m_partition->capacity() / 1024 / 1024 ) .arg( CalamaresUtils::BytesToMiB( m_partition->capacity() )
.arg( m_device->name() ) .arg( m_device->name() )
.arg( m_device->deviceNode() ); .arg( m_device->deviceNode() );
} }
@ -59,7 +60,7 @@ CreatePartitionJob::prettyDescription() const
return tr( "Create new <strong>%2MB</strong> partition on <strong>%4</strong> " return tr( "Create new <strong>%2MB</strong> partition on <strong>%4</strong> "
"(%3) with file system <strong>%1</strong>." ) "(%3) with file system <strong>%1</strong>." )
.arg( m_partition->fileSystem().name() ) .arg( m_partition->fileSystem().name() )
.arg( m_partition->capacity() / 1024 / 1024 ) .arg( CalamaresUtils::BytesToMiB( m_partition->capacity() )
.arg( m_device->name() ) .arg( m_device->name() )
.arg( m_device->deviceNode() ); .arg( m_device->deviceNode() );
} }
@ -79,7 +80,7 @@ CreatePartitionJob::exec()
int step = 0; int step = 0;
const qreal stepCount = 4; const qreal stepCount = 4;
Report report( 0 ); Report report( nullptr );
QString message = tr( "The installer failed to create partition on disk '%1'." ).arg( m_device->name() ); QString message = tr( "The installer failed to create partition on disk '%1'." ).arg( m_device->name() );
progress( step++ / stepCount ); progress( step++ / stepCount );

2
src/modules/partition/jobs/CreatePartitionTableJob.cpp
View file

@ -72,7 +72,7 @@ CreatePartitionTableJob::prettyStatusMessage() const
Calamares::JobResult Calamares::JobResult
CreatePartitionTableJob::exec() CreatePartitionTableJob::exec()
{ {
Report report( 0 ); Report report( nullptr );
QString message = tr( "The installer failed to create a partition table on %1." ).arg( m_device->name() ); QString message = tr( "The installer failed to create a partition table on %1." ).arg( m_device->name() );
CoreBackend* backend = CoreBackendManager::self()->backend(); CoreBackend* backend = CoreBackendManager::self()->backend();

2
src/modules/partition/jobs/DeletePartitionJob.cpp
View file

@ -63,7 +63,7 @@ DeletePartitionJob::prettyStatusMessage() const
Calamares::JobResult Calamares::JobResult
DeletePartitionJob::exec() DeletePartitionJob::exec()
{ {
Report report( 0 ); Report report( nullptr );
QString message = tr( "The installer failed to delete partition %1." ).arg( m_partition->devicePath() ); QString message = tr( "The installer failed to delete partition %1." ).arg( m_partition->devicePath() );
if ( m_device->deviceNode() != m_partition->devicePath() ) if ( m_device->deviceNode() != m_partition->devicePath() )