GUI: Add Missing Switch Default Cases

These are flagged by GCC if -Wswitch-default is enabled.
This commit is contained in:
D G Turner 2019-10-03 06:03:46 +01:00
parent 904e58c35b
commit 30c366ee5d
15 changed files with 43 additions and 4 deletions

View File

@ -1082,6 +1082,9 @@ void ThemeEngine::drawDialogBackground(const Common::Rect &r, DialogBackground b
case kDialogBackgroundDefault:
drawDD(kDDDefaultBackground, r);
break;
default:
// fallthrough intended
case kDialogBackgroundNone:
// no op
break;
@ -1209,6 +1212,8 @@ void ThemeEngine::drawText(const Common::Rect &r, const Common::String &str, Wid
colorId = kTextColorNormalHover;
break;
default:
// fallthrough intended
case kStateEnabled:
case kStatePressed:
colorId = kTextColorNormal;
@ -1230,6 +1235,8 @@ void ThemeEngine::drawText(const Common::Rect &r, const Common::String &str, Wid
colorId = kTextColorAlternativeHover;
break;
default:
// fallthrough intended
case kStateEnabled:
case kStatePressed:
colorId = kTextColorAlternative;

View File

@ -489,12 +489,16 @@ void ConsoleDialog::insertIntoPrompt(const char* str) {
void ConsoleDialog::handleCommand(CommandSender *sender, uint32 cmd, uint32 data) {
switch (cmd) {
case kSetPositionCmd:
int newPos = (int)data + _linesPerPage - 1 + _firstLineInBuffer;
if (newPos != _scrollLine) {
_scrollLine = newPos;
g_gui.scheduleTopDialogRedraw();
{
int newPos = (int)data + _linesPerPage - 1 + _firstLineInBuffer;
if (newPos != _scrollLine) {
_scrollLine = newPos;
g_gui.scheduleTopDialogRedraw();
}
}
break;
default:
break;
}
}

View File

@ -403,6 +403,8 @@ void Debugger::splitCommand(Common::String &input, int &argc, const char **argv)
c = (byte)*p;
switch (state) {
default:
// fallthrough intended
case DULL:
// not in a word, not in a double quoted string
if (isspace(c))

View File

@ -353,6 +353,8 @@ void Dialog::handleCommand(CommandSender *sender, uint32 cmd, uint32 data) {
case kCloseCmd:
close();
break;
default:
break;
}
}

View File

@ -454,6 +454,8 @@ void LauncherDialog::recordGame(int item) {
MessageDialog alert(_("Do you want to load saved game?"),
_("Yes"), _("No"));
switch(recorderDialog.runModal(_domains[item])) {
default:
// fallthrough intended
case RecorderDialog::kRecordDialogClose:
break;
case RecorderDialog::kRecordDialogPlayback:

View File

@ -153,6 +153,8 @@ void OnScreenDialog::handleCommand(CommandSender *sender, uint32 cmd, uint32 dat
case kFastModeCmd:
g_eventRec.switchFastMode();
break;
default:
break;
}
}

View File

@ -2350,6 +2350,8 @@ void GlobalOptionsDialog::handleCommand(CommandSender *sender, uint32 cmd, uint3
case Cloud::kStorageBoxId:
url += "box";
break;
default:
break;
}
if (!g_system->openUrl(url)) {

View File

@ -532,6 +532,8 @@ void PredictiveDialog::processButton(ButtonId button) {
_temp[x] = buttons[_currentCode[x] - '1'][_repeatcount[x]];
_temp[_currentCode.size()] = 0;
_currentWord = _temp;
default:
break;
}
} else if (button == kNextAct) { // next
if (_mode == kModePre) {

View File

@ -84,6 +84,9 @@ void SaveLoadCloudSyncProgressDialog::handleCommand(CommandSender *sender, uint3
case kBackgroundSyncCmd:
_close = true;
break;
default:
break;
}
Dialog::handleCommand(sender, cmd, data);

View File

@ -51,6 +51,8 @@ void SaveLoadChooser::selectChooser(const MetaEngine &engine) {
_impl = new SaveLoadChooserGrid(_title, _saveMode);
break;
default:
// fallthrough intended
case kSaveLoadDialogList:
#endif // !DISABLE_SAVELOADCHOOSER_GRID
_impl = new SaveLoadChooserSimple(_title, _buttonLabel, _saveMode);

View File

@ -232,6 +232,8 @@ void UnknownGameDialog::handleCommand(CommandSender *sender, uint32 cmd, uint32
for (uint i = 0; i < _textWidgets.size() ; i++)
_textWidgets[i]->setVisible(true);
break;
default:
break;
}
}

View File

@ -237,6 +237,8 @@ uint8 Widget::parseHotkey(const Common::String &label) {
else
state = 0;
break;
default:
break;
}
}

View File

@ -516,6 +516,8 @@ void ListWidget::handleCommand(CommandSender *sender, uint32 cmd, uint32 data) {
((GUI::Dialog *)_boss)->setFocusWidget(this);
}
break;
default:
break;
}
}

View File

@ -111,6 +111,8 @@ void ScrollContainerWidget::handleCommand(CommandSender *sender, uint32 cmd, uin
reflowLayout();
g_gui.scheduleTopDialogRedraw();
break;
default:
break;
}
}

View File

@ -195,6 +195,9 @@ void TabWidget::handleCommand(CommandSender *sender, uint32 cmd, uint32 data) {
setFirstVisible(_firstVisibleTab + 1, false);
}
break;
default:
break;
}
}