diff options
author | Vas Crabb <vas@vastheman.com> | 2016-12-11 18:15:41 +1100 |
---|---|---|
committer | Vas Crabb <vas@vastheman.com> | 2016-12-11 18:15:41 +1100 |
commit | c8f19544676e2954bf2bb4ca03aa90d1d1148fc8 (patch) | |
tree | dd802a7f701c5ef7d3a5270a19f5a295a8ed8e7f /src/osd | |
parent | f38bc880f0fe3eb73740f8b5c00c359402afb3c4 (diff) |
XML refactoring:
* move stuff to namespace util::xml
* scope down some enums
* split config load/save delegate types
* make config load take const so it can't mangle data
Diffstat (limited to 'src/osd')
-rw-r--r-- | src/osd/modules/debugger/debugqt.cpp | 16 | ||||
-rw-r--r-- | src/osd/modules/debugger/qt/breakpointswindow.cpp | 4 | ||||
-rw-r--r-- | src/osd/modules/debugger/qt/breakpointswindow.h | 4 | ||||
-rw-r--r-- | src/osd/modules/debugger/qt/dasmwindow.cpp | 4 | ||||
-rw-r--r-- | src/osd/modules/debugger/qt/dasmwindow.h | 4 | ||||
-rw-r--r-- | src/osd/modules/debugger/qt/deviceinformationwindow.cpp | 4 | ||||
-rw-r--r-- | src/osd/modules/debugger/qt/deviceinformationwindow.h | 4 | ||||
-rw-r--r-- | src/osd/modules/debugger/qt/deviceswindow.cpp | 4 | ||||
-rw-r--r-- | src/osd/modules/debugger/qt/deviceswindow.h | 4 | ||||
-rw-r--r-- | src/osd/modules/debugger/qt/logwindow.cpp | 4 | ||||
-rw-r--r-- | src/osd/modules/debugger/qt/logwindow.h | 4 | ||||
-rw-r--r-- | src/osd/modules/debugger/qt/mainwindow.cpp | 4 | ||||
-rw-r--r-- | src/osd/modules/debugger/qt/mainwindow.h | 4 | ||||
-rw-r--r-- | src/osd/modules/debugger/qt/memorywindow.cpp | 4 | ||||
-rw-r--r-- | src/osd/modules/debugger/qt/memorywindow.h | 4 | ||||
-rw-r--r-- | src/osd/modules/debugger/qt/windowqt.cpp | 4 | ||||
-rw-r--r-- | src/osd/modules/debugger/qt/windowqt.h | 4 |
17 files changed, 40 insertions, 40 deletions
diff --git a/src/osd/modules/debugger/debugqt.cpp b/src/osd/modules/debugger/debugqt.cpp index ff53278d3a6..c138aa074aa 100644 --- a/src/osd/modules/debugger/debugqt.cpp +++ b/src/osd/modules/debugger/debugqt.cpp @@ -77,10 +77,10 @@ static MainWindow* mainQtWindow = nullptr; std::vector<WindowQtConfig*> xmlConfigurations; -static void xml_configuration_load(running_machine &machine, config_type cfg_type, xml_data_node *parentnode) +static void xml_configuration_load(running_machine &machine, config_type cfg_type, util::xml::data_node const *parentnode) { // We only care about game files - if (cfg_type != config_type::CONFIG_TYPE_GAME) + if (cfg_type != config_type::GAME) return; // Might not have any data @@ -92,7 +92,7 @@ static void xml_configuration_load(running_machine &machine, config_type cfg_typ xmlConfigurations.clear(); // Configuration load - xml_data_node const * wnode = nullptr; + util::xml::data_node const * wnode = nullptr; for (wnode = parentnode->get_child("window"); wnode != nullptr; wnode = wnode->get_next_sibling("window")) { WindowQtConfig::WindowType type = (WindowQtConfig::WindowType)wnode->get_attribute_int("type", WindowQtConfig::WIN_TYPE_UNKNOWN); @@ -112,10 +112,10 @@ static void xml_configuration_load(running_machine &machine, config_type cfg_typ } -static void xml_configuration_save(running_machine &machine, config_type cfg_type, xml_data_node *parentnode) +static void xml_configuration_save(running_machine &machine, config_type cfg_type, util::xml::data_node *parentnode) { // We only write to game configurations - if (cfg_type != config_type::CONFIG_TYPE_GAME) + if (cfg_type != config_type::GAME) return; for (int i = 0; i < xmlConfigurations.size(); i++) @@ -123,7 +123,7 @@ static void xml_configuration_save(running_machine &machine, config_type cfg_typ WindowQtConfig* config = xmlConfigurations[i]; // Create an xml node - xml_data_node *const debugger_node = parentnode->add_child("window", nullptr); + util::xml::data_node *const debugger_node = parentnode->add_child("window", nullptr); if (debugger_node == nullptr) continue; @@ -268,8 +268,8 @@ void debug_qt::init_debugger(running_machine &machine) m_machine = &machine; // Setup the configuration XML saving and loading machine.configuration().config_register("debugger", - config_saveload_delegate(&xml_configuration_load, &machine), - config_saveload_delegate(&xml_configuration_save, &machine)); + config_load_delegate(&xml_configuration_load, &machine), + config_save_delegate(&xml_configuration_save, &machine)); } diff --git a/src/osd/modules/debugger/qt/breakpointswindow.cpp b/src/osd/modules/debugger/qt/breakpointswindow.cpp index a5b06ec4caf..029cf2d0b72 100644 --- a/src/osd/modules/debugger/qt/breakpointswindow.cpp +++ b/src/osd/modules/debugger/qt/breakpointswindow.cpp @@ -122,14 +122,14 @@ void BreakpointsWindowQtConfig::applyToQWidget(QWidget* widget) } -void BreakpointsWindowQtConfig::addToXmlDataNode(xml_data_node &node) const +void BreakpointsWindowQtConfig::addToXmlDataNode(util::xml::data_node &node) const { WindowQtConfig::addToXmlDataNode(node); node.set_attribute_int("bwtype", m_bwType); } -void BreakpointsWindowQtConfig::recoverFromXmlNode(xml_data_node const &node) +void BreakpointsWindowQtConfig::recoverFromXmlNode(util::xml::data_node const &node) { WindowQtConfig::recoverFromXmlNode(node); m_bwType = node.get_attribute_int("bwtype", m_bwType); diff --git a/src/osd/modules/debugger/qt/breakpointswindow.h b/src/osd/modules/debugger/qt/breakpointswindow.h index 52d61e95f5b..60bbdc4379f 100644 --- a/src/osd/modules/debugger/qt/breakpointswindow.h +++ b/src/osd/modules/debugger/qt/breakpointswindow.h @@ -48,8 +48,8 @@ public: void buildFromQWidget(QWidget* widget); void applyToQWidget(QWidget* widget); - void addToXmlDataNode(xml_data_node &node) const; - void recoverFromXmlNode(xml_data_node const &node); + void addToXmlDataNode(util::xml::data_node &node) const; + void recoverFromXmlNode(util::xml::data_node const &node); }; diff --git a/src/osd/modules/debugger/qt/dasmwindow.cpp b/src/osd/modules/debugger/qt/dasmwindow.cpp index c317c41956f..fd98a6483be 100644 --- a/src/osd/modules/debugger/qt/dasmwindow.cpp +++ b/src/osd/modules/debugger/qt/dasmwindow.cpp @@ -302,14 +302,14 @@ void DasmWindowQtConfig::applyToQWidget(QWidget* widget) rightBarGroup->actions()[m_rightBar]->trigger(); } -void DasmWindowQtConfig::addToXmlDataNode(xml_data_node &node) const +void DasmWindowQtConfig::addToXmlDataNode(util::xml::data_node &node) const { WindowQtConfig::addToXmlDataNode(node); node.set_attribute_int("cpu", m_cpu); node.set_attribute_int("rightbar", m_rightBar); } -void DasmWindowQtConfig::recoverFromXmlNode(xml_data_node const &node) +void DasmWindowQtConfig::recoverFromXmlNode(util::xml::data_node const &node) { WindowQtConfig::recoverFromXmlNode(node); m_cpu = node.get_attribute_int("cpu", m_cpu); diff --git a/src/osd/modules/debugger/qt/dasmwindow.h b/src/osd/modules/debugger/qt/dasmwindow.h index 9a8bf849ab2..27b652c04e8 100644 --- a/src/osd/modules/debugger/qt/dasmwindow.h +++ b/src/osd/modules/debugger/qt/dasmwindow.h @@ -71,8 +71,8 @@ public: void buildFromQWidget(QWidget* widget); void applyToQWidget(QWidget* widget); - void addToXmlDataNode(xml_data_node &node) const; - void recoverFromXmlNode(xml_data_node const &node); + void addToXmlDataNode(util::xml::data_node &node) const; + void recoverFromXmlNode(util::xml::data_node const &node); }; diff --git a/src/osd/modules/debugger/qt/deviceinformationwindow.cpp b/src/osd/modules/debugger/qt/deviceinformationwindow.cpp index aa71d02b630..30daaaec9ea 100644 --- a/src/osd/modules/debugger/qt/deviceinformationwindow.cpp +++ b/src/osd/modules/debugger/qt/deviceinformationwindow.cpp @@ -122,14 +122,14 @@ void DeviceInformationWindowQtConfig::applyToQWidget(QWidget* widget) } -void DeviceInformationWindowQtConfig::addToXmlDataNode(xml_data_node &node) const +void DeviceInformationWindowQtConfig::addToXmlDataNode(util::xml::data_node &node) const { WindowQtConfig::addToXmlDataNode(node); node.set_attribute("device-tag", m_device_tag.c_str()); } -void DeviceInformationWindowQtConfig::recoverFromXmlNode(xml_data_node const &node) +void DeviceInformationWindowQtConfig::recoverFromXmlNode(util::xml::data_node const &node) { WindowQtConfig::recoverFromXmlNode(node); m_device_tag = node.get_attribute_string("device-tag", ":"); diff --git a/src/osd/modules/debugger/qt/deviceinformationwindow.h b/src/osd/modules/debugger/qt/deviceinformationwindow.h index 05335b6f631..5ed1bfbde91 100644 --- a/src/osd/modules/debugger/qt/deviceinformationwindow.h +++ b/src/osd/modules/debugger/qt/deviceinformationwindow.h @@ -45,8 +45,8 @@ public: void buildFromQWidget(QWidget* widget); void applyToQWidget(QWidget* widget); - void addToXmlDataNode(xml_data_node &node) const; - void recoverFromXmlNode(xml_data_node const &node); + void addToXmlDataNode(util::xml::data_node &node) const; + void recoverFromXmlNode(util::xml::data_node const &node); }; diff --git a/src/osd/modules/debugger/qt/deviceswindow.cpp b/src/osd/modules/debugger/qt/deviceswindow.cpp index 4c570253723..599022f40f9 100644 --- a/src/osd/modules/debugger/qt/deviceswindow.cpp +++ b/src/osd/modules/debugger/qt/deviceswindow.cpp @@ -164,13 +164,13 @@ void DevicesWindowQtConfig::applyToQWidget(QWidget* widget) } -void DevicesWindowQtConfig::addToXmlDataNode(xml_data_node &node) const +void DevicesWindowQtConfig::addToXmlDataNode(util::xml::data_node &node) const { WindowQtConfig::addToXmlDataNode(node); } -void DevicesWindowQtConfig::recoverFromXmlNode(xml_data_node const &node) +void DevicesWindowQtConfig::recoverFromXmlNode(util::xml::data_node const &node) { WindowQtConfig::recoverFromXmlNode(node); } diff --git a/src/osd/modules/debugger/qt/deviceswindow.h b/src/osd/modules/debugger/qt/deviceswindow.h index e2440d6cc34..87e710a001b 100644 --- a/src/osd/modules/debugger/qt/deviceswindow.h +++ b/src/osd/modules/debugger/qt/deviceswindow.h @@ -73,8 +73,8 @@ public: void buildFromQWidget(QWidget* widget); void applyToQWidget(QWidget* widget); - void addToXmlDataNode(xml_data_node &node) const; - void recoverFromXmlNode(xml_data_node const &node); + void addToXmlDataNode(util::xml::data_node &node) const; + void recoverFromXmlNode(util::xml::data_node const &node); }; diff --git a/src/osd/modules/debugger/qt/logwindow.cpp b/src/osd/modules/debugger/qt/logwindow.cpp index 8bd0d55568d..ecb8bf66e14 100644 --- a/src/osd/modules/debugger/qt/logwindow.cpp +++ b/src/osd/modules/debugger/qt/logwindow.cpp @@ -60,13 +60,13 @@ void LogWindowQtConfig::applyToQWidget(QWidget* widget) } -void LogWindowQtConfig::addToXmlDataNode(xml_data_node &node) const +void LogWindowQtConfig::addToXmlDataNode(util::xml::data_node &node) const { WindowQtConfig::addToXmlDataNode(node); } -void LogWindowQtConfig::recoverFromXmlNode(xml_data_node const &node) +void LogWindowQtConfig::recoverFromXmlNode(util::xml::data_node const &node) { WindowQtConfig::recoverFromXmlNode(node); } diff --git a/src/osd/modules/debugger/qt/logwindow.h b/src/osd/modules/debugger/qt/logwindow.h index dd1ebb4f8ad..53228ceafca 100644 --- a/src/osd/modules/debugger/qt/logwindow.h +++ b/src/osd/modules/debugger/qt/logwindow.h @@ -40,8 +40,8 @@ public: void buildFromQWidget(QWidget* widget); void applyToQWidget(QWidget* widget); - void addToXmlDataNode(xml_data_node &node) const; - void recoverFromXmlNode(xml_data_node const &node); + void addToXmlDataNode(util::xml::data_node &node) const; + void recoverFromXmlNode(util::xml::data_node const &node); }; diff --git a/src/osd/modules/debugger/qt/mainwindow.cpp b/src/osd/modules/debugger/qt/mainwindow.cpp index 81be708c927..68a8fa0c644 100644 --- a/src/osd/modules/debugger/qt/mainwindow.cpp +++ b/src/osd/modules/debugger/qt/mainwindow.cpp @@ -526,7 +526,7 @@ void MainWindowQtConfig::applyToQWidget(QWidget* widget) } -void MainWindowQtConfig::addToXmlDataNode(xml_data_node &node) const +void MainWindowQtConfig::addToXmlDataNode(util::xml::data_node &node) const { WindowQtConfig::addToXmlDataNode(node); node.set_attribute_int("rightbar", m_rightBar); @@ -534,7 +534,7 @@ void MainWindowQtConfig::addToXmlDataNode(xml_data_node &node) const } -void MainWindowQtConfig::recoverFromXmlNode(xml_data_node const &node) +void MainWindowQtConfig::recoverFromXmlNode(util::xml::data_node const &node) { WindowQtConfig::recoverFromXmlNode(node); const char* state = node.get_attribute_string("qtwindowstate", ""); diff --git a/src/osd/modules/debugger/qt/mainwindow.h b/src/osd/modules/debugger/qt/mainwindow.h index 920ac438356..95a4e53ca99 100644 --- a/src/osd/modules/debugger/qt/mainwindow.h +++ b/src/osd/modules/debugger/qt/mainwindow.h @@ -199,8 +199,8 @@ public: void buildFromQWidget(QWidget* widget); void applyToQWidget(QWidget* widget); - void addToXmlDataNode(xml_data_node &node) const; - void recoverFromXmlNode(xml_data_node const &node); + void addToXmlDataNode(util::xml::data_node &node) const; + void recoverFromXmlNode(util::xml::data_node const &node); }; diff --git a/src/osd/modules/debugger/qt/memorywindow.cpp b/src/osd/modules/debugger/qt/memorywindow.cpp index a15ce819acb..9875cc3dca8 100644 --- a/src/osd/modules/debugger/qt/memorywindow.cpp +++ b/src/osd/modules/debugger/qt/memorywindow.cpp @@ -430,7 +430,7 @@ void MemoryWindowQtConfig::applyToQWidget(QWidget* widget) } -void MemoryWindowQtConfig::addToXmlDataNode(xml_data_node &node) const +void MemoryWindowQtConfig::addToXmlDataNode(util::xml::data_node &node) const { WindowQtConfig::addToXmlDataNode(node); node.set_attribute_int("memoryregion", m_memoryRegion); @@ -440,7 +440,7 @@ void MemoryWindowQtConfig::addToXmlDataNode(xml_data_node &node) const } -void MemoryWindowQtConfig::recoverFromXmlNode(xml_data_node const &node) +void MemoryWindowQtConfig::recoverFromXmlNode(util::xml::data_node const &node) { WindowQtConfig::recoverFromXmlNode(node); m_memoryRegion = node.get_attribute_int("memoryregion", m_memoryRegion); diff --git a/src/osd/modules/debugger/qt/memorywindow.h b/src/osd/modules/debugger/qt/memorywindow.h index 42f81ac1178..ff0c974c838 100644 --- a/src/osd/modules/debugger/qt/memorywindow.h +++ b/src/osd/modules/debugger/qt/memorywindow.h @@ -91,8 +91,8 @@ public: void buildFromQWidget(QWidget* widget); void applyToQWidget(QWidget* widget); - void addToXmlDataNode(xml_data_node &node) const; - void recoverFromXmlNode(xml_data_node const &node); + void addToXmlDataNode(util::xml::data_node &node) const; + void recoverFromXmlNode(util::xml::data_node const &node); }; diff --git a/src/osd/modules/debugger/qt/windowqt.cpp b/src/osd/modules/debugger/qt/windowqt.cpp index 09709adbbf7..c908ac583c7 100644 --- a/src/osd/modules/debugger/qt/windowqt.cpp +++ b/src/osd/modules/debugger/qt/windowqt.cpp @@ -257,7 +257,7 @@ void WindowQtConfig::applyToQWidget(QWidget* widget) } -void WindowQtConfig::addToXmlDataNode(xml_data_node &node) const +void WindowQtConfig::addToXmlDataNode(util::xml::data_node &node) const { node.set_attribute_int("type", m_type); node.set_attribute_int("position_x", m_position.x()); @@ -267,7 +267,7 @@ void WindowQtConfig::addToXmlDataNode(xml_data_node &node) const } -void WindowQtConfig::recoverFromXmlNode(xml_data_node const &node) +void WindowQtConfig::recoverFromXmlNode(util::xml::data_node const &node) { m_size.setX(node.get_attribute_int("size_x", m_size.x())); m_size.setY(node.get_attribute_int("size_y", m_size.y())); diff --git a/src/osd/modules/debugger/qt/windowqt.h b/src/osd/modules/debugger/qt/windowqt.h index 6f9701f0196..28b3039c28f 100644 --- a/src/osd/modules/debugger/qt/windowqt.h +++ b/src/osd/modules/debugger/qt/windowqt.h @@ -92,8 +92,8 @@ public: virtual void buildFromQWidget(QWidget* widget); virtual void applyToQWidget(QWidget* widget); - virtual void addToXmlDataNode(xml_data_node &node) const; - virtual void recoverFromXmlNode(xml_data_node const &node); + virtual void addToXmlDataNode(util::xml::data_node &node) const; + virtual void recoverFromXmlNode(util::xml::data_node const &node); }; |