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

[tracking] Apply coding style

Browse Source
This commit is contained in:
Adriaan de Groot 2020-06-17 14:14:06 +02:00
parent 45aac7db66
commit 789561be6a
5 changed files with 58 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/modules/tracking/TrackingJobs.cpp
View File

@ -85,8 +85,7 @@ TrackingInstallJob::addJob( Calamares::JobList& list, InstallTrackingConfig* con
QHash< QString, QString > map { std::initializer_list< std::pair< QString, QString > > { QHash< QString, QString > map { std::initializer_list< std::pair< QString, QString > > {
{ QStringLiteral( "CPU" ), s->getCpuDescription() }, { QStringLiteral( "CPU" ), s->getCpuDescription() },
{ QStringLiteral( "MEMORY" ), QString::number( s->getTotalMemoryB().first ) }, { QStringLiteral( "MEMORY" ), QString::number( s->getTotalMemoryB().first ) },
{ QStringLiteral("DISK"), QString::number( s->getTotalDiskB() ) } { QStringLiteral( "DISK" ), QString::number( s->getTotalDiskB() ) } } };
} };
QString installUrl = KMacroExpander::expandMacros( config->installTrackingUrl(), map ); QString installUrl = KMacroExpander::expandMacros( config->installTrackingUrl(), map );
cDebug() << Logger::SubEntry << "install-tracking URL" << installUrl; cDebug() << Logger::SubEntry << "install-tracking URL" << installUrl;
@ -134,10 +133,10 @@ TrackingMachineUpdateManagerJob::prettyStatusMessage() const
Calamares::JobResult Calamares::JobResult
TrackingMachineUpdateManagerJob::exec() TrackingMachineUpdateManagerJob::exec()
{ {
static const auto script = QStringLiteral( "sed -i '/^URI/s,${MACHINE_ID},'`cat /etc/machine-id`',' /etc/update-manager/meta-release || true" ); static const auto script = QStringLiteral(
"sed -i '/^URI/s,${MACHINE_ID},'`cat /etc/machine-id`',' /etc/update-manager/meta-release || true" );
auto res = CalamaresUtils::System::instance()->runCommand( auto res = CalamaresUtils::System::instance()->runCommand( CalamaresUtils::System::RunLocation::RunInTarget,
CalamaresUtils::System::RunLocation::RunInTarget,
QStringList { QStringLiteral( "/bin/sh" ) }, QStringList { QStringLiteral( "/bin/sh" ) },
QString(), // Working dir QString(), // Working dir
script, // standard input script, // standard input

39
src/modules/tracking/TrackingPage.cpp
View File

@ -45,20 +45,26 @@ TrackingPage::TrackingPage( Config* config, QWidget* parent )
// Each "panel" of configuration has the same kind of setup, // Each "panel" of configuration has the same kind of setup,
// where the xButton and xCheckBox is connected to the xTracking // where the xButton and xCheckBox is connected to the xTracking
// configuration object; that takes macro-trickery, unfortunately. // configuration object; that takes macro-trickery, unfortunately.
#define trackingSetup(x) { \ #define trackingSetup( x ) \
connect( ui->x ## CheckBox, &QCheckBox::stateChanged, \ { \
this, &TrackingPage::buttonChecked ); \ connect( ui->x##CheckBox, &QCheckBox::stateChanged, this, &TrackingPage::buttonChecked ); \
connect( ui->x ## CheckBox, &QCheckBox::stateChanged, \ connect( ui->x##CheckBox, \
config->x ## Tracking(), QOverload<bool>::of( &TrackingStyleConfig::setTracking ) ); \ &QCheckBox::stateChanged, \
connect( config->x ## Tracking(), &TrackingStyleConfig::trackingChanged, \ config->x##Tracking(), \
this, [ this, config ]() { this->trackerChanged( config->x ## Tracking(), this->ui->x ## Group, this->ui->x ## CheckBox);} ); \ QOverload< bool >::of( &TrackingStyleConfig::setTracking ) ); \
connect( ui->x ## PolicyButton, &QAbstractButton::clicked, \ connect( config->x##Tracking(), &TrackingStyleConfig::trackingChanged, this, [this, config]() { \
config, [ config ] { QString url( config->x ## Tracking()->policy() ); if ( !url.isEmpty() ) { QDesktopServices::openUrl( url ); } } ); \ this->trackerChanged( config->x##Tracking(), this->ui->x##Group, this->ui->x##CheckBox ); \
} ); \
connect( ui->x##PolicyButton, &QAbstractButton::clicked, config, [config] { \
QString url( config->x##Tracking()->policy() ); \
if ( !url.isEmpty() ) \
{ \
QDesktopServices::openUrl( url ); \
} \
} ); \
} }
trackingSetup( install ) trackingSetup( install ) trackingSetup( machine ) trackingSetup( user )
trackingSetup( machine )
trackingSetup( user )
#undef trackingSetup #undef trackingSetup
@ -99,13 +105,15 @@ TrackingPage::retranslate()
.arg( product ) ); .arg( product ) );
} }
bool TrackingPage::anyOtherChecked() const bool
TrackingPage::anyOtherChecked() const
{ {
return ui->installCheckBox->isChecked() || ui->machineCheckBox->isChecked() || ui->userCheckBox->isChecked(); return ui->installCheckBox->isChecked() || ui->machineCheckBox->isChecked() || ui->userCheckBox->isChecked();
} }
void TrackingPage::buttonNoneChecked(int state) void
TrackingPage::buttonNoneChecked( int state )
{ {
if ( state ) if ( state )
{ {
@ -116,7 +124,8 @@ void TrackingPage::buttonNoneChecked(int state)
} }
} }
void TrackingPage::buttonChecked(int state) void
TrackingPage::buttonChecked( int state )
{ {
if ( state ) if ( state )
{ {

1
src/modules/tracking/TrackingViewStep.cpp
View File

@ -122,4 +122,3 @@ TrackingViewStep::setConfigurationMap( const QVariantMap& configurationMap )
{ {
m_config->setConfigurationMap( configurationMap ); m_config->setConfigurationMap( configurationMap );
} }