mirror of https://github.com/stella-emu/stella.git
Fix a few compiler warning and errors from the latest g++ and clang compilers.
This commit is contained in:
parent
8565432861
commit
b2faf3e635
|
@ -26,7 +26,7 @@ class Event;
|
|||
|
||||
@author Thomas Jentzsch
|
||||
*/
|
||||
class QuadTari: public Controller
|
||||
class QuadTari : public Controller
|
||||
{
|
||||
friend class QuadTariWidget;
|
||||
public:
|
||||
|
@ -34,15 +34,16 @@ class QuadTari: public Controller
|
|||
Create a QuadTari controller plugged into the specified jack
|
||||
|
||||
@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 firstType The type of the first, plugged-in controller
|
||||
@param secondType The type of the second, plugged-in controller
|
||||
@param properties The properties to use for the current ROM
|
||||
*/
|
||||
QuadTari(Jack jack, OSystem& osystem, const System& system, const Properties& properties);
|
||||
~QuadTari() override = default;
|
||||
|
||||
public:
|
||||
using Controller::read;
|
||||
|
||||
/**
|
||||
Read the value of the specified digital pin for this controller.
|
||||
|
||||
|
|
|
@ -394,6 +394,11 @@ GameInfoDialog::GameInfoDialog(
|
|||
addBGroupToFocusList(wid);
|
||||
}
|
||||
|
||||
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
|
||||
GameInfoDialog::~GameInfoDialog()
|
||||
{
|
||||
}
|
||||
|
||||
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
|
||||
void GameInfoDialog::loadConfig()
|
||||
{
|
||||
|
|
|
@ -37,7 +37,7 @@ class GameInfoDialog : public Dialog, public CommandSender
|
|||
public:
|
||||
GameInfoDialog(OSystem& osystem, DialogContainer& parent,
|
||||
const GUI::Font& font, GuiObject* boss, int max_w, int max_h);
|
||||
~GameInfoDialog() override = default;
|
||||
~GameInfoDialog() override;
|
||||
|
||||
private:
|
||||
void loadConfig() override;
|
||||
|
|
|
@ -33,8 +33,7 @@ QuadTariDialog::QuadTariDialog(GuiObject* boss, const GUI::Font& font, int max_w
|
|||
{
|
||||
const int lineHeight = font.getLineHeight(),
|
||||
fontHeight = font.getFontHeight(),
|
||||
fontWidth = font.getMaxCharWidth(),
|
||||
buttonHeight = font.getLineHeight() * 1.25;
|
||||
fontWidth = font.getMaxCharWidth();
|
||||
const int VBORDER = fontHeight / 2;
|
||||
const int HBORDER = fontWidth * 1.25;
|
||||
const int VGAP = fontHeight / 4;
|
||||
|
|
|
@ -36,6 +36,7 @@ MODULE_OBJS := \
|
|||
src/gui/OptionsDialog.o \
|
||||
src/gui/PopUpWidget.o \
|
||||
src/gui/ProgressDialog.o \
|
||||
src/gui/QuadTariDialog.o \
|
||||
src/gui/R77HelpDialog.o \
|
||||
src/gui/RadioButtonWidget.o \
|
||||
src/gui/RomAuditDialog.o \
|
||||
|
|
Loading…
Reference in New Issue