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

[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
Show Stats 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
// any higher level is checked.
#define ch(x) ui->x->isChecked()
switch ( t )
{
case TrackingType::InstallTracking:
enabled |= ui->installRadio->isChecked();
// FALLTHRU
enabled = ch(installRadio) || ch(machineRadio) || ch(userRadio);
break;
case TrackingType::MachineTracking:
enabled |= ui->machineRadio->isChecked();
// FALLTHRU
enabled = ch(machineRadio) || ch(userRadio);
break;
case TrackingType::UserTracking:
enabled |= ui->userRadio->isChecked();
enabled = ch(userRadio);
break;
}
#undef ch
return enabled;
}