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

Fixes for suggestions from cppcheck.

This commit is contained in:
Stephen Anthony 2021-01-05 22:36:16 -03:30
parent 21438a82cc
commit 916a2cdfff
8 changed files with 26 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/common/HighScoresManager.cxx
View File

@ -565,7 +565,7 @@ Int32 HighScoresManager::fromBCD(uInt8 bcd) const
} }
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
string HighScoresManager::hash(ScoresData& data) const string HighScoresManager::hash(const ScoresData& data) const
{ {
ostringstream buf; ostringstream buf;

28
src/common/HighScoresManager.hxx
View File

@ -54,31 +54,31 @@ namespace HSM {
struct ScoresProps { struct ScoresProps {
// Formats // Formats
uInt32 numDigits; uInt32 numDigits{0};
uInt32 trailingZeroes; uInt32 trailingZeroes{0};
bool scoreBCD; bool scoreBCD{false};
bool scoreInvert; bool scoreInvert{false};
bool varsBCD; bool varsBCD{false};
bool varsZeroBased; bool varsZeroBased{false};
string special; string special;
bool specialBCD; bool specialBCD{false};
bool specialZeroBased; bool specialZeroBased{false};
string notes; string notes;
// Addresses // Addresses
ScoreAddresses scoreAddr; ScoreAddresses scoreAddr;
uInt16 varsAddr; uInt16 varsAddr{0};
uInt16 specialAddr; uInt16 specialAddr{0};
}; };
struct ScoreEntry { struct ScoreEntry {
Int32 score; Int32 score{0};
Int32 special; Int32 special{0};
string name; string name;
string date; string date;
}; };
struct ScoresData { struct ScoresData {
Int32 variation; Int32 variation{0};
string md5; string md5;
ScoreEntry scores[NUM_RANKS]; ScoreEntry scores[NUM_RANKS];
}; };
@ -232,7 +232,7 @@ class HighScoresManager
uInt16 fromHexStr(const string& addr) const; uInt16 fromHexStr(const string& addr) const;
Int32 fromBCD(uInt8 bcd) const; Int32 fromBCD(uInt8 bcd) const;
string hash(HSM::ScoresData& data) const; string hash(const HSM::ScoresData& data) const;
/** /**
Loads the current high scores for this game and variation from the given JSON object. Loads the current high scores for this game and variation from the given JSON object.

4
src/common/repository/CompositeKVRJsonAdapter.cxx
View File

@ -24,7 +24,7 @@ namespace {
class ProxyRepository : public KeyValueRepository { class ProxyRepository : public KeyValueRepository {
public: public:
ProxyRepository(KeyValueRepositoryAtomic& kvr, const string& key) ProxyRepository(KeyValueRepositoryAtomic& kvr, const string& key)
: myKvr(kvr), myKey(key) : myKvr{kvr}, myKey{key}
{} {}
std::map<string, Variant> load() override { std::map<string, Variant> load() override {
@ -55,7 +55,7 @@ namespace {
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
CompositeKVRJsonAdapter::CompositeKVRJsonAdapter(KeyValueRepositoryAtomic& kvr) CompositeKVRJsonAdapter::CompositeKVRJsonAdapter(KeyValueRepositoryAtomic& kvr)
: myKvr(kvr) : myKvr{kvr}
{} {}
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

2
src/common/repository/CompositeKVRJsonAdapter.hxx
View File

@ -25,7 +25,7 @@
class CompositeKVRJsonAdapter : public CompositeKeyValueRepository { class CompositeKVRJsonAdapter : public CompositeKeyValueRepository {
public: public:
CompositeKVRJsonAdapter(KeyValueRepositoryAtomic& kvr); explicit CompositeKVRJsonAdapter(KeyValueRepositoryAtomic& kvr);
shared_ptr<KeyValueRepository> get(const string& key) override; shared_ptr<KeyValueRepository> get(const string& key) override;

8
src/common/repository/CompositeKeyValueRepositoryNoop.hxx
View File

@ -29,11 +29,13 @@ class CompositeKeyValueRepositoryNoop : public CompositeKeyValueRepositoryAtomic
using CompositeKeyValueRepositoryAtomic::remove; using CompositeKeyValueRepositoryAtomic::remove;
using CompositeKeyValueRepositoryAtomic::get; using CompositeKeyValueRepositoryAtomic::get;
shared_ptr<KeyValueRepository> get(const string& key) { return make_shared<KeyValueRepositoryNoop>(); } shared_ptr<KeyValueRepository> get(const string& key) override {
return make_shared<KeyValueRepositoryNoop>();
}
bool has(const string& key) { return false; } bool has(const string& key) override { return false; }
void remove(const string& key) {} void remove(const string& key) override {}
}; };
#endif // COMPOSITE_KEY_VALUE_REPOSITORY_NOOP_HXX #endif // COMPOSITE_KEY_VALUE_REPOSITORY_NOOP_HXX

2
src/common/repository/KeyValueRepositoryConfigfile.hxx
View File

@ -27,7 +27,7 @@ class KeyValueRepositoryConfigfile : public KeyValueRepositoryFile<KeyValueRepos
using KeyValueRepositoryFile<KeyValueRepositoryConfigfile>::load; using KeyValueRepositoryFile<KeyValueRepositoryConfigfile>::load;
using KeyValueRepositoryFile<KeyValueRepositoryConfigfile>::save; using KeyValueRepositoryFile<KeyValueRepositoryConfigfile>::save;
KeyValueRepositoryConfigfile(const FilesystemNode& node); explicit KeyValueRepositoryConfigfile(const FilesystemNode& node);
static std::map<string, Variant> load(istream& in); static std::map<string, Variant> load(istream& in);

2
src/common/repository/KeyValueRepositoryFile.hxx
View File

@ -46,7 +46,7 @@ class KeyValueRepositoryFile : public KeyValueRepository {
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
template<class T> template<class T>
KeyValueRepositoryFile<T>::KeyValueRepositoryFile(const FilesystemNode& node) KeyValueRepositoryFile<T>::KeyValueRepositoryFile(const FilesystemNode& node)
: myNode(node) : myNode{node}
{} {}
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

2
src/gui/HighScoresMenu.cxx
View File

@ -22,7 +22,7 @@
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
HighScoresMenu::HighScoresMenu(OSystem& osystem) HighScoresMenu::HighScoresMenu(OSystem& osystem)
: DialogContainer(osystem) : DialogContainer{osystem}
{ {
} }