thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

GUI: Fix Set But Unused Variable Compiler Warnings in List Widgets

Browse source
This commit is contained in:
D G Turner 2022-05-28 16:33:00 +01:00
parent 35fd16cd63
commit c99f548212
2 changed files with 12 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

8
gui/widgets/groupedlist.cpp
View file

@ -268,7 +268,9 @@ void GroupedListWidget::drawWidget() {
const int y = _y + _topPadding + kLineHeight * i; const int y = _y + _topPadding + kLineHeight * i;
const int fontHeight = g_gui.getFontHeight(); const int fontHeight = g_gui.getFontHeight();
ThemeEngine::TextInversionState inverted = ThemeEngine::kTextInversionNone; ThemeEngine::TextInversionState inverted = ThemeEngine::kTextInversionNone;
#if 0
ThemeEngine::FontStyle bold = ThemeEngine::kFontStyleBold; ThemeEngine::FontStyle bold = ThemeEngine::kFontStyleBold;
#endif
// Draw the selected item inverted, on a highlighted background. // Draw the selected item inverted, on a highlighted background.
if (_selectedItem == pos) if (_selectedItem == pos)
@ -280,7 +282,9 @@ void GroupedListWidget::drawWidget() {
if (isGroupHeader(_listIndex[pos])) { if (isGroupHeader(_listIndex[pos])) {
int groupID = indexToGroupID(_listIndex[pos]); int groupID = indexToGroupID(_listIndex[pos]);
#if 0
bold = ThemeEngine::kFontStyleBold; bold = ThemeEngine::kFontStyleBold;
#endif
r.left += fontHeight + _leftPadding; r.left += fontHeight + _leftPadding;
g_gui.theme()->drawFoldIndicator(Common::Rect(_x + _hlLeftPadding + _leftPadding, y, _x + fontHeight + _leftPadding, y + fontHeight), _groupExpanded[groupID]); g_gui.theme()->drawFoldIndicator(Common::Rect(_x + _hlLeftPadding + _leftPadding, y, _x + fontHeight + _leftPadding, y + fontHeight), _groupExpanded[groupID]);
pad = 0; pad = 0;
@ -294,6 +298,7 @@ void GroupedListWidget::drawWidget() {
pad = 0; pad = 0;
} }
#if 0
ThemeEngine::FontColor color = ThemeEngine::kFontColorNormal; ThemeEngine::FontColor color = ThemeEngine::kFontColorNormal;
if (!_listColors.empty()) { if (!_listColors.empty()) {
@ -302,6 +307,7 @@ void GroupedListWidget::drawWidget() {
else else
color = _listColors[_listIndex[pos]]; color = _listColors[_listIndex[pos]];
} }
#endif
Common::Rect r1(_x + r.left, y, _x + r.right, y + fontHeight); Common::Rect r1(_x + r.left, y, _x + r.right, y + fontHeight);
@ -317,7 +323,9 @@ void GroupedListWidget::drawWidget() {
if (_selectedItem == pos && _editMode) { if (_selectedItem == pos && _editMode) {
buffer = _editString; buffer = _editString;
#if 0
color = _editColor; color = _editColor;
#endif
adjustOffset(); adjustOffset();
} else { } else {
buffer = _list[pos]; buffer = _list[pos];

4
gui/widgets/list.cpp
View file

@ -589,6 +589,7 @@ void ListWidget::drawWidget() {
pad = 0; pad = 0;
} }
#if 0
ThemeEngine::FontColor color = ThemeEngine::kFontColorNormal; ThemeEngine::FontColor color = ThemeEngine::kFontColorNormal;
if (!_listColors.empty()) { if (!_listColors.empty()) {
@ -597,6 +598,7 @@ void ListWidget::drawWidget() {
else else
color = _listColors[_listIndex[pos]]; color = _listColors[_listIndex[pos]];
} }
#endif
Common::Rect r1(_x + r.left, y, _x + r.right, y + fontHeight); Common::Rect r1(_x + r.left, y, _x + r.right, y + fontHeight);
@ -612,7 +614,9 @@ void ListWidget::drawWidget() {
if (_selectedItem == pos && _editMode) { if (_selectedItem == pos && _editMode) {
buffer = _editString; buffer = _editString;
#if 0
color = _editColor; color = _editColor;
#endif
adjustOffset(); adjustOffset();
} else { } else {
buffer = _list[pos]; buffer = _list[pos];