Few more fixes for suggestions from cppcheck.

This commit is contained in:
Stephen Anthony 2020-12-22 19:29:49 -03:30
parent 2a07daccb4
commit f0cb916282
4 changed files with 10 additions and 11 deletions

View File

@ -49,7 +49,7 @@ class PhysicalJoystickHandler
private:
struct StickInfo
{
StickInfo(nlohmann::json map, PhysicalJoystickPtr stick = nullptr)
explicit StickInfo(nlohmann::json map, PhysicalJoystickPtr stick = nullptr)
: mapping(map), joy{std::move(stick)} {}
nlohmann::json mapping;

View File

@ -76,13 +76,12 @@ RiotWidget::RiotWidget(GuiObject* boss, const GUI::Font& lfont,
bits->setTarget(this); \
bits->setID(bitsID); \
if(editable) addFocusWidget(bits); else bits->setEditable(false); \
xpos += bits->getWidth() + 5; \
bits->setList(off, on);
// SWCHA bits in 'poke' mode
labels.clear();
CREATE_IO_REGS("SWCHA(W)", mySWCHAWriteBits, kSWCHABitsID, true)
col = xpos + 20; // remember this for adding widgets to the second column
col = xpos + mySWCHAWriteBits->getWidth() + 25; // remember this for adding widgets to the second column
// SWACNT bits
xpos = 10; ypos += lineHeight + 5;

View File

@ -232,7 +232,7 @@ class CartridgeCM : public Cartridge
/**
Inform the cartridge about the parent CompuMate controller
*/
void setCompuMate(shared_ptr<CompuMate>& cmate) { myCompuMate = cmate; }
void setCompuMate(const shared_ptr<CompuMate>& cmate) { myCompuMate = cmate; }
/**
Get the current keyboard column

View File

@ -725,21 +725,21 @@ void DeveloperDialog::saveSettings(SettingsSet set)
instance().settings().setValue(prefix + "bankrandom", myRandomBank[set]);
instance().settings().setValue(prefix + "ramrandom", myRandomizeRAM[set]);
instance().settings().setValue(prefix + "cpurandom", myRandomizeCPU[set]);
// Undriven TIA pins
if(devSettings)
instance().settings().setValue("dev.tiadriven", myUndrivenPins[set]);
#ifdef DEBUGGER_SUPPORT
if (devSettings)
{
// Undriven TIA pins
instance().settings().setValue("dev.tiadriven", myUndrivenPins[set]);
#ifdef DEBUGGER_SUPPORT
// Read from write ports break
instance().settings().setValue("dev.rwportbreak", myRWPortBreak[set]);
// Write to read ports break
instance().settings().setValue("dev.wrportbreak", myWRPortBreak[set]);
}
#endif
if(devSettings)
#endif
// Thumb ARM emulation exception
instance().settings().setValue("dev.thumb.trapfatal", myThumbException[set]);
}
// AtariVox/SaveKey EEPROM access
instance().settings().setValue(prefix + "eepromaccess", myEEPROMAccess[set]);