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

[tracking] Reduce compile warnings

Browse source 
The fallthrough construction in a switch is a bit confusing
to read, and generates compile warnings too, so break it up.
This commit is contained in:
Adriaan de Groot 2018-03-06 16:11:50 +01:00
parent defc7d4df8
commit e2f6d160f8
1 changed files with 8 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/modules/tracking/TrackingPage.cpp
View file

@ -90,17 +90,20 @@ bool TrackingPage::getTrackingOption(TrackingType t)
// A tracking type is enabled if it is checked, or // A tracking type is enabled if it is checked, or
// any higher level is checked. // any higher level is checked.
#define ch(x) ui->x->isChecked()
switch ( t ) switch ( t )
{ {
case TrackingType::InstallTracking: case TrackingType::InstallTracking:
enabled |= ui->installRadio->isChecked(); enabled = ch(installRadio) || ch(machineRadio) || ch(userRadio);
// FALLTHRU break;
case TrackingType::MachineTracking: case TrackingType::MachineTracking:
enabled |= ui->machineRadio->isChecked(); enabled = ch(machineRadio) || ch(userRadio);
// FALLTHRU break;
case TrackingType::UserTracking: case TrackingType::UserTracking:
enabled |= ui->userRadio->isChecked(); enabled = ch(userRadio);
break;
} }
#undef ch
return enabled; return enabled;
} }