Yet more conversion of 'const string&' to 'string_view'.

This commit is contained in:
Stephen Anthony 2022-12-19 19:33:19 -03:30
parent e2534af4e8
commit 06699aafa0
119 changed files with 167 additions and 163 deletions

View File

@ -480,28 +480,28 @@ Int32 HighScoresManager::convert(Int32 val, uInt32 maxVal, bool isBCD,
} }
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
bool HighScoresManager::getPropBool(const json& jprops, const string& key, bool HighScoresManager::getPropBool(const json& jprops, string_view key,
bool defVal) bool defVal)
{ {
return jprops.contains(key) ? jprops.at(key).get<bool>() : defVal; return jprops.contains(key) ? jprops.at(key).get<bool>() : defVal;
} }
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
uInt32 HighScoresManager::getPropInt(const json& jprops, const string& key, uInt32 HighScoresManager::getPropInt(const json& jprops, string_view key,
uInt32 defVal) uInt32 defVal)
{ {
return jprops.contains(key) ? jprops.at(key).get<uInt32>() : defVal; return jprops.contains(key) ? jprops.at(key).get<uInt32>() : defVal;
} }
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
string HighScoresManager::getPropStr(const json& jprops, const string& key, string HighScoresManager::getPropStr(const json& jprops, string_view key,
const string& defVal) string_view defVal)
{ {
return jprops.contains(key) ? jprops.at(key).get<string>() : defVal; return jprops.contains(key) ? jprops.at(key).get<string>() : string{defVal};
} }
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
uInt16 HighScoresManager::getPropAddr(const json& jprops, const string& key, uInt16 HighScoresManager::getPropAddr(const json& jprops, string_view key,
uInt16 defVal) uInt16 defVal)
{ {
const string str = getPropStr(jprops, key); const string str = getPropStr(jprops, key);

View File

@ -222,13 +222,13 @@ class HighScoresManager
json properties(json& jprops) const; json properties(json& jprops) const;
// Get value from highscore properties for given key // Get value from highscore properties for given key
static bool getPropBool(const json& jprops, const string& key, static bool getPropBool(const json& jprops, string_view key,
bool defVal = false); bool defVal = false);
static uInt32 getPropInt(const json& jprops, const string& key, static uInt32 getPropInt(const json& jprops, string_view key,
uInt32 defVal = 0); uInt32 defVal = 0);
static string getPropStr(const json& jprops, const string& key, static string getPropStr(const json& jprops, string_view key,
const string& defVal = ""); string_view defVal = "");
static uInt16 getPropAddr(const json& jprops, const string& key, static uInt16 getPropAddr(const json& jprops, string_view key,
uInt16 defVal = 0); uInt16 defVal = 0);
static HSM::ScoreAddresses getPropScoreAddr(const json& jprops); static HSM::ScoreAddresses getPropScoreAddr(const json& jprops);

View File

@ -286,12 +286,13 @@ int KeyMap::loadMapping(const json& mappings, const EventMode mode) {
} }
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
json KeyMap::convertLegacyMapping(string list) json KeyMap::convertLegacyMapping(string_view lm)
{ {
json convertedMapping = json::array(); json convertedMapping = json::array();
// Since istringstream swallows whitespace, we have to make the // Since istringstream swallows whitespace, we have to make the
// delimiters be spaces // delimiters be spaces
string list{lm};
std::replace(list.begin(), list.end(), '|', ' '); std::replace(list.begin(), list.end(), '|', ' ');
std::replace(list.begin(), list.end(), ':', ' '); std::replace(list.begin(), list.end(), ':', ' ');
std::replace(list.begin(), list.end(), ',', ' '); std::replace(list.begin(), list.end(), ',', ' ');

View File

@ -90,7 +90,7 @@ class KeyMap
nlohmann::json saveMapping(const EventMode mode) const; nlohmann::json saveMapping(const EventMode mode) const;
int loadMapping(const nlohmann::json& mapping, const EventMode mode); int loadMapping(const nlohmann::json& mapping, const EventMode mode);
static nlohmann::json convertLegacyMapping(string list); static nlohmann::json convertLegacyMapping(string_view list);
/** Erase all mappings for given mode */ /** Erase all mappings for given mode */
void eraseMode(const EventMode mode); void eraseMode(const EventMode mode);

View File

@ -47,7 +47,7 @@ PhysicalJoystickHandler::PhysicalJoystickHandler(
} }
json mappings; json mappings;
const string& serializedMapping = myOSystem.settings().getString("joymap"); string_view serializedMapping = myOSystem.settings().getString("joymap");
try { try {
mappings = json::parse(serializedMapping); mappings = json::parse(serializedMapping);
@ -68,11 +68,11 @@ PhysicalJoystickHandler::PhysicalJoystickHandler(
} }
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
json PhysicalJoystickHandler::convertLegacyMapping(const string& mapping) json PhysicalJoystickHandler::convertLegacyMapping(string_view mapping)
{ {
constexpr char CTRL_DELIM = '^'; constexpr char CTRL_DELIM = '^';
istringstream buf(mapping); istringstream buf(string{mapping}); // TODO: fixed in C++20
string joymap, joyname; string joymap, joyname;
getline(buf, joymap, CTRL_DELIM); // event list size, ignore getline(buf, joymap, CTRL_DELIM); // event list size, ignore

View File

@ -68,7 +68,7 @@ class PhysicalJoystickHandler
public: public:
PhysicalJoystickHandler(OSystem& system, EventHandler& handler, Event& event); PhysicalJoystickHandler(OSystem& system, EventHandler& handler, Event& event);
static nlohmann::json convertLegacyMapping(const string& mapping); static nlohmann::json convertLegacyMapping(string_view mapping);
/** Return stick ID on success, -1 on failure. */ /** Return stick ID on success, -1 on failure. */
int add(const PhysicalJoystickPtr& stick); int add(const PhysicalJoystickPtr& stick);

View File

@ -73,7 +73,8 @@ PhysicalKeyboardHandler::PhysicalKeyboardHandler(OSystem& system, EventHandler&
} }
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
void PhysicalKeyboardHandler::loadSerializedMappings(const string& serializedMapping, EventMode mode) void PhysicalKeyboardHandler::loadSerializedMappings(
string_view serializedMapping, EventMode mode)
{ {
json mapping; json mapping;

View File

@ -46,7 +46,7 @@ class PhysicalKeyboardHandler
PhysicalKeyboardHandler(OSystem& system, EventHandler& handler); PhysicalKeyboardHandler(OSystem& system, EventHandler& handler);
void loadSerializedMappings(const string& serializedMappings, EventMode mode); void loadSerializedMappings(string_view serializedMappings, EventMode mode);
void setDefaultMapping(Event::Type event, EventMode mode, void setDefaultMapping(Event::Type event, EventMode mode,
bool updateDefaults = false); bool updateDefaults = false);

View File

@ -32,7 +32,7 @@ namespace {
return json(eventMode).get<string>(); return json(eventMode).get<string>();
} }
EventMode eventModeFromJsonName(const string& name) { EventMode eventModeFromJsonName(string_view name) {
EventMode result{}; EventMode result{};
from_json(json(name), result); from_json(json(name), result);
@ -42,7 +42,7 @@ namespace {
} // namespace } // namespace
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
void PhysicalJoystick::initialize(int index, const string& desc, void PhysicalJoystick::initialize(int index, string_view desc,
int axes, int buttons, int hats, int /*balls*/) int axes, int buttons, int hats, int /*balls*/)
{ {
ID = index; ID = index;
@ -108,9 +108,9 @@ bool PhysicalJoystick::setMap(const json& map)
} }
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
json PhysicalJoystick::convertLegacyMapping(const string& mapping, const string& name) json PhysicalJoystick::convertLegacyMapping(string_view mapping, string_view name)
{ {
istringstream buf(mapping); istringstream buf(string{mapping}); // TODO: fixed in C++20
json convertedMapping = json::object(); json convertedMapping = json::object();
string map; string map;
@ -152,10 +152,10 @@ void PhysicalJoystick::eraseEvent(Event::Type event, EventMode mode)
} }
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
void PhysicalJoystick::getValues(const string& list, IntArray& map) void PhysicalJoystick::getValues(string_view list, IntArray& map)
{ {
map.clear(); map.clear();
istringstream buf(list); istringstream buf(string{list}); // TODO: fixed in C++20
int value{0}; int value{0};
buf >> value; // we don't need to know the # of items at this point buf >> value; // we don't need to know the # of items at this point

View File

@ -48,14 +48,15 @@ class PhysicalJoystick
nlohmann::json getMap() const; nlohmann::json getMap() const;
bool setMap(const nlohmann::json& map); bool setMap(const nlohmann::json& map);
static nlohmann::json convertLegacyMapping(const string& mapping, const string& name); static nlohmann::json convertLegacyMapping(string_view mapping,
string_view name);
void eraseMap(EventMode mode); void eraseMap(EventMode mode);
void eraseEvent(Event::Type event, EventMode mode); void eraseEvent(Event::Type event, EventMode mode);
string about() const; string about() const;
protected: protected:
void initialize(int index, const string& desc, void initialize(int index, string_view desc,
int axes, int buttons, int hats, int balls); int axes, int buttons, int hats, int balls);
private: private:
@ -76,7 +77,7 @@ class PhysicalJoystick
JoyMap joyMap; JoyMap joyMap;
private: private:
static void getValues(const string& list, IntArray& map); static void getValues(string_view list, IntArray& map);
friend ostream& operator<<(ostream& os, const PhysicalJoystick& s) { friend ostream& operator<<(ostream& os, const PhysicalJoystick& s) {
os << " ID: " << s.ID << ", name: " << s.name << ", numaxis: " << s.numAxes os << " ID: " << s.ID << ", name: " << s.name << ", numaxis: " << s.numAxes

View File

@ -50,9 +50,9 @@ class StringParser
@param str The string to split @param str The string to split
@param maxlen The maximum length of string to generate @param maxlen The maximum length of string to generate
*/ */
StringParser(const string& str, uInt32 maxlen) StringParser(string_view str, uInt32 maxlen)
{ {
istringstream buf(str); istringstream buf(string{str}); // TODO: fixed in C++20
string line; string line;
while(std::getline(buf, line, '\n')) while(std::getline(buf, line, '\n'))

View File

@ -95,7 +95,7 @@ VideoModeHandler::buildMode(const Settings& settings, bool inTIAMode)
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
VideoModeHandler::Mode::Mode(uInt32 iw, uInt32 ih, Stretch smode, VideoModeHandler::Mode::Mode(uInt32 iw, uInt32 ih, Stretch smode,
Int32 fsindex, const string& desc, Int32 fsindex, string_view desc,
float zoomLevel) float zoomLevel)
: Mode(iw, ih, iw, ih, smode, fsindex, desc, zoomLevel) : Mode(iw, ih, iw, ih, smode, fsindex, desc, zoomLevel)
{ {
@ -103,13 +103,13 @@ VideoModeHandler::Mode::Mode(uInt32 iw, uInt32 ih, Stretch smode,
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
VideoModeHandler::Mode::Mode(uInt32 iw, uInt32 ih, uInt32 sw, uInt32 sh, VideoModeHandler::Mode::Mode(uInt32 iw, uInt32 ih, uInt32 sw, uInt32 sh,
Stretch smode, Int32 fsindex, const string& desc, Stretch smode, Int32 fsindex, string_view desc,
float zoomLevel, float overscan) float zoomLevel, float overscan)
: screenS(sw, sh), : screenS{sw, sh},
stretch(smode), stretch{smode},
description(desc), description{desc},
zoom(zoomLevel), zoom{zoomLevel},
fsIndex(fsindex) fsIndex{fsindex}
{ {
// Now resize based on windowed/fullscreen mode and stretch factor // Now resize based on windowed/fullscreen mode and stretch factor
if(fsIndex != -1) // fullscreen mode if(fsIndex != -1) // fullscreen mode

View File

@ -49,10 +49,10 @@ class VideoModeHandler
Mode() = default; Mode() = default;
Mode(uInt32 iw, uInt32 ih, uInt32 sw, uInt32 sh, Stretch smode, Mode(uInt32 iw, uInt32 ih, uInt32 sw, uInt32 sh, Stretch smode,
Int32 fsindex = -1, const string& desc = "", Int32 fsindex = -1, string_view desc = "",
float zoomLevel = 1.F, float overscan = 1.F); float zoomLevel = 1.F, float overscan = 1.F);
Mode(uInt32 iw, uInt32 ih, Stretch smode, Int32 fsindex = -1, Mode(uInt32 iw, uInt32 ih, Stretch smode, Int32 fsindex = -1,
const string& desc = "", float zoomLevel = 1.F); string_view desc = "", float zoomLevel = 1.F);
friend ostream& operator<<(ostream& os, const Mode& vm) friend ostream& operator<<(ostream& os, const Mode& vm)
{ {

View File

@ -24,7 +24,7 @@
class SqliteError : public std::exception class SqliteError : public std::exception
{ {
public: public:
explicit SqliteError(const string& message) : myMessage{message} { } explicit SqliteError(string_view message) : myMessage{message} { }
explicit SqliteError(sqlite3* handle) : myMessage{sqlite3_errmsg(handle)} { } explicit SqliteError(sqlite3* handle) : myMessage{sqlite3_errmsg(handle)} { }
const char* what() const noexcept override { return myMessage.c_str(); } const char* what() const noexcept override { return myMessage.c_str(); }

View File

@ -38,8 +38,8 @@ CartDebugWidget::CartDebugWidget(GuiObject* boss, const GUI::Font& lfont,
} }
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
int CartDebugWidget::addBaseInformation(size_t bytes, const string& manufacturer, int CartDebugWidget::addBaseInformation(size_t bytes, string_view manufacturer,
const string& desc, const uInt16 maxlines) string_view desc, const uInt16 maxlines)
{ {
const int lwidth = _font.getStringWidth("Manufacturer "), const int lwidth = _font.getStringWidth("Manufacturer "),
fwidth = _w - lwidth - 12; fwidth = _w - lwidth - 12;

View File

@ -38,8 +38,8 @@ class CartDebugWidget : public Widget, public CommandSender
~CartDebugWidget() override = default; ~CartDebugWidget() override = default;
public: public:
int addBaseInformation(size_t bytes, const string& manufacturer, int addBaseInformation(size_t bytes, string_view manufacturer,
const string& desc, const uInt16 maxlines = 10); string_view desc, const uInt16 maxlines = 10);
// Inform the ROM Widget that the underlying cart has somehow changed // Inform the ROM Widget that the underlying cart has somehow changed
void invalidate(); void invalidate();

View File

@ -231,7 +231,7 @@ void RomWidget::disassemble(int disasm_line)
} }
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
void RomWidget::patchROM(int disasm_line, const string& bytes, void RomWidget::patchROM(int disasm_line, string_view bytes,
Common::Base::Fmt base) Common::Base::Fmt base)
{ {
const uInt16 address = getAddress(disasm_line); const uInt16 address = getAddress(disasm_line);

View File

@ -53,8 +53,7 @@ class RomWidget : public Widget, public CommandSender
void runtoPC(int disasm_line); void runtoPC(int disasm_line);
void setTimer(int disasm_line); void setTimer(int disasm_line);
void disassemble(int disasm_line); void disassemble(int disasm_line);
void patchROM(int disasm_line, const string& bytes, void patchROM(int disasm_line, string_view bytes, Common::Base::Fmt base);
Common::Base::Fmt base);
uInt16 getAddress(int disasm_line); uInt16 getAddress(int disasm_line);
private: private:

View File

@ -63,7 +63,7 @@ void TiaOutputWidget::loadConfig()
} }
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
void TiaOutputWidget::saveSnapshot(int execDepth, const string& execPrefix, void TiaOutputWidget::saveSnapshot(int execDepth, string_view execPrefix,
bool mark) bool mark)
{ {
#ifdef IMAGE_SUPPORT #ifdef IMAGE_SUPPORT

View File

@ -36,7 +36,7 @@ class TiaOutputWidget : public Widget, public CommandSender
void loadConfig() override; void loadConfig() override;
void setZoomWidget(TiaZoomWidget* w) { myZoom = w; } void setZoomWidget(TiaZoomWidget* w) { myZoom = w; }
void saveSnapshot(int execDepth = 0, const string& execPrefix = EmptyString, void saveSnapshot(int execDepth = 0, string_view execPrefix = EmptyString,
bool mark = true); bool mark = true);
// Eventually, these methods will enable access to the onscreen TIA image // Eventually, these methods will enable access to the onscreen TIA image

View File

@ -24,8 +24,9 @@ string Bankswitch::typeToName(Bankswitch::Type type)
} }
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Bankswitch::Type Bankswitch::nameToType(const string& name) Bankswitch::Type Bankswitch::nameToType(string_view n) // FIXME: name
{ {
string name{n};
const auto it = ourNameToTypes.find(name); const auto it = ourNameToTypes.find(name);
if(it != ourNameToTypes.end()) if(it != ourNameToTypes.end())
return it->second; return it->second;

View File

@ -75,7 +75,7 @@ class Bankswitch
static string typeToName(Bankswitch::Type type); static string typeToName(Bankswitch::Type type);
// Convert string to BSType enum // Convert string to BSType enum
static Bankswitch::Type nameToType(const string& name); static Bankswitch::Type nameToType(string_view name);
// Convert BSType enum to description string // Convert BSType enum to description string
static string typeToDesc(Bankswitch::Type type); static string typeToDesc(Bankswitch::Type type);

View File

@ -20,7 +20,7 @@
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Cartridge0840::Cartridge0840(const ByteBuffer& image, size_t size, Cartridge0840::Cartridge0840(const ByteBuffer& image, size_t size,
const string& md5, const Settings& settings, string_view md5, const Settings& settings,
size_t bsSize) size_t bsSize)
: CartridgeEnhanced(image, size, md5, settings, bsSize) : CartridgeEnhanced(image, size, md5, settings, bsSize)
{ {

View File

@ -46,7 +46,7 @@ class Cartridge0840 : public CartridgeEnhanced
@param settings A reference to the various settings (read-only) @param settings A reference to the various settings (read-only)
@param bsSize The size specified by the bankswitching scheme @param bsSize The size specified by the bankswitching scheme
*/ */
Cartridge0840(const ByteBuffer& image, size_t size, const string& md5, Cartridge0840(const ByteBuffer& image, size_t size, string_view md5,
const Settings& settings, size_t bsSize = 8_KB); const Settings& settings, size_t bsSize = 8_KB);
~Cartridge0840() override = default; ~Cartridge0840() override = default;

View File

@ -20,7 +20,7 @@
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Cartridge0FA0::Cartridge0FA0(const ByteBuffer& image, size_t size, Cartridge0FA0::Cartridge0FA0(const ByteBuffer& image, size_t size,
const string& md5, const Settings& settings) string_view md5, const Settings& settings)
: CartridgeEnhanced(image, size, md5, settings, 8_KB) : CartridgeEnhanced(image, size, md5, settings, 8_KB)
{ {
} }

View File

@ -47,7 +47,7 @@ class Cartridge0FA0 : public CartridgeEnhanced
@param md5 The md5sum of the ROM image @param md5 The md5sum of the ROM image
@param settings A reference to the various settings (read-only) @param settings A reference to the various settings (read-only)
*/ */
Cartridge0FA0(const ByteBuffer& image, size_t size, const string& md5, Cartridge0FA0(const ByteBuffer& image, size_t size, string_view md5,
const Settings& settings); const Settings& settings);
~Cartridge0FA0() override = default; ~Cartridge0FA0() override = default;

View File

@ -20,7 +20,7 @@
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Cartridge2K::Cartridge2K(const ByteBuffer& image, size_t size, Cartridge2K::Cartridge2K(const ByteBuffer& image, size_t size,
const string& md5, const Settings& settings, string_view md5, const Settings& settings,
size_t bsSize) size_t bsSize)
: CartridgeEnhanced(image, size, md5, settings, bsSize) : CartridgeEnhanced(image, size, md5, settings, bsSize)
{ {

View File

@ -49,7 +49,7 @@ class Cartridge2K : public CartridgeEnhanced
@param settings A reference to the various settings (read-only) @param settings A reference to the various settings (read-only)
@param bsSize The size specified by the bankswitching scheme @param bsSize The size specified by the bankswitching scheme
*/ */
Cartridge2K(const ByteBuffer& image, size_t size, const string& md5, Cartridge2K(const ByteBuffer& image, size_t size, string_view md5,
const Settings& settings, size_t bsSize = 2_KB); const Settings& settings, size_t bsSize = 2_KB);
~Cartridge2K() override = default; ~Cartridge2K() override = default;

View File

@ -21,7 +21,7 @@
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Cartridge3E::Cartridge3E(const ByteBuffer& image, size_t size, Cartridge3E::Cartridge3E(const ByteBuffer& image, size_t size,
const string& md5, const Settings& settings, string_view md5, const Settings& settings,
size_t bsSize) size_t bsSize)
: CartridgeEnhanced(image, size, md5, settings, : CartridgeEnhanced(image, size, md5, settings,
bsSize == 0 ? BSPF::nextMultipleOf(size, 2_KB) : bsSize) bsSize == 0 ? BSPF::nextMultipleOf(size, 2_KB) : bsSize)

View File

@ -74,7 +74,7 @@ class Cartridge3E : public CartridgeEnhanced
@param bsSize The size specified by the bankswitching scheme @param bsSize The size specified by the bankswitching scheme
(where 0 means variable-sized ROM) (where 0 means variable-sized ROM)
*/ */
Cartridge3E(const ByteBuffer& image, size_t size, const string& md5, Cartridge3E(const ByteBuffer& image, size_t size, string_view md5,
const Settings& settings, size_t bsSize = 0); const Settings& settings, size_t bsSize = 0);
~Cartridge3E() override = default; ~Cartridge3E() override = default;

View File

@ -21,7 +21,7 @@
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Cartridge3EPlus::Cartridge3EPlus(const ByteBuffer& image, size_t size, Cartridge3EPlus::Cartridge3EPlus(const ByteBuffer& image, size_t size,
const string& md5, const Settings& settings, string_view md5, const Settings& settings,
size_t bsSize) size_t bsSize)
: Cartridge3E(image, size, md5, settings, : Cartridge3E(image, size, md5, settings,
bsSize == 0 ? BSPF::nextMultipleOf(size, 1_KB) : bsSize) bsSize == 0 ? BSPF::nextMultipleOf(size, 1_KB) : bsSize)

View File

@ -97,7 +97,7 @@ class Cartridge3EPlus: public Cartridge3E
@param bsSize The size specified by the bankswitching scheme @param bsSize The size specified by the bankswitching scheme
(where 0 means variable-sized ROM) (where 0 means variable-sized ROM)
*/ */
Cartridge3EPlus(const ByteBuffer& image, size_t size, const string& md5, Cartridge3EPlus(const ByteBuffer& image, size_t size, string_view md5,
const Settings& settings, size_t bsSize = 0); const Settings& settings, size_t bsSize = 0);
~Cartridge3EPlus() override = default; ~Cartridge3EPlus() override = default;

View File

@ -19,7 +19,7 @@
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Cartridge3EX::Cartridge3EX(const ByteBuffer& image, size_t size, Cartridge3EX::Cartridge3EX(const ByteBuffer& image, size_t size,
const string& md5, const Settings& settings) string_view md5, const Settings& settings)
: Cartridge3E(image, size, md5, settings) : Cartridge3E(image, size, md5, settings)
{ {
// 0xFFFA contains RAM bank count - 1; // 0xFFFA contains RAM bank count - 1;

View File

@ -41,7 +41,7 @@ class Cartridge3EX : public Cartridge3E
@param md5 The md5sum of the ROM image @param md5 The md5sum of the ROM image
@param settings A reference to the various settings (read-only) @param settings A reference to the various settings (read-only)
*/ */
Cartridge3EX(const ByteBuffer& image, size_t size, const string& md5, Cartridge3EX(const ByteBuffer& image, size_t size, string_view md5,
const Settings& settings); const Settings& settings);
~Cartridge3EX() override = default; ~Cartridge3EX() override = default;

View File

@ -21,7 +21,7 @@
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Cartridge3F::Cartridge3F(const ByteBuffer& image, size_t size, Cartridge3F::Cartridge3F(const ByteBuffer& image, size_t size,
const string& md5, const Settings& settings, string_view md5, const Settings& settings,
size_t bsSize) size_t bsSize)
: CartridgeEnhanced(image, size, md5, settings, : CartridgeEnhanced(image, size, md5, settings,
bsSize == 0 ? BSPF::nextPowerOfTwo(size) : bsSize) bsSize == 0 ? BSPF::nextPowerOfTwo(size) : bsSize)

View File

@ -53,7 +53,7 @@ class Cartridge3F : public CartridgeEnhanced
@param bsSize The size specified by the bankswitching scheme @param bsSize The size specified by the bankswitching scheme
(where 0 means variable-sized ROM) (where 0 means variable-sized ROM)
*/ */
Cartridge3F(const ByteBuffer& image, size_t size, const string& md5, Cartridge3F(const ByteBuffer& image, size_t size, string_view md5,
const Settings& settings, size_t bsSize = 0); const Settings& settings, size_t bsSize = 0);
~Cartridge3F() override = default; ~Cartridge3F() override = default;

View File

@ -22,7 +22,7 @@
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Cartridge4A50::Cartridge4A50(const ByteBuffer& image, size_t size, Cartridge4A50::Cartridge4A50(const ByteBuffer& image, size_t size,
const string& md5, const Settings& settings) string_view md5, const Settings& settings)
: Cartridge(settings, md5), : Cartridge(settings, md5),
myImage{make_unique<uInt8[]>(128_KB)}, myImage{make_unique<uInt8[]>(128_KB)},
mySize{size} mySize{size}

View File

@ -65,7 +65,7 @@ class Cartridge4A50 : public Cartridge
@param md5 The md5sum of the ROM image @param md5 The md5sum of the ROM image
@param settings A reference to the various settings (read-only) @param settings A reference to the various settings (read-only)
*/ */
Cartridge4A50(const ByteBuffer& image, size_t size, const string& md5, Cartridge4A50(const ByteBuffer& image, size_t size, string_view md5,
const Settings& settings); const Settings& settings);
~Cartridge4A50() override = default; ~Cartridge4A50() override = default;

View File

@ -20,7 +20,7 @@
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Cartridge4K::Cartridge4K(const ByteBuffer& image, size_t size, Cartridge4K::Cartridge4K(const ByteBuffer& image, size_t size,
const string& md5, const Settings& settings, string_view md5, const Settings& settings,
size_t bsSize) size_t bsSize)
: CartridgeEnhanced(image, size, md5, settings, bsSize) : CartridgeEnhanced(image, size, md5, settings, bsSize)
{ {

View File

@ -46,7 +46,7 @@ class Cartridge4K : public CartridgeEnhanced
@param settings A reference to the various settings (read-only) @param settings A reference to the various settings (read-only)
@param bsSize The size specified by the bankswitching scheme @param bsSize The size specified by the bankswitching scheme
*/ */
Cartridge4K(const ByteBuffer& image, size_t size, const string& md5, Cartridge4K(const ByteBuffer& image, size_t size, string_view md5,
const Settings& settings, size_t bsSize = 4_KB); const Settings& settings, size_t bsSize = 4_KB);
~Cartridge4K() override = default; ~Cartridge4K() override = default;

View File

@ -20,7 +20,7 @@
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Cartridge4KSC::Cartridge4KSC(const ByteBuffer& image, size_t size, Cartridge4KSC::Cartridge4KSC(const ByteBuffer& image, size_t size,
const string& md5, const Settings& settings, string_view md5, const Settings& settings,
size_t bsSize) size_t bsSize)
: Cartridge4K(image, size, md5, settings, bsSize) : Cartridge4K(image, size, md5, settings, bsSize)
{ {

View File

@ -47,7 +47,7 @@ class Cartridge4KSC : public Cartridge4K
@param settings A reference to the various settings (read-only) @param settings A reference to the various settings (read-only)
@param bsSize The size specified by the bankswitching scheme @param bsSize The size specified by the bankswitching scheme
*/ */
Cartridge4KSC(const ByteBuffer& image, size_t size, const string& md5, Cartridge4KSC(const ByteBuffer& image, size_t size, string_view md5,
const Settings& settings, size_t bsSize = 4_KB); const Settings& settings, size_t bsSize = 4_KB);
~Cartridge4KSC() override = default; ~Cartridge4KSC() override = default;

View File

@ -22,7 +22,7 @@
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
CartridgeAR::CartridgeAR(const ByteBuffer& image, size_t size, CartridgeAR::CartridgeAR(const ByteBuffer& image, size_t size,
const string& md5, const Settings& settings) string_view md5, const Settings& settings)
: Cartridge(settings, md5), : Cartridge(settings, md5),
mySize{std::max(size, LOAD_SIZE)} mySize{std::max(size, LOAD_SIZE)}
{ {

View File

@ -57,7 +57,7 @@ class CartridgeAR : public Cartridge
@param md5 The md5sum of the ROM image @param md5 The md5sum of the ROM image
@param settings A reference to the various settings (read-only) @param settings A reference to the various settings (read-only)
*/ */
CartridgeAR(const ByteBuffer& image, size_t size, const string& md5, CartridgeAR(const ByteBuffer& image, size_t size, string_view md5,
const Settings& settings); const Settings& settings);
~CartridgeAR() override = default; ~CartridgeAR() override = default;

View File

@ -20,7 +20,7 @@
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
CartridgeBF::CartridgeBF(const ByteBuffer& image, size_t size, CartridgeBF::CartridgeBF(const ByteBuffer& image, size_t size,
const string& md5, const Settings& settings, string_view md5, const Settings& settings,
size_t bsSize) size_t bsSize)
: CartridgeEnhanced(image, size, md5, settings, bsSize) : CartridgeEnhanced(image, size, md5, settings, bsSize)
{ {

View File

@ -47,7 +47,7 @@ class CartridgeBF : public CartridgeEnhanced
@param settings A reference to the various settings (read-only) @param settings A reference to the various settings (read-only)
@param bsSize The size specified by the bankswitching scheme @param bsSize The size specified by the bankswitching scheme
*/ */
CartridgeBF(const ByteBuffer& image, size_t size, const string& md5, CartridgeBF(const ByteBuffer& image, size_t size, string_view md5,
const Settings& settings, size_t bsSize = 256_KB); const Settings& settings, size_t bsSize = 256_KB);
~CartridgeBF() override = default; ~CartridgeBF() override = default;

View File

@ -20,7 +20,7 @@
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
CartridgeBFSC::CartridgeBFSC(const ByteBuffer& image, size_t size, CartridgeBFSC::CartridgeBFSC(const ByteBuffer& image, size_t size,
const string& md5, const Settings& settings, string_view md5, const Settings& settings,
size_t bsSize) size_t bsSize)
: CartridgeBF(image, size, md5, settings, bsSize) : CartridgeBF(image, size, md5, settings, bsSize)
{ {

View File

@ -47,7 +47,7 @@ class CartridgeBFSC : public CartridgeBF
@param settings A reference to the various settings (read-only) @param settings A reference to the various settings (read-only)
@param bsSize The size specified by the bankswitching scheme @param bsSize The size specified by the bankswitching scheme
*/ */
CartridgeBFSC(const ByteBuffer& image, size_t size, const string& md5, CartridgeBFSC(const ByteBuffer& image, size_t size, string_view md5,
const Settings& settings, size_t bsSize = 256_KB); const Settings& settings, size_t bsSize = 256_KB);
~CartridgeBFSC() override = default; ~CartridgeBFSC() override = default;

View File

@ -22,7 +22,7 @@
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
CartridgeCM::CartridgeCM(const ByteBuffer& image, size_t size, CartridgeCM::CartridgeCM(const ByteBuffer& image, size_t size,
const string& md5, const Settings& settings) string_view md5, const Settings& settings)
: Cartridge(settings, md5), : Cartridge(settings, md5),
myImage{make_unique<uInt8[]>(16_KB)} myImage{make_unique<uInt8[]>(16_KB)}
{ {

View File

@ -120,7 +120,7 @@ class CartridgeCM : public Cartridge
@param md5 The md5sum of the ROM image @param md5 The md5sum of the ROM image
@param settings A reference to the various settings (read-only) @param settings A reference to the various settings (read-only)
*/ */
CartridgeCM(const ByteBuffer& image, size_t size, const string& md5, CartridgeCM(const ByteBuffer& image, size_t size, string_view md5,
const Settings& settings); const Settings& settings);
~CartridgeCM() override = default; ~CartridgeCM() override = default;

View File

@ -23,7 +23,7 @@
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
CartridgeCTY::CartridgeCTY(const ByteBuffer& image, size_t size, CartridgeCTY::CartridgeCTY(const ByteBuffer& image, size_t size,
const string& md5, const Settings& settings) string_view md5, const Settings& settings)
: Cartridge(settings, md5), : Cartridge(settings, md5),
myImage{make_unique<uInt8[]>(32_KB)} myImage{make_unique<uInt8[]>(32_KB)}
{ {

View File

@ -118,7 +118,7 @@ class CartridgeCTY : public Cartridge
@param md5 The md5sum of the ROM image @param md5 The md5sum of the ROM image
@param settings A reference to the settings object @param settings A reference to the settings object
*/ */
CartridgeCTY(const ByteBuffer& image, size_t size, const string& md5, CartridgeCTY(const ByteBuffer& image, size_t size, string_view md5,
const Settings& settings); const Settings& settings);
~CartridgeCTY() override = default; ~CartridgeCTY() override = default;

View File

@ -20,7 +20,7 @@
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
CartridgeCV::CartridgeCV(const ByteBuffer& image, size_t size, CartridgeCV::CartridgeCV(const ByteBuffer& image, size_t size,
const string& md5, const Settings& settings, string_view md5, const Settings& settings,
size_t bsSize) size_t bsSize)
: CartridgeEnhanced(image, size, md5, settings, bsSize) : CartridgeEnhanced(image, size, md5, settings, bsSize)
{ {

View File

@ -49,7 +49,7 @@ class CartridgeCV : public CartridgeEnhanced
@param settings A reference to the various settings (read-only) @param settings A reference to the various settings (read-only)
@param bsSize The size specified by the bankswitching scheme @param bsSize The size specified by the bankswitching scheme
*/ */
CartridgeCV(const ByteBuffer& image, size_t size, const string& md5, CartridgeCV(const ByteBuffer& image, size_t size, string_view md5,
const Settings& settings, size_t bsSize = 2_KB); const Settings& settings, size_t bsSize = 2_KB);
~CartridgeCV() override = default; ~CartridgeCV() override = default;

View File

@ -72,7 +72,7 @@
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
unique_ptr<Cartridge> CartCreator::create(const FSNode& file, unique_ptr<Cartridge> CartCreator::create(const FSNode& file,
const ByteBuffer& image, size_t size, string& md5, const ByteBuffer& image, size_t size, string& md5,
const string& dtype, Settings& settings) string_view dtype, Settings& settings)
{ {
unique_ptr<Cartridge> cartridge; unique_ptr<Cartridge> cartridge;
Bankswitch::Type type = Bankswitch::nameToType(dtype), Bankswitch::Type type = Bankswitch::nameToType(dtype),
@ -224,8 +224,9 @@ CartCreator::createFromMultiCart(const ByteBuffer& image, size_t& size,
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
unique_ptr<Cartridge> unique_ptr<Cartridge>
CartCreator::createFromImage(const ByteBuffer& image, size_t size, Bankswitch::Type type, CartCreator::createFromImage(const ByteBuffer& image, size_t size,
const string& md5, Settings& settings) Bankswitch::Type type, string_view md5,
Settings& settings)
{ {
// We should know the cart's type by now so let's create it // We should know the cart's type by now so let's create it
switch(type) switch(type)

View File

@ -47,7 +47,7 @@ class CartCreator
*/ */
static unique_ptr<Cartridge> create(const FSNode& file, static unique_ptr<Cartridge> create(const FSNode& file,
const ByteBuffer& image, size_t size, string& md5, const ByteBuffer& image, size_t size, string& md5,
const string& dtype, Settings& settings); string_view dtype, Settings& settings);
private: private:
/** /**
@ -82,7 +82,7 @@ class CartCreator
*/ */
static unique_ptr<Cartridge> static unique_ptr<Cartridge>
createFromImage(const ByteBuffer& image, size_t size, Bankswitch::Type type, createFromImage(const ByteBuffer& image, size_t size, Bankswitch::Type type,
const string& md5, Settings& settings); string_view md5, Settings& settings);
private: private:
// Following constructors and assignment operators not supported // Following constructors and assignment operators not supported

View File

@ -20,7 +20,7 @@
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
CartridgeDF::CartridgeDF(const ByteBuffer& image, size_t size, CartridgeDF::CartridgeDF(const ByteBuffer& image, size_t size,
const string& md5, const Settings& settings, string_view md5, const Settings& settings,
size_t bsSize) size_t bsSize)
: CartridgeEnhanced(image, size, md5, settings, bsSize) : CartridgeEnhanced(image, size, md5, settings, bsSize)
{ {

View File

@ -47,7 +47,7 @@ class CartridgeDF : public CartridgeEnhanced
@param settings A reference to the various settings (read-only) @param settings A reference to the various settings (read-only)
@param bsSize The size specified by the bankswitching scheme @param bsSize The size specified by the bankswitching scheme
*/ */
CartridgeDF(const ByteBuffer& image, size_t size, const string& md5, CartridgeDF(const ByteBuffer& image, size_t size, string_view md5,
const Settings& settings, size_t bsSize = 128_KB); const Settings& settings, size_t bsSize = 128_KB);
~CartridgeDF() override = default; ~CartridgeDF() override = default;

View File

@ -20,7 +20,7 @@
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
CartridgeDFSC::CartridgeDFSC(const ByteBuffer& image, size_t size, CartridgeDFSC::CartridgeDFSC(const ByteBuffer& image, size_t size,
const string& md5, const Settings& settings, string_view md5, const Settings& settings,
size_t bsSize) size_t bsSize)
: CartridgeDF(image, size, md5, settings, bsSize) : CartridgeDF(image, size, md5, settings, bsSize)
{ {

View File

@ -47,7 +47,7 @@ class CartridgeDFSC : public CartridgeDF
@param settings A reference to the various settings (read-only) @param settings A reference to the various settings (read-only)
@param bsSize The size specified by the bankswitching scheme @param bsSize The size specified by the bankswitching scheme
*/ */
CartridgeDFSC(const ByteBuffer& image, size_t size, const string& md5, CartridgeDFSC(const ByteBuffer& image, size_t size, string_view md5,
const Settings& settings, size_t bsSize = 128_KB); const Settings& settings, size_t bsSize = 128_KB);
~CartridgeDFSC() override = default; ~CartridgeDFSC() override = default;

View File

@ -22,7 +22,7 @@
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
CartridgeDPC::CartridgeDPC(const ByteBuffer& image, size_t size, CartridgeDPC::CartridgeDPC(const ByteBuffer& image, size_t size,
const string& md5, const Settings& settings, string_view md5, const Settings& settings,
size_t bsSize) size_t bsSize)
: CartridgeF8(image, size, md5, settings, bsSize) : CartridgeF8(image, size, md5, settings, bsSize)
{ {

View File

@ -48,7 +48,7 @@ class CartridgeDPC : public CartridgeF8
@param settings A reference to the various settings (read-only) @param settings A reference to the various settings (read-only)
@param bsSize The size specified by the bankswitching scheme @param bsSize The size specified by the bankswitching scheme
*/ */
CartridgeDPC(const ByteBuffer& image, size_t size, const string& md5, CartridgeDPC(const ByteBuffer& image, size_t size, string_view md5,
const Settings& settings, size_t bsSize = 10_KB); const Settings& settings, size_t bsSize = 10_KB);
~CartridgeDPC() override = default; ~CartridgeDPC() override = default;

View File

@ -20,7 +20,7 @@
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
CartridgeE0::CartridgeE0(const ByteBuffer& image, size_t size, CartridgeE0::CartridgeE0(const ByteBuffer& image, size_t size,
const string& md5, const Settings& settings, string_view md5, const Settings& settings,
size_t bsSize) size_t bsSize)
: CartridgeEnhanced(image, size, md5, settings, bsSize) : CartridgeEnhanced(image, size, md5, settings, bsSize)
{ {

View File

@ -55,7 +55,7 @@ class CartridgeE0 : public CartridgeEnhanced
@param settings A reference to the various settings (read-only) @param settings A reference to the various settings (read-only)
@param bsSize The size specified by the bankswitching scheme @param bsSize The size specified by the bankswitching scheme
*/ */
CartridgeE0(const ByteBuffer& image, size_t size, const string& md5, CartridgeE0(const ByteBuffer& image, size_t size, string_view md5,
const Settings& settings, size_t bsSize = 8_KB); const Settings& settings, size_t bsSize = 8_KB);
~CartridgeE0() override = default; ~CartridgeE0() override = default;

View File

@ -20,7 +20,7 @@
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
CartridgeE7::CartridgeE7(const ByteBuffer& image, size_t size, CartridgeE7::CartridgeE7(const ByteBuffer& image, size_t size,
const string& md5, const Settings& settings) string_view md5, const Settings& settings)
: Cartridge(settings, md5), : Cartridge(settings, md5),
mySize{size} mySize{size}
{ {

View File

@ -75,7 +75,7 @@ class CartridgeE7 : public Cartridge
@param md5 The md5sum of the ROM image @param md5 The md5sum of the ROM image
@param settings A reference to the various settings (read-only) @param settings A reference to the various settings (read-only)
*/ */
CartridgeE7(const ByteBuffer& image, size_t size, const string& md5, CartridgeE7(const ByteBuffer& image, size_t size, string_view md5,
const Settings& settings); const Settings& settings);
~CartridgeE7() override = default; ~CartridgeE7() override = default;

View File

@ -20,7 +20,7 @@
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
CartridgeEF::CartridgeEF(const ByteBuffer& image, size_t size, CartridgeEF::CartridgeEF(const ByteBuffer& image, size_t size,
const string& md5, const Settings& settings, string_view md5, const Settings& settings,
size_t bsSize) size_t bsSize)
: CartridgeEnhanced(image, size, md5, settings, bsSize) : CartridgeEnhanced(image, size, md5, settings, bsSize)
{ {

View File

@ -47,7 +47,7 @@ class CartridgeEF : public CartridgeEnhanced
@param settings A reference to the various settings (read-only) @param settings A reference to the various settings (read-only)
@param bsSize The size specified by the bankswitching scheme @param bsSize The size specified by the bankswitching scheme
*/ */
CartridgeEF(const ByteBuffer& image, size_t size, const string& md5, CartridgeEF(const ByteBuffer& image, size_t size, string_view md5,
const Settings& settings, size_t bsSize = 64_KB); const Settings& settings, size_t bsSize = 64_KB);
~CartridgeEF() override = default; ~CartridgeEF() override = default;

View File

@ -20,7 +20,7 @@
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
CartridgeEFSC::CartridgeEFSC(const ByteBuffer& image, size_t size, CartridgeEFSC::CartridgeEFSC(const ByteBuffer& image, size_t size,
const string& md5, const Settings& settings, string_view md5, const Settings& settings,
size_t bsSize) size_t bsSize)
: CartridgeEF(image, size, md5, settings, bsSize) : CartridgeEF(image, size, md5, settings, bsSize)
{ {

View File

@ -48,7 +48,7 @@ class CartridgeEFSC : public CartridgeEF
@param settings A reference to the various settings (read-only) @param settings A reference to the various settings (read-only)
@param bsSize The size specified by the bankswitching scheme @param bsSize The size specified by the bankswitching scheme
*/ */
CartridgeEFSC(const ByteBuffer& image, size_t size, const string& md5, CartridgeEFSC(const ByteBuffer& image, size_t size, string_view md5,
const Settings& settings, size_t bsSize = 64_KB); const Settings& settings, size_t bsSize = 64_KB);
~CartridgeEFSC() override = default; ~CartridgeEFSC() override = default;

View File

@ -22,7 +22,7 @@
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
CartridgeEnhanced::CartridgeEnhanced(const ByteBuffer& image, size_t size, CartridgeEnhanced::CartridgeEnhanced(const ByteBuffer& image, size_t size,
const string& md5, const Settings& settings, string_view md5, const Settings& settings,
size_t bsSize) size_t bsSize)
: Cartridge(settings, md5) : Cartridge(settings, md5)
{ {

View File

@ -47,7 +47,7 @@ class CartridgeEnhanced : public Cartridge
@param bsSize The size specified by the bankswitching scheme @param bsSize The size specified by the bankswitching scheme
*/ */
CartridgeEnhanced(const ByteBuffer& image, size_t size, CartridgeEnhanced(const ByteBuffer& image, size_t size,
const string& md5, const Settings& settings, string_view md5, const Settings& settings,
size_t bsSize); size_t bsSize);
~CartridgeEnhanced() override = default; ~CartridgeEnhanced() override = default;

View File

@ -19,7 +19,7 @@
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
CartridgeF0::CartridgeF0(const ByteBuffer& image, size_t size, CartridgeF0::CartridgeF0(const ByteBuffer& image, size_t size,
const string& md5, const Settings& settings, string_view md5, const Settings& settings,
size_t bsSize) size_t bsSize)
: CartridgeEnhanced(image, size, md5, settings, bsSize) : CartridgeEnhanced(image, size, md5, settings, bsSize)
{ {

View File

@ -44,7 +44,7 @@ class CartridgeF0 : public CartridgeEnhanced
@param settings A reference to the various settings (read-only) @param settings A reference to the various settings (read-only)
@param bsSize The size specified by the bankswitching scheme @param bsSize The size specified by the bankswitching scheme
*/ */
CartridgeF0(const ByteBuffer& image, size_t size, const string& md5, CartridgeF0(const ByteBuffer& image, size_t size, string_view md5,
const Settings& settings, size_t bsSize = 64_KB); const Settings& settings, size_t bsSize = 64_KB);
~CartridgeF0() override = default; ~CartridgeF0() override = default;

View File

@ -19,7 +19,7 @@
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
CartridgeF4::CartridgeF4(const ByteBuffer& image, size_t size, CartridgeF4::CartridgeF4(const ByteBuffer& image, size_t size,
const string& md5, const Settings& settings, string_view md5, const Settings& settings,
size_t bsSize) size_t bsSize)
: CartridgeEnhanced(image, size, md5, settings, bsSize) : CartridgeEnhanced(image, size, md5, settings, bsSize)
{ {

View File

@ -43,7 +43,7 @@ class CartridgeF4 : public CartridgeEnhanced
@param settings A reference to the various settings (read-only) @param settings A reference to the various settings (read-only)
@param bsSize The size specified by the bankswitching scheme @param bsSize The size specified by the bankswitching scheme
*/ */
CartridgeF4(const ByteBuffer& image, size_t size, const string& md5, CartridgeF4(const ByteBuffer& image, size_t size, string_view md5,
const Settings& settings, size_t bsSize = 32_KB); const Settings& settings, size_t bsSize = 32_KB);
~CartridgeF4() override = default; ~CartridgeF4() override = default;

View File

@ -19,7 +19,7 @@
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
CartridgeF4SC::CartridgeF4SC(const ByteBuffer& image, size_t size, CartridgeF4SC::CartridgeF4SC(const ByteBuffer& image, size_t size,
const string& md5, const Settings& settings, string_view md5, const Settings& settings,
size_t bsSize) size_t bsSize)
: CartridgeF4(image, size, md5, settings, bsSize) : CartridgeF4(image, size, md5, settings, bsSize)
{ {

View File

@ -44,7 +44,7 @@ class CartridgeF4SC : public CartridgeF4
@param settings A reference to the various settings (read-only) @param settings A reference to the various settings (read-only)
@param bsSize The size specified by the bankswitching scheme @param bsSize The size specified by the bankswitching scheme
*/ */
CartridgeF4SC(const ByteBuffer& image, size_t size, const string& md5, CartridgeF4SC(const ByteBuffer& image, size_t size, string_view md5,
const Settings& settings, size_t bsSize = 32_KB); const Settings& settings, size_t bsSize = 32_KB);
~CartridgeF4SC() override = default; ~CartridgeF4SC() override = default;

View File

@ -19,7 +19,7 @@
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
CartridgeF6::CartridgeF6(const ByteBuffer& image, size_t size, CartridgeF6::CartridgeF6(const ByteBuffer& image, size_t size,
const string& md5, const Settings& settings, string_view md5, const Settings& settings,
size_t bsSize) size_t bsSize)
: CartridgeEnhanced(image, size, md5, settings, bsSize) : CartridgeEnhanced(image, size, md5, settings, bsSize)
{ {

View File

@ -43,7 +43,7 @@ class CartridgeF6 : public CartridgeEnhanced
@param settings A reference to the various settings (read-only) @param settings A reference to the various settings (read-only)
@param bsSize The size specified by the bankswitching scheme @param bsSize The size specified by the bankswitching scheme
*/ */
CartridgeF6(const ByteBuffer& image, size_t size, const string& md5, CartridgeF6(const ByteBuffer& image, size_t size, string_view md5,
const Settings& settings, size_t bsSize = 16_KB); const Settings& settings, size_t bsSize = 16_KB);
~CartridgeF6() override = default; ~CartridgeF6() override = default;

View File

@ -19,7 +19,7 @@
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
CartridgeF6SC::CartridgeF6SC(const ByteBuffer& image, size_t size, CartridgeF6SC::CartridgeF6SC(const ByteBuffer& image, size_t size,
const string& md5, const Settings& settings, string_view md5, const Settings& settings,
size_t bsSize) size_t bsSize)
: CartridgeF6(image, size, md5, settings, bsSize) : CartridgeF6(image, size, md5, settings, bsSize)
{ {

View File

@ -44,7 +44,7 @@ class CartridgeF6SC : public CartridgeF6
@param settings A reference to the various settings (read-only) @param settings A reference to the various settings (read-only)
@param bsSize The size specified by the bankswitching scheme @param bsSize The size specified by the bankswitching scheme
*/ */
CartridgeF6SC(const ByteBuffer& image, size_t size, const string& md5, CartridgeF6SC(const ByteBuffer& image, size_t size, string_view md5,
const Settings& settings, size_t bsSize = 16_KB); const Settings& settings, size_t bsSize = 16_KB);
~CartridgeF6SC() override = default; ~CartridgeF6SC() override = default;

View File

@ -19,7 +19,7 @@
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
CartridgeF8::CartridgeF8(const ByteBuffer& image, size_t size, CartridgeF8::CartridgeF8(const ByteBuffer& image, size_t size,
const string& md5, const Settings& settings, string_view md5, const Settings& settings,
size_t bsSize) size_t bsSize)
: CartridgeEnhanced(image, size, md5, settings, bsSize) : CartridgeEnhanced(image, size, md5, settings, bsSize)
{ {

View File

@ -43,7 +43,7 @@ class CartridgeF8 : public CartridgeEnhanced
@param settings A reference to the various settings (read-only) @param settings A reference to the various settings (read-only)
@param bsSize The size specified by the bankswitching scheme @param bsSize The size specified by the bankswitching scheme
*/ */
CartridgeF8(const ByteBuffer& image, size_t size, const string& md5, CartridgeF8(const ByteBuffer& image, size_t size, string_view md5,
const Settings& settings, size_t bsSize = 8_KB); const Settings& settings, size_t bsSize = 8_KB);
~CartridgeF8() override = default; ~CartridgeF8() override = default;

View File

@ -19,7 +19,7 @@
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
CartridgeF8SC::CartridgeF8SC(const ByteBuffer& image, size_t size, CartridgeF8SC::CartridgeF8SC(const ByteBuffer& image, size_t size,
const string& md5, const Settings& settings, string_view md5, const Settings& settings,
size_t bsSize) size_t bsSize)
: CartridgeF8(image, size, md5, settings, bsSize) : CartridgeF8(image, size, md5, settings, bsSize)
{ {

View File

@ -44,7 +44,7 @@ class CartridgeF8SC : public CartridgeF8
@param settings A reference to the various settings (read-only) @param settings A reference to the various settings (read-only)
@param bsSize The size specified by the bankswitching scheme @param bsSize The size specified by the bankswitching scheme
*/ */
CartridgeF8SC(const ByteBuffer& image, size_t size, const string& md5, CartridgeF8SC(const ByteBuffer& image, size_t size, string_view md5,
const Settings& settings, size_t bsSize = 8_KB); const Settings& settings, size_t bsSize = 8_KB);
~CartridgeF8SC() override = default; ~CartridgeF8SC() override = default;

View File

@ -20,7 +20,7 @@
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
CartridgeFA::CartridgeFA(const ByteBuffer& image, size_t size, CartridgeFA::CartridgeFA(const ByteBuffer& image, size_t size,
const string& md5, const Settings& settings, string_view md5, const Settings& settings,
size_t bsSize) size_t bsSize)
: CartridgeEnhanced(image, size, md5, settings, bsSize) : CartridgeEnhanced(image, size, md5, settings, bsSize)
{ {

View File

@ -47,7 +47,7 @@ class CartridgeFA : public CartridgeEnhanced
@param settings A reference to the various settings (read-only) @param settings A reference to the various settings (read-only)
@param bsSize The size specified by the bankswitching scheme @param bsSize The size specified by the bankswitching scheme
*/ */
CartridgeFA(const ByteBuffer& image, size_t size, const string& md5, CartridgeFA(const ByteBuffer& image, size_t size, string_view md5,
const Settings& settings, size_t bsSize = 12_KB); const Settings& settings, size_t bsSize = 12_KB);
~CartridgeFA() override = default; ~CartridgeFA() override = default;

View File

@ -20,7 +20,7 @@
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
CartridgeFA2::CartridgeFA2(const ByteBuffer& image, size_t size, CartridgeFA2::CartridgeFA2(const ByteBuffer& image, size_t size,
const string& md5, const Settings& settings, string_view md5, const Settings& settings,
size_t bsSize) size_t bsSize)
: CartridgeFA(image, size, md5, settings, bsSize) : CartridgeFA(image, size, md5, settings, bsSize)
{ {

View File

@ -59,7 +59,7 @@ class CartridgeFA2 : public CartridgeFA
@param settings A reference to the settings object @param settings A reference to the settings object
@param bsSize The size specified by the bankswitching scheme @param bsSize The size specified by the bankswitching scheme
*/ */
CartridgeFA2(const ByteBuffer& image, size_t size, const string& md5, CartridgeFA2(const ByteBuffer& image, size_t size, string_view md5,
const Settings& settings, size_t bsSize = 28_KB); const Settings& settings, size_t bsSize = 28_KB);
~CartridgeFA2() override = default; ~CartridgeFA2() override = default;

View File

@ -20,7 +20,7 @@
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
CartridgeFC::CartridgeFC(const ByteBuffer& image, size_t size, CartridgeFC::CartridgeFC(const ByteBuffer& image, size_t size,
const string& md5, const Settings& settings, string_view md5, const Settings& settings,
size_t bsSize) size_t bsSize)
: CartridgeEnhanced(image, size, md5, settings, : CartridgeEnhanced(image, size, md5, settings,
bsSize == 0 ? BSPF::nextPowerOfTwo(size) : bsSize) bsSize == 0 ? BSPF::nextPowerOfTwo(size) : bsSize)

View File

@ -50,7 +50,7 @@ class CartridgeFC : public CartridgeEnhanced
@param bsSize The size specified by the bankswitching scheme @param bsSize The size specified by the bankswitching scheme
(where 0 means variable-sized ROM) (where 0 means variable-sized ROM)
*/ */
CartridgeFC(const ByteBuffer& image, size_t size, const string& md5, CartridgeFC(const ByteBuffer& image, size_t size, string_view md5,
const Settings& settings, size_t bsSize = 0); const Settings& settings, size_t bsSize = 0);
~CartridgeFC() override = default; ~CartridgeFC() override = default;

View File

@ -21,7 +21,7 @@
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
CartridgeFE::CartridgeFE(const ByteBuffer& image, size_t size, CartridgeFE::CartridgeFE(const ByteBuffer& image, size_t size,
const string& md5, const Settings& settings, string_view md5, const Settings& settings,
size_t bsSize) size_t bsSize)
: CartridgeEnhanced(image, size, md5, settings, bsSize) : CartridgeEnhanced(image, size, md5, settings, bsSize)
{ {

View File

@ -90,7 +90,7 @@ class CartridgeFE : public CartridgeEnhanced
@param settings A reference to the various settings (read-only) @param settings A reference to the various settings (read-only)
@param bsSize The size specified by the bankswitching scheme @param bsSize The size specified by the bankswitching scheme
*/ */
CartridgeFE(const ByteBuffer& image, size_t size, const string& md5, CartridgeFE(const ByteBuffer& image, size_t size, string_view md5,
const Settings& settings, size_t bsSize = 8_KB); const Settings& settings, size_t bsSize = 8_KB);
~CartridgeFE() override = default; ~CartridgeFE() override = default;

View File

@ -20,7 +20,7 @@
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
CartridgeMDM::CartridgeMDM(const ByteBuffer& image, size_t size, CartridgeMDM::CartridgeMDM(const ByteBuffer& image, size_t size,
const string& md5, const Settings& settings, string_view md5, const Settings& settings,
size_t bsSize) size_t bsSize)
: CartridgeEnhanced(image, size, md5, settings, : CartridgeEnhanced(image, size, md5, settings,
bsSize == 0 ? BSPF::nextPowerOfTwo(size) : bsSize) bsSize == 0 ? BSPF::nextPowerOfTwo(size) : bsSize)

View File

@ -59,7 +59,7 @@ class CartridgeMDM : public CartridgeEnhanced
@param bsSize The size specified by the bankswitching scheme @param bsSize The size specified by the bankswitching scheme
(where 0 means variable-sized ROM) (where 0 means variable-sized ROM)
*/ */
CartridgeMDM(const ByteBuffer& image, size_t size, const string& md5, CartridgeMDM(const ByteBuffer& image, size_t size, string_view md5,
const Settings& settings, size_t bsSize = 0); const Settings& settings, size_t bsSize = 0);
~CartridgeMDM() override = default; ~CartridgeMDM() override = default;

View File

@ -1557,8 +1557,8 @@ bool MovieCart::load(Serializer& in)
} }
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
CartridgeMVC::CartridgeMVC(const string& path, size_t size, CartridgeMVC::CartridgeMVC(string_view path, size_t size,
const string& md5, const Settings& settings, string_view md5, const Settings& settings,
size_t bsSize) size_t bsSize)
: Cartridge(settings, md5), : Cartridge(settings, md5),
myImage{make_unique<uInt8[]>(bsSize)}, // not used myImage{make_unique<uInt8[]>(bsSize)}, // not used

View File

@ -50,7 +50,7 @@ class CartridgeMVC : public Cartridge
@param settings A reference to the various settings (read-only) @param settings A reference to the various settings (read-only)
@param bsSize The size specified by the bankswitching scheme @param bsSize The size specified by the bankswitching scheme
*/ */
CartridgeMVC(const string& path, size_t size, const string& md5, CartridgeMVC(string_view path, size_t size, string_view md5,
const Settings& settings, size_t bsSize = 8_KB); const Settings& settings, size_t bsSize = 8_KB);
~CartridgeMVC() override; ~CartridgeMVC() override;

View File

@ -20,7 +20,7 @@
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
CartridgeSB::CartridgeSB(const ByteBuffer& image, size_t size, CartridgeSB::CartridgeSB(const ByteBuffer& image, size_t size,
const string& md5, const Settings& settings, string_view md5, const Settings& settings,
size_t bsSize) size_t bsSize)
: CartridgeEnhanced(image, size, md5, settings, : CartridgeEnhanced(image, size, md5, settings,
bsSize == 0 ? BSPF::nextPowerOfTwo(size) : bsSize) bsSize == 0 ? BSPF::nextPowerOfTwo(size) : bsSize)

View File

@ -48,7 +48,7 @@ class CartridgeSB : public CartridgeEnhanced
@param bsSize The size specified by the bankswitching scheme @param bsSize The size specified by the bankswitching scheme
(where 0 means variable-sized ROM) (where 0 means variable-sized ROM)
*/ */
CartridgeSB(const ByteBuffer& image, size_t size, const string& md5, CartridgeSB(const ByteBuffer& image, size_t size, string_view md5,
const Settings& settings, size_t bsSize = 0); const Settings& settings, size_t bsSize = 0);
~CartridgeSB() override = default; ~CartridgeSB() override = default;

Some files were not shown because too many files have changed in this diff Show More