napcok/calamares
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[welcome] Apply coding style

Browse Source
This commit is contained in:
Adriaan de Groot 2020-05-04 13:00:00 +02:00
parent e023adc9b2
commit 7d1800a0d7
8 changed files with 42 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/modules/welcome/checker/CheckerContainer.cpp
View File

@ -31,7 +31,7 @@
#include <QHBoxLayout>
CheckerContainer::CheckerContainer( const Calamares::RequirementsModel &model, QWidget* parent )
CheckerContainer::CheckerContainer( const Calamares::RequirementsModel& model, QWidget* parent )
: QWidget( parent )
, m_waitingWidget( new WaitingWidget( QString(), this ) )
, m_checkerWidget( nullptr )
@ -60,7 +60,7 @@ CheckerContainer::requirementsComplete( bool ok )
m_waitingWidget->deleteLater();
m_waitingWidget = nullptr; // Don't delete in destructor
m_checkerWidget = new ResultsListWidget( m_model, this);
m_checkerWidget = new ResultsListWidget( m_model, this );
layout()->addWidget( m_checkerWidget );
m_verdict = ok;

12
src/modules/welcome/checker/CheckerContainer.h
View File

@ -23,8 +23,8 @@
#ifndef CHECKERCONTAINER_H
#define CHECKERCONTAINER_H
#include <QWidget>
#include "Config.h"
#include <QWidget>
class ResultsListWidget;
class WaitingWidget;
@ -40,7 +40,7 @@ class CheckerContainer : public QWidget
{
Q_OBJECT
public:
explicit CheckerContainer(const Calamares::RequirementsModel &model, QWidget* parent = nullptr );
explicit CheckerContainer( const Calamares::RequirementsModel& model, QWidget* parent = nullptr );
virtual ~CheckerContainer();
bool verdict() const;
@ -52,13 +52,13 @@ public slots:
void requirementsProgress( const QString& message );
protected:
WaitingWidget *m_waitingWidget;
ResultsListWidget *m_checkerWidget;
WaitingWidget* m_waitingWidget;
ResultsListWidget* m_checkerWidget;
bool m_verdict;
private:
const Calamares::RequirementsModel &m_model;
} ;
const Calamares::RequirementsModel& m_model;
};
#endif

12
src/modules/welcome/checker/GeneralRequirements.cpp
View File

