ShuriZma
/
stella
mirror of https://github.com/stella-emu/stella.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed compile warnings under clang: 

- multiline IF statements should have braces
- override keyword not being used when overriding virtual methods
This commit is contained in:
Stephen Anthony 2017-10-03 19:14:07 -02:30
parent 46f2ae0cab
commit 1fa3f0cf0d
2 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/gui/GameInfoDialog.cxx
View File

@ -556,15 +556,19 @@ void GameInfoDialog::updateControllerStates(int cmd)
// make sure the CompuMate is always selected for both controllers // make sure the CompuMate is always selected for both controllers
if(cmd == kLeftCChanged) if(cmd == kLeftCChanged)
{
if(contrP0 == "COMPUMATE") if(contrP0 == "COMPUMATE")
myP1Controller->setSelected("COMPUMATE"); myP1Controller->setSelected("COMPUMATE");
else if(contrP1 == "COMPUMATE") else if(contrP1 == "COMPUMATE")
myP1Controller->setSelected(contrP0); myP1Controller->setSelected(contrP0);
}
if(cmd == kRightCChanged) if(cmd == kRightCChanged)
{
if(contrP1 == "COMPUMATE") if(contrP1 == "COMPUMATE")
myP0Controller->setSelected("COMPUMATE"); myP0Controller->setSelected("COMPUMATE");
else if(contrP0 == "COMPUMATE") else if(contrP0 == "COMPUMATE")
myP0Controller->setSelected(contrP1); myP0Controller->setSelected(contrP1);
}
enableSwapPorts = myP0Controller->getSelectedTag().toString() != "COMPUMATE"; enableSwapPorts = myP0Controller->getSelectedTag().toString() != "COMPUMATE";
enableSwapPaddles = string::npos != contrP0.find("PADDLES") enableSwapPaddles = string::npos != contrP0.find("PADDLES")

4
src/gui/PopUpWidget.hxx
View File

@ -42,8 +42,8 @@ class PopUpWidget : public Widget, public CommandSender
const string& label, int labelWidth = 0, int cmd = 0); const string& label, int labelWidth = 0, int cmd = 0);
virtual ~PopUpWidget() = default; virtual ~PopUpWidget() = default;
int getTop() const { return _y + 1; } int getTop() const override { return _y + 1; }
int getBottom() const { return _y + 1 + getHeight(); } int getBottom() const override { return _y + 1 + getHeight(); }
/** Add the given items to the widget. */ /** Add the given items to the widget. */
void addItems(const VariantList& items) { myMenu->addItems(items); } void addItems(const VariantList& items) { myMenu->addItems(items); }