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

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 e436548ac1
commit 54993268c7
119 changed files with 167 additions and 163 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/common/HighScoresManager.cxx
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)
{
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)
{
return jprops.contains(key) ? jprops.at(key).get<uInt32>() : defVal;
}
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
string HighScoresManager::getPropStr(const json& jprops, const string& key,
const string& defVal)
string HighScoresManager::getPropStr(const json& jprops, string_view key,
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)
{
const string str = getPropStr(jprops, key);

10
src/common/HighScoresManager.hxx
View File

@ -222,13 +222,13 @@ class HighScoresManager
json properties(json& jprops) const;
// 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);
static uInt32 getPropInt(const json& jprops, const string& key,
static uInt32 getPropInt(const json& jprops, string_view key,
uInt32 defVal = 0);
static string getPropStr(const json& jprops, const string& key,
const string& defVal = "");
static uInt16 getPropAddr(const json& jprops, const string& key,
static string getPropStr(const json& jprops, string_view key,
string_view defVal = "");
static uInt16 getPropAddr(const json& jprops, string_view key,
uInt16 defVal = 0);
static HSM::ScoreAddresses getPropScoreAddr(const json& jprops);

3
src/common/KeyMap.cxx
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();
// Since istringstream swallows whitespace, we have to make the
// delimiters be spaces
string list{lm};
std::replace(list.begin(), list.end(), '|', ' ');
std::replace(list.begin(), list.end(), ':', ' ');
std::replace(list.begin(), list.end(), ',', ' ');

2
src/common/KeyMap.hxx
View File

@ -90,7 +90,7 @@ class KeyMap
nlohmann::json saveMapping(const EventMode mode) const;
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 */
void eraseMode(const EventMode mode);

6
src/common/PJoystickHandler.cxx
View File

@ -47,7 +47,7 @@ PhysicalJoystickHandler::PhysicalJoystickHandler(
}
json mappings;
const string& serializedMapping = myOSystem.settings().getString("joymap");
string_view serializedMapping = myOSystem.settings().getString("joymap");
try {
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 = '^';
istringstream buf(mapping);
istringstream buf(string{mapping}); // TODO: fixed in C++20
string joymap, joyname;
getline(buf, joymap, CTRL_DELIM); // event list size, ignore

2
src/common/PJoystickHandler.hxx
View File

@ -68,7 +68,7 @@ class PhysicalJoystickHandler
public:
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. */
int add(const PhysicalJoystickPtr& stick);

3
src/common/PKeyboardHandler.cxx
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;

2
src/common/PKeyboardHandler.hxx
View File

@ -46,7 +46,7 @@ class PhysicalKeyboardHandler
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,
bool updateDefaults = false);

12
src/common/PhysicalJoystick.cxx
View File

@ -32,7 +32,7 @@ namespace {
return json(eventMode).get<string>();
}
EventMode eventModeFromJsonName(const string& name) {
EventMode eventModeFromJsonName(string_view name) {
EventMode result{};
from_json(json(name), result);
@ -42,7 +42,7 @@ 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*/)
{
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();
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();
istringstream buf(list);
istringstream buf(string{list}); // TODO: fixed in C++20
int value{0};
buf >> value; // we don't need to know the # of items at this point

7
src/common/PhysicalJoystick.hxx
View File

@ -48,14 +48,15 @@ class PhysicalJoystick
nlohmann::json getMap() const;
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 eraseEvent(Event::Type event, EventMode mode);
string about() const;
protected:
void initialize(int index, const string& desc,
void initialize(int index, string_view desc,
int axes, int buttons, int hats, int balls);
private:
@ -76,7 +77,7 @@ class PhysicalJoystick
JoyMap joyMap;
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) {
os << " ID: " << s.ID << ", name: " << s.name << ", numaxis: " << s.numAxes

4
src/common/StringParser.hxx
View File

@ -50,9 +50,9 @@ class StringParser
@param str The string to split
@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;
while(std::getline(buf, line, '\n'))

14
src/common/VideoModeHandler.cxx
View File

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

4
src/common/VideoModeHandler.hxx
View File

@ -49,10 +49,10 @@ class VideoModeHandler
Mode() = default;
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);
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)
{

2
src/common/repository/sqlite/SqliteError.hxx
View File

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

4
src/debugger/gui/CartDebugWidget.cxx
View File

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

4
src/debugger/gui/CartDebugWidget.hxx
View File

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

2
src/debugger/gui/RomWidget.cxx
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)
{
const uInt16 address = getAddress(disasm_line);

3
src/debugger/gui/RomWidget.hxx
View File

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

2
src/debugger/gui/TiaOutputWidget.cxx
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)
{
#ifdef IMAGE_SUPPORT

2
src/debugger/gui/TiaOutputWidget.hxx
View File

@ -36,7 +36,7 @@ class TiaOutputWidget : public Widget, public CommandSender
void loadConfig() override;
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);
// Eventually, these methods will enable access to the onscreen TIA image

3
src/emucore/Bankswitch.cxx
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);
if(it != ourNameToTypes.end())
return it->second;

2
src/emucore/Bankswitch.hxx
View File

@ -75,7 +75,7 @@ class Bankswitch
static string typeToName(Bankswitch::Type type);
// 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
static string typeToDesc(Bankswitch::Type type);

2
src/emucore/Cart0840.cxx
View File

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

2
src/emucore/Cart0840.hxx
View File

@ -46,7 +46,7 @@ class Cartridge0840 : public CartridgeEnhanced
@param settings A reference to the various settings (read-only)
@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);
~Cartridge0840() override = default;

2
src/emucore/Cart0FA0.cxx
View File

@ -20,7 +20,7 @@
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
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)
{
}

2
src/emucore/Cart0FA0.hxx
View File

@ -47,7 +47,7 @@ class Cartridge0FA0 : public CartridgeEnhanced
@param md5 The md5sum of the ROM image
@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);
~Cartridge0FA0() override = default;

