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

Fix a few compiler warning and errors from the latest g++ and clang compilers.

This commit is contained in:
Stephen Anthony 2020-09-03 20:44:41 -02:30
parent 8565432861
commit b2faf3e635
5 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/emucore/QuadTari.hxx
View File

@ -26,23 +26,24 @@ class Event;
@author Thomas Jentzsch @author Thomas Jentzsch
*/ */
class QuadTari: public Controller class QuadTari : public Controller
{ {
friend class QuadTariWidget; friend class QuadTariWidget;
public: public:
/** /**
Create a QuadTari controller plugged into the specified jack Create a QuadTari controller plugged into the specified jack
@param jack The jack the controller is plugged into @param jack The jack the controller is plugged into
@param event The event object to use for events @param osystem The OSystem object to use
@param system The system using this controller @param system The system using this controller
@param firstType The type of the first, plugged-in controller @param properties The properties to use for the current ROM
@param secondType The type of the second, plugged-in controller
*/ */
QuadTari(Jack jack, OSystem& osystem, const System& system, const Properties& properties); QuadTari(Jack jack, OSystem& osystem, const System& system, const Properties& properties);
~QuadTari() override = default; ~QuadTari() override = default;
public: public:
using Controller::read;
/** /**
Read the value of the specified digital pin for this controller. Read the value of the specified digital pin for this controller.

5
src/gui/GameInfoDialog.cxx
View File

@ -394,6 +394,11 @@ GameInfoDialog::GameInfoDialog(
addBGroupToFocusList(wid); addBGroupToFocusList(wid);
} }
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
GameInfoDialog::~GameInfoDialog()
{
}
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
void GameInfoDialog::loadConfig() void GameInfoDialog::loadConfig()
{ {

2
src/gui/GameInfoDialog.hxx
View File

@ -37,7 +37,7 @@ class GameInfoDialog : public Dialog, public CommandSender
public: public:
GameInfoDialog(OSystem& osystem, DialogContainer& parent, GameInfoDialog(OSystem& osystem, DialogContainer& parent,
const GUI::Font& font, GuiObject* boss, int max_w, int max_h); const GUI::Font& font, GuiObject* boss, int max_w, int max_h);
~GameInfoDialog() override = default; ~GameInfoDialog() override;
private: private:
void loadConfig() override; void loadConfig() override;

3
src/gui/QuadTariDialog.cxx
View File

@ -33,8 +33,7 @@ QuadTariDialog::QuadTariDialog(GuiObject* boss, const GUI::Font& font, int max_w
{ {
const int lineHeight = font.getLineHeight(), const int lineHeight = font.getLineHeight(),
fontHeight = font.getFontHeight(), fontHeight = font.getFontHeight(),
fontWidth = font.getMaxCharWidth(), fontWidth = font.getMaxCharWidth();
buttonHeight = font.getLineHeight() * 1.25;
const int VBORDER = fontHeight / 2; const int VBORDER = fontHeight / 2;
const int HBORDER = fontWidth * 1.25; const int HBORDER = fontWidth * 1.25;
const int VGAP = fontHeight / 4; const int VGAP = fontHeight / 4;

1
src/gui/module.mk
View File

@ -36,6 +36,7 @@ MODULE_OBJS := \
src/gui/OptionsDialog.o \ src/gui/OptionsDialog.o \
src/gui/PopUpWidget.o \ src/gui/PopUpWidget.o \
src/gui/ProgressDialog.o \ src/gui/ProgressDialog.o \
src/gui/QuadTariDialog.o \
src/gui/R77HelpDialog.o \ src/gui/R77HelpDialog.o \
src/gui/RadioButtonWidget.o \ src/gui/RadioButtonWidget.o \
src/gui/RomAuditDialog.o \ src/gui/RomAuditDialog.o \