@ -38,12 +38,12 @@
#include "GlobalStorage.h"
#include "JobQueue.h"
#include <QGuiApplication>
#include <QDBusConnection>
#include <QDBusInterface>
#include <QDir>
#include <QFile>
#include <QFileInfo>
#include <QGuiApplication>
#include <QScreen>
#include <unistd.h> //geteuid
@ -123,8 +123,10 @@ GeneralRequirements::checkRequirements()
{
checkEntries.append(
{ entry,
[req = m_requiredStorageGiB] { return tr( "has at least %1 GiB available drive space" ).arg( req ); },
[req = m_requiredStorageGiB] {
[ req = m_requiredStorageGiB ] {
return tr( "has at least %1 GiB available drive space" ).arg( req );
},
[ req = m_requiredStorageGiB ] {
return tr( "There is not enough drive space. At least %1 GiB is required." ).arg( req );
},
enoughStorage,
@ -134,8 +136,8 @@ GeneralRequirements::checkRequirements()
{
checkEntries.append(
{ entry,
[req = m_requiredRamGiB] { return tr( "has at least %1 GiB working memory" ).arg( req ); },
[req = m_requiredRamGiB] {
[ req = m_requiredRamGiB ] { return tr( "has at least %1 GiB working memory" ).arg( req ); },
[ req = m_requiredRamGiB ] {
return tr( "The system does not have enough working memory. At least %1 GiB is required." )
.arg( req );
},

17
src/modules/welcome/checker/ResultWidget.cpp
View File

@ -24,17 +24,14 @@
#include <QBoxLayout>
static inline void setCondition( QLabel* label, CalamaresUtils::ImageType t )
static inline void
setCondition( QLabel* label, CalamaresUtils::ImageType t )
{
label->setPixmap(
CalamaresUtils::defaultPixmap( t,
CalamaresUtils::Original,
QSize( label->height(), label->height() ) ) );
CalamaresUtils::defaultPixmap( t, CalamaresUtils::Original, QSize( label->height(), label->height() ) ) );
}
ResultWidget::ResultWidget( bool satisfied,
bool required,
QWidget* parent )
ResultWidget::ResultWidget( bool satisfied, bool required, QWidget* parent )
: QWidget( parent )
{
QBoxLayout* mainLayout = new QHBoxLayout;
@ -48,11 +45,17 @@ ResultWidget::ResultWidget( bool satisfied,
m_textLabel->setSizePolicy( QSizePolicy::Expanding, QSizePolicy::Preferred );
if ( satisfied )
{
setCondition( m_iconLabel, CalamaresUtils::StatusOk );
}
else if ( required )
{
setCondition( m_iconLabel, CalamaresUtils::StatusError );
}
else
{
setCondition( m_iconLabel, CalamaresUtils::StatusWarning );
}
}

4
src/modules/welcome/checker/ResultWidget.h
View File

@ -38,11 +38,11 @@ public:
*
* Use setText() to set up the text of the widget.
*/
explicit ResultWidget( bool satisfied, bool required,
QWidget* parent = nullptr );
explicit ResultWidget( bool satisfied, bool required, QWidget* parent = nullptr );
/// @brief Set the displayed description of the check.
void setText( const QString& text );
private:
QLabel* m_textLabel;
QLabel* m_iconLabel;

24
src/modules/welcome/checker/ResultsListWidget.cpp
View File

@ -47,16 +47,15 @@
static void
createResultWidgets( QLayout* layout,
QList< ResultWidget* >& resultWidgets,
const Calamares::RequirementsModel &model,
std::function< bool( const Calamares::RequirementEntry& ) > predicate
)
const Calamares::RequirementsModel& model,
std::function< bool( const Calamares::RequirementEntry& ) > predicate )
{
resultWidgets.clear();
resultWidgets.reserve( model.count() );
for ( auto i = 0; i < model.count(); i++ )
{
const auto &entry = model.getEntry(i);
if ( !predicate(entry))
const auto& entry = model.getEntry( i );
if ( !predicate( entry ) )
{
resultWidgets.append( nullptr );
continue;
@ -105,7 +104,7 @@ private:
void retranslate();
};
ResultsListDialog::ResultsListDialog( const Calamares::RequirementsModel& model, QWidget* parent)
ResultsListDialog::ResultsListDialog( const Calamares::RequirementsModel& model, QWidget* parent )
: QDialog( parent )
, m_model( model )
{
@ -114,9 +113,8 @@ ResultsListDialog::ResultsListDialog( const Calamares::RequirementsModel& model,
m_title = new QLabel( this );
createResultWidgets( entriesLayout, m_resultWidgets, model, []( const Calamares::RequirementEntry& e ) {
return e.hasDetails();
} );
createResultWidgets(
entriesLayout, m_resultWidgets, model, []( const Calamares::RequirementEntry& e ) { return e.hasDetails(); } );
QDialogButtonBox* buttonBox = new QDialogButtonBox( QDialogButtonBox::Close, Qt::Horizontal, this );
@ -132,7 +130,7 @@ ResultsListDialog::ResultsListDialog( const Calamares::RequirementsModel& model,
retranslate(); // Do it now to fill in the texts
}
ResultsListDialog::~ResultsListDialog() {}
ResultsListDialog::~ResultsListDialog() { }
void
ResultsListDialog::retranslate()
@ -142,7 +140,7 @@ ResultsListDialog::retranslate()
for ( auto i = 0; i < m_model.count(); i++ )
{
const auto &entry = m_model.getEntry(i);
const auto& entry = m_model.getEntry( i );
if ( m_resultWidgets[ i ] )
{
m_resultWidgets[ i ]->setText( entry.enumerationText() );
@ -151,7 +149,7 @@ ResultsListDialog::retranslate()
}
ResultsListWidget::ResultsListWidget( const Calamares::RequirementsModel &model, QWidget* parent )
ResultsListWidget::ResultsListWidget( const Calamares::RequirementsModel& model, QWidget* parent )
: QWidget( parent )
, m_model( model )
{
@ -242,7 +240,7 @@ ResultsListWidget::retranslate()
{
for ( auto i = 0; i < m_model.count(); i++ )
{
const auto &entry = m_model.getEntry(i);
const auto& entry = m_model.getEntry( i );
if ( m_resultWidgets[ i ] )
{
m_resultWidgets[ i ]->setText( entry.negatedText() );

4
src/modules/welcome/checker/ResultsListWidget.h
View File

@ -30,7 +30,7 @@ class ResultsListWidget : public QWidget
{
Q_OBJECT
public:
explicit ResultsListWidget(const Calamares::RequirementsModel &model, QWidget* parent);
explicit ResultsListWidget( const Calamares::RequirementsModel& model, QWidget* parent );
private:
/// @brief A link in the explanatory text has been clicked
@ -38,7 +38,7 @@ private:
void retranslate();
QLabel* m_explanation = nullptr; ///< Explanatory text above the list, with link
const Calamares::RequirementsModel &m_model;
const Calamares::RequirementsModel& m_model;
QList< ResultWidget* > m_resultWidgets; ///< One widget for each unsatisfied entry
};