2
src/emucore/Cart2K.cxx
View File

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

2
src/emucore/Cart2K.hxx
View File

@ -49,7 +49,7 @@ class Cartridge2K : public CartridgeEnhanced
@param settings A reference to the various settings (read-only)
@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);
~Cartridge2K() override = default;

2
src/emucore/Cart3E.cxx
View File

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

2
src/emucore/Cart3E.hxx
View File

@ -74,7 +74,7 @@ class Cartridge3E : public CartridgeEnhanced
@param bsSize The size specified by the bankswitching scheme
(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);
~Cartridge3E() override = default;

2
src/emucore/Cart3EPlus.cxx
View File

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

2
src/emucore/Cart3EPlus.hxx
View File

@ -97,7 +97,7 @@ class Cartridge3EPlus: public Cartridge3E
@param bsSize The size specified by the bankswitching scheme
(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);
~Cartridge3EPlus() override = default;

2
src/emucore/Cart3EX.cxx
View File

@ -19,7 +19,7 @@
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
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)
{
// 0xFFFA contains RAM bank count - 1;

2
src/emucore/Cart3EX.hxx
View File

@ -41,7 +41,7 @@ class Cartridge3EX : public Cartridge3E
@param md5 The md5sum of the ROM image
@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);
~Cartridge3EX() override = default;

2
src/emucore/Cart3F.cxx
View File

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

2
src/emucore/Cart3F.hxx
View File

@ -53,7 +53,7 @@ class Cartridge3F : public CartridgeEnhanced
@param bsSize The size specified by the bankswitching scheme
(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);
~Cartridge3F() override = default;

2
src/emucore/Cart4A50.cxx
View File

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

2
src/emucore/Cart4A50.hxx
View File

@ -65,7 +65,7 @@ class Cartridge4A50 : public Cartridge
@param md5 The md5sum of the ROM image
@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);
~Cartridge4A50() override = default;

2
src/emucore/Cart4K.cxx
View File

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

2
src/emucore/Cart4K.hxx
View File

@ -46,7 +46,7 @@ class Cartridge4K : public CartridgeEnhanced
@param settings A reference to the various settings (read-only)
@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);
~Cartridge4K() override = default;

2
src/emucore/Cart4KSC.cxx
View File

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

2
src/emucore/Cart4KSC.hxx
View File

