Fix warning with unused variables.

I left most of them there commented out, since they may be needed in the future.
This commit is contained in:
Stephen Anthony 2020-12-27 15:03:04 -03:30
parent 03e6f4d6ae
commit 2ca9c6bee8
6 changed files with 12 additions and 15 deletions

View File

@ -36,7 +36,7 @@ CheatCodeDialog::CheatCodeDialog(OSystem& osystem, DialogContainer& parent,
: Dialog(osystem, parent, font, "Cheat codes")
{
const int lineHeight = Dialog::lineHeight(),
fontHeight = Dialog::fontHeight(),
//fontHeight = Dialog::fontHeight(),
fontWidth = Dialog::fontWidth(),
buttonHeight = Dialog::buttonHeight(),
buttonWidth = Dialog::buttonWidth("One shot "),

View File

@ -35,8 +35,8 @@ BrowserDialog::BrowserDialog(GuiObject* boss, const GUI::Font& font,
_w = max_w;
_h = max_h;
const int lineHeight = Dialog::lineHeight(),
fontHeight = Dialog::fontHeight(),
fontWidth = Dialog::fontWidth(),
//fontHeight = Dialog::fontHeight(),
//fontWidth = Dialog::fontWidth(),
buttonHeight = Dialog::buttonHeight(),
buttonWidth = Dialog::buttonWidth("Base Dir"),
BUTTON_GAP = Dialog::buttonGap(),

View File

@ -135,10 +135,10 @@ class Dialog : public GuiObject
return _font.getStringWidth(label) + fontWidth() * 2.5;
}
int buttonGap() const { return fontWidth(); }
int hBorder() const { return fontWidth() * 1.25; };
int vBorder() const { return fontHeight() / 2; };
int vGap() const { return fontHeight() / 4; };
int indent() const { return fontWidth() * 2; };
int hBorder() const { return fontWidth() * 1.25; }
int vBorder() const { return fontHeight() / 2; }
int vGap() const { return fontHeight() / 4; }
int indent() const { return fontWidth() * 2; }
protected:
void draw() override { }

View File

@ -136,8 +136,8 @@ GlobalPropsDialog::GlobalPropsDialog(GuiObject* boss, const GUI::Font& font)
int GlobalPropsDialog::addHoldWidgets(const GUI::Font& font, int x, int y,
WidgetArray& wid)
{
const int fontHeight = Dialog::fontHeight(),
fontWidth = Dialog::fontWidth(),
const int fontWidth = Dialog::fontWidth(),
//fontHeight = Dialog::fontHeight(),
VGAP = Dialog::vGap();
int xpos = x, ypos = y, xdiff = CheckboxWidget::boxSize(font) - 9;

View File

@ -71,8 +71,7 @@ LauncherDialog::LauncherDialog(OSystem& osystem, DialogContainer& parent,
BUTTON_GAP = Dialog::buttonGap(),
VBORDER = Dialog::vBorder(),
HBORDER = Dialog::hBorder(),
VGAP = Dialog::vGap(),
INDENT = Dialog::indent();
VGAP = Dialog::vGap();
const int LBL_GAP = fontWidth,
buttonHeight = myUseMinimalUI ? lineHeight - VGAP * 2: Dialog::buttonHeight(),
buttonWidth = (_w - 2 * HBORDER - BUTTON_GAP * (4 - 1));

View File

@ -54,12 +54,10 @@ OptionsDialog::OptionsDialog(OSystem& osystem, DialogContainer& parent,
{
// do not show basic settings options in debugger
bool minSettings = osystem.settings().getBool("minimal_ui") && mode != Menu::AppMode::debugger;
const int lineHeight = Dialog::lineHeight(),
buttonHeight = Dialog::buttonHeight(),
const int buttonHeight = Dialog::buttonHeight(),
VBORDER = Dialog::vBorder(),
HBORDER = Dialog::hBorder(),
VGAP = Dialog::vGap(),
INDENT = Dialog::indent();
VGAP = Dialog::vGap();
const int HGAP = Dialog::buttonGap(),
rowHeight = buttonHeight + VGAP;
int buttonWidth = Dialog::buttonWidth("Game Properties" + ELLIPSIS);