diff options
author | 2016-01-20 21:35:11 +0100 | |
---|---|---|
committer | 2016-01-20 21:35:11 +0100 | |
commit | 7c9cd3feea638281df93381c5a7a871d79a7ba17 (patch) | |
tree | 1a857a2593c63a7ab3dee7eb248577701780f2e0 /src/emu/device.h | |
parent | 8193c47c1925d937acc80f043ea9eadac39fd791 (diff) |
Revert "rest of device parameters to std::string (nw)"
This reverts commit caba131d844ade3f2b30d6be24ea6cf46b2949d7.
Diffstat (limited to 'src/emu/device.h')
-rw-r--r-- | src/emu/device.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/emu/device.h b/src/emu/device.h index 70317bb6e22..96a460bb988 100644 --- a/src/emu/device.h +++ b/src/emu/device.h @@ -105,19 +105,19 @@ class device_t : public delegate_late_bind protected: // construction/destruction - device_t(const machine_config &mconfig, device_type type, std::string name, std::string tag, device_t *owner, UINT32 clock, std::string shortname, std::string source); + device_t(const machine_config &mconfig, device_type type, const char *name, std::string tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); public: virtual ~device_t(); // getters running_machine &machine() const { /*assert(m_machine != NULL);*/ return *m_machine; } std::string tag() const { return m_tag; } - std::string basetag() const { return m_basetag; } + const char *basetag() const { return m_basetag.c_str(); } device_type type() const { return m_type; } - std::string name() const { return m_name; } - std::string shortname() const { return m_shortname; } - std::string searchpath() const { return m_searchpath; } - std::string source() const { return m_source; } + const char *name() const { return m_name.c_str(); } + const char *shortname() const { return m_shortname.c_str(); } + const char *searchpath() const { return m_searchpath.c_str(); } + const char *source() const { return m_source.c_str(); } device_t *owner() const { return m_owner; } device_t *next() const { return m_next; } UINT32 configured_clock() const { return m_configured_clock; } @@ -192,9 +192,9 @@ public: // state saving interfaces template<typename _ItemType> - void ATTR_COLD save_item(_ItemType &value, std::string valname, int index = 0) { assert(m_save != nullptr); m_save->save_item(this, name(), tag(), index, value, valname); } + void ATTR_COLD save_item(_ItemType &value, const char *valname, int index = 0) { assert(m_save != nullptr); m_save->save_item(this, name(), tag(), index, value, valname); } template<typename _ItemType> - void ATTR_COLD save_pointer(_ItemType *value, std::string valname, UINT32 count, int index = 0) { assert(m_save != nullptr); m_save->save_pointer(this, name(), tag(), index, value, valname, count); } + void ATTR_COLD save_pointer(_ItemType *value, const char *valname, UINT32 count, int index = 0) { assert(m_save != nullptr); m_save->save_pointer(this, name(), tag(), index, value, valname, count); } // debugging device_debug *debug() const { return m_debug.get(); } |