@ -47,7 +47,7 @@ class Cartridge4KSC : public Cartridge4K
@param settings A reference to the various settings (read-only)
@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);
~Cartridge4KSC() override = default;

2
src/emucore/CartAR.cxx
View File

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

2
src/emucore/CartAR.hxx
View File

@ -57,7 +57,7 @@ class CartridgeAR : public Cartridge
@param md5 The md5sum of the ROM image
@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);
~CartridgeAR() override = default;

2
src/emucore/CartBF.cxx
View File

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

2
src/emucore/CartBF.hxx
View File

@ -47,7 +47,7 @@ class CartridgeBF : public CartridgeEnhanced
@param settings A reference to the various settings (read-only)
@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);
~CartridgeBF() override = default;

2
src/emucore/CartBFSC.cxx
View File

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

2
src/emucore/CartBFSC.hxx
View File

@ -47,7 +47,7 @@ class CartridgeBFSC : public CartridgeBF
@param settings A reference to the various settings (read-only)
@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);
~CartridgeBFSC() override = default;

2
src/emucore/CartCM.cxx
View File

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

2
src/emucore/CartCM.hxx
View File

@ -120,7 +120,7 @@ class CartridgeCM : public Cartridge
@param md5 The md5sum of the ROM image
@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);
~CartridgeCM() override = default;

2
src/emucore/CartCTY.cxx
View File

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

2
src/emucore/CartCTY.hxx
View File

@ -118,7 +118,7 @@ class CartridgeCTY : public Cartridge
@param md5 The md5sum of the ROM image
@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);
~CartridgeCTY() override = default;

2
src/emucore/CartCV.cxx
View File

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

2
src/emucore/CartCV.hxx
View File

@ -49,7 +49,7 @@ class CartridgeCV : public CartridgeEnhanced
@param settings A reference to the various settings (read-only)
@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);
~CartridgeCV() override = default;

7
src/emucore/CartCreator.cxx
View File

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

4
src/emucore/CartCreator.hxx
View File

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

2
src/emucore/CartDF.cxx
View File

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

2
src/emucore/CartDF.hxx
View File

@ -47,7 +47,7 @@ class CartridgeDF : public CartridgeEnhanced
@param settings A reference to the various settings (read-only)
@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);
~CartridgeDF() override = default;

2
src/emucore/CartDFSC.cxx
View File

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

2
src/emucore/CartDFSC.hxx
View File

@ -47,7 +47,7 @@ class CartridgeDFSC : public CartridgeDF
@param settings A reference to the various settings (read-only)
@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);
~CartridgeDFSC() override = default;

2
src/emucore/CartDPC.cxx
View File

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

2
src/emucore/CartDPC.hxx
View File

@ -48,7 +48,7 @@ class CartridgeDPC : public CartridgeF8
@param settings A reference to the various settings (read-only)
@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);
~CartridgeDPC() override = default;

2
src/emucore/CartE0.cxx
View File

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

2
src/emucore/CartE0.hxx
View File

@ -55,7 +55,7 @@ class CartridgeE0 : public CartridgeEnhanced
@param settings A reference to the various settings (read-only)
@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);
~CartridgeE0() override = default;

2
src/emucore/CartE7.cxx
View File

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

2
src/emucore/CartE7.hxx
View File

@ -75,7 +75,7 @@ class CartridgeE7 : public Cartridge
@param md5 The md5sum of the ROM image
@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);
~CartridgeE7() override = default;

2
src/emucore/CartEF.cxx
View File

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

2
src/emucore/CartEF.hxx
View File

@ -47,7 +47,7 @@ class CartridgeEF : public CartridgeEnhanced
@param settings A reference to the various settings (read-only)
@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);
~CartridgeEF() override = default;

2
src/emucore/CartEFSC.cxx
View File

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

2
src/emucore/CartEFSC.hxx
View File

@ -48,7 +48,7 @@ class CartridgeEFSC : public CartridgeEF
@param settings A reference to the various settings (read-only)
@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);
~CartridgeEFSC() override = default;

2
src/emucore/CartEnhanced.cxx
View File

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

2
src/emucore/CartEnhanced.hxx
View File

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

2
src/emucore/CartF0.cxx
View File

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

2
src/emucore/CartF0.hxx
View File

@ -44,7 +44,7 @@ class CartridgeF0 : public CartridgeEnhanced
@param settings A reference to the various settings (read-only)
@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);
~CartridgeF0() override = default;

2
src/emucore/CartF4.cxx
View File

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

2
src/emucore/CartF4.hxx
View File

@ -43,7 +43,7 @@ class CartridgeF4 : public CartridgeEnhanced
@param settings A reference to the various settings (read-only)
@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);
~CartridgeF4() override = default;

2
src/emucore/CartF4SC.cxx
View File

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

2
src/emucore/CartF4SC.hxx
View File

@ -44,7 +44,7 @@ class CartridgeF4SC : public CartridgeF4
@param settings A reference to the various settings (read-only)
@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);
~CartridgeF4SC() override = default;

2
src/emucore/CartF6.cxx
View File

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

2
src/emucore/CartF6.hxx
View File

@ -43,7 +43,7 @@ class CartridgeF6 : public CartridgeEnhanced
@param settings A reference to the various settings (read-only)
@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);
~CartridgeF6() override = default;

2
src/emucore/CartF6SC.cxx
View File

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

2
src/emucore/CartF6SC.hxx
View File

@ -44,7 +44,7 @@ class CartridgeF6SC : public CartridgeF6
@param settings A reference to the various settings (read-only)
@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);
~CartridgeF6SC() override = default;

2
src/emucore/CartF8.cxx
View File

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

2
src/emucore/CartF8.hxx
View File

@ -43,7 +43,7 @@ class CartridgeF8 : public CartridgeEnhanced
@param settings A reference to the various settings (read-only)
@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);
~CartridgeF8() override = default;

2
src/emucore/CartF8SC.cxx
View File

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

2
src/emucore/CartF8SC.hxx
View File

@ -44,7 +44,7 @@ class CartridgeF8SC : public CartridgeF8
@param settings A reference to the various settings (read-only)
@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);
~CartridgeF8SC() override = default;

2
src/emucore/CartFA.cxx
View File

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

2
src/emucore/CartFA.hxx
View File

@ -47,7 +47,7 @@ class CartridgeFA : public CartridgeEnhanced
@param settings A reference to the various settings (read-only)
@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);
~CartridgeFA() override = default;

2
src/emucore/CartFA2.cxx
View File

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

2
src/emucore/CartFA2.hxx
View File

@ -59,7 +59,7 @@ class CartridgeFA2 : public CartridgeFA
@param settings A reference to the settings object
@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);
~CartridgeFA2() override = default;

2
src/emucore/CartFC.cxx
View File

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

2
src/emucore/CartFC.hxx
View File

@ -50,7 +50,7 @@ class CartridgeFC : public CartridgeEnhanced
@param bsSize The size specified by the bankswitching scheme
(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);
~CartridgeFC() override = default;

2
src/emucore/CartFE.cxx
View File

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

2
src/emucore/CartFE.hxx
View File

@ -90,7 +90,7 @@ class CartridgeFE : public CartridgeEnhanced
@param settings A reference to the various settings (read-only)
@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);
~CartridgeFE() override = default;

2
src/emucore/CartMDM.cxx
View File

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

2
src/emucore/CartMDM.hxx
View File

@ -59,7 +59,7 @@ class CartridgeMDM : public CartridgeEnhanced
@param bsSize The size specified by the bankswitching scheme
(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);
~CartridgeMDM() override = default;

4
src/emucore/CartMVC.cxx
View File

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

2
src/emucore/CartMVC.hxx
View File

@ -50,7 +50,7 @@ class CartridgeMVC : public Cartridge
@param settings A reference to the various settings (read-only)
@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);
~CartridgeMVC() override;

2
src/emucore/CartSB.cxx
View File

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

2
src/emucore/CartSB.hxx
View File

@ -48,7 +48,7 @@ class CartridgeSB : public CartridgeEnhanced
@param bsSize The size specified by the bankswitching scheme
(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);
~CartridgeSB() override = default;

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