diff options
author | 2016-11-17 11:11:39 +1100 | |
---|---|---|
committer | 2016-11-17 11:12:16 +1100 | |
commit | 54444fecff844dbfc08f88fdae75c0f06cc889d7 (patch) | |
tree | 107d5c7250c82247a4cc0278c461124626c4250e /src/osd/modules/debugger | |
parent | 28d1c7004d373759d4b6aea4d6d2c16da0c0d9d9 (diff) |
patch up Qt debugger for new xmlfile API (nw)
Diffstat (limited to 'src/osd/modules/debugger')
-rw-r--r-- | src/osd/modules/debugger/debugqt.cpp | 13 | ||||
-rw-r--r-- | src/osd/modules/debugger/qt/breakpointswindow.cpp | 8 | ||||
-rw-r--r-- | src/osd/modules/debugger/qt/breakpointswindow.h | 4 | ||||
-rw-r--r-- | src/osd/modules/debugger/qt/dasmwindow.cpp | 12 | ||||
-rw-r--r-- | src/osd/modules/debugger/qt/dasmwindow.h | 4 | ||||
-rw-r--r-- | src/osd/modules/debugger/qt/deviceinformationwindow.cpp | 8 | ||||
-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 | 12 | ||||
-rw-r--r-- | src/osd/modules/debugger/qt/mainwindow.h | 4 | ||||
-rw-r--r-- | src/osd/modules/debugger/qt/memorywindow.cpp | 20 | ||||
-rw-r--r-- | src/osd/modules/debugger/qt/memorywindow.h | 4 | ||||
-rw-r--r-- | src/osd/modules/debugger/qt/windowqt.cpp | 24 | ||||
-rw-r--r-- | src/osd/modules/debugger/qt/windowqt.h | 4 |
17 files changed, 68 insertions, 69 deletions
diff --git a/src/osd/modules/debugger/debugqt.cpp b/src/osd/modules/debugger/debugqt.cpp index 7cdca830349..ff53278d3a6 100644 --- a/src/osd/modules/debugger/debugqt.cpp +++ b/src/osd/modules/debugger/debugqt.cpp @@ -92,10 +92,10 @@ static void xml_configuration_load(running_machine &machine, config_type cfg_typ xmlConfigurations.clear(); // Configuration load - xml_data_node* wnode = nullptr; - for (wnode = xml_get_sibling(parentnode->child, "window"); wnode != nullptr; wnode = xml_get_sibling(wnode->next, "window")) + 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)xml_get_attribute_int(wnode, "type", WindowQtConfig::WIN_TYPE_UNKNOWN); + WindowQtConfig::WindowType type = (WindowQtConfig::WindowType)wnode->get_attribute_int("type", WindowQtConfig::WIN_TYPE_UNKNOWN); switch (type) { case WindowQtConfig::WIN_TYPE_MAIN: xmlConfigurations.push_back(new MainWindowQtConfig()); break; @@ -107,7 +107,7 @@ static void xml_configuration_load(running_machine &machine, config_type cfg_typ case WindowQtConfig::WIN_TYPE_DEVICE_INFORMATION: xmlConfigurations.push_back(new DeviceInformationWindowQtConfig()); break; default: continue; } - xmlConfigurations.back()->recoverFromXmlNode(wnode); + xmlConfigurations.back()->recoverFromXmlNode(*wnode); } } @@ -123,13 +123,12 @@ static void xml_configuration_save(running_machine &machine, config_type cfg_typ WindowQtConfig* config = xmlConfigurations[i]; // Create an xml node - xml_data_node *debugger_node; - debugger_node = xml_add_child(parentnode, "window", nullptr); + xml_data_node *const debugger_node = parentnode->add_child("window", nullptr); if (debugger_node == nullptr) continue; // Insert the appropriate information - config->addToXmlDataNode(debugger_node); + config->addToXmlDataNode(*debugger_node); } } diff --git a/src/osd/modules/debugger/qt/breakpointswindow.cpp b/src/osd/modules/debugger/qt/breakpointswindow.cpp index 3875d594391..a5b06ec4caf 100644 --- a/src/osd/modules/debugger/qt/breakpointswindow.cpp +++ b/src/osd/modules/debugger/qt/breakpointswindow.cpp @@ -122,15 +122,15 @@ void BreakpointsWindowQtConfig::applyToQWidget(QWidget* widget) } -void BreakpointsWindowQtConfig::addToXmlDataNode(xml_data_node* node) const +void BreakpointsWindowQtConfig::addToXmlDataNode(xml_data_node &node) const { WindowQtConfig::addToXmlDataNode(node); - xml_set_attribute_int(node, "bwtype", m_bwType); + node.set_attribute_int("bwtype", m_bwType); } -void BreakpointsWindowQtConfig::recoverFromXmlNode(xml_data_node* node) +void BreakpointsWindowQtConfig::recoverFromXmlNode(xml_data_node const &node) { WindowQtConfig::recoverFromXmlNode(node); - m_bwType = xml_get_attribute_int(node, "bwtype", m_bwType); + 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 a45781ea5ce..52d61e95f5b 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* node); + void addToXmlDataNode(xml_data_node &node) const; + void recoverFromXmlNode(xml_data_node const &node); }; diff --git a/src/osd/modules/debugger/qt/dasmwindow.cpp b/src/osd/modules/debugger/qt/dasmwindow.cpp index 292215a469d..c317c41956f 100644 --- a/src/osd/modules/debugger/qt/dasmwindow.cpp +++ b/src/osd/modules/debugger/qt/dasmwindow.cpp @@ -302,16 +302,16 @@ void DasmWindowQtConfig::applyToQWidget(QWidget* widget) rightBarGroup->actions()[m_rightBar]->trigger(); } -void DasmWindowQtConfig::addToXmlDataNode(xml_data_node* node) const +void DasmWindowQtConfig::addToXmlDataNode(xml_data_node &node) const { WindowQtConfig::addToXmlDataNode(node); - xml_set_attribute_int(node, "cpu", m_cpu); - xml_set_attribute_int(node, "rightbar", m_rightBar); + node.set_attribute_int("cpu", m_cpu); + node.set_attribute_int("rightbar", m_rightBar); } -void DasmWindowQtConfig::recoverFromXmlNode(xml_data_node* node) +void DasmWindowQtConfig::recoverFromXmlNode(xml_data_node const &node) { WindowQtConfig::recoverFromXmlNode(node); - m_cpu = xml_get_attribute_int(node, "cpu", m_cpu); - m_rightBar = xml_get_attribute_int(node, "rightbar", m_rightBar); + m_cpu = node.get_attribute_int("cpu", m_cpu); + m_rightBar = node.get_attribute_int("rightbar", m_rightBar); } diff --git a/src/osd/modules/debugger/qt/dasmwindow.h b/src/osd/modules/debugger/qt/dasmwindow.h index 021c72fd2fd..9a8bf849ab2 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* node); + void addToXmlDataNode(xml_data_node &node) const; + void recoverFromXmlNode(xml_data_node const &node); }; diff --git a/src/osd/modules/debugger/qt/deviceinformationwindow.cpp b/src/osd/modules/debugger/qt/deviceinformationwindow.cpp index acdddc13fbb..aa71d02b630 100644 --- a/src/osd/modules/debugger/qt/deviceinformationwindow.cpp +++ b/src/osd/modules/debugger/qt/deviceinformationwindow.cpp @@ -122,15 +122,15 @@ void DeviceInformationWindowQtConfig::applyToQWidget(QWidget* widget) } -void DeviceInformationWindowQtConfig::addToXmlDataNode(xml_data_node* node) const +void DeviceInformationWindowQtConfig::addToXmlDataNode(xml_data_node &node) const { WindowQtConfig::addToXmlDataNode(node); - xml_set_attribute(node, "device-tag", m_device_tag.c_str()); + node.set_attribute("device-tag", m_device_tag.c_str()); } -void DeviceInformationWindowQtConfig::recoverFromXmlNode(xml_data_node* node) +void DeviceInformationWindowQtConfig::recoverFromXmlNode(xml_data_node const &node) { WindowQtConfig::recoverFromXmlNode(node); - m_device_tag = xml_get_attribute_string(node, "device-tag", ":"); + 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 c7a4c05204d..05335b6f631 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* node); + void addToXmlDataNode(xml_data_node &node) const; + void recoverFromXmlNode(xml_data_node const &node); }; diff --git a/src/osd/modules/debugger/qt/deviceswindow.cpp b/src/osd/modules/debugger/qt/deviceswindow.cpp index 18845f15074..4c570253723 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(xml_data_node &node) const { WindowQtConfig::addToXmlDataNode(node); } -void DevicesWindowQtConfig::recoverFromXmlNode(xml_data_node* node) +void DevicesWindowQtConfig::recoverFromXmlNode(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 3064354fd2e..e2440d6cc34 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* node); + void addToXmlDataNode(xml_data_node &node) const; + void recoverFromXmlNode(xml_data_node const &node); }; diff --git a/src/osd/modules/debugger/qt/logwindow.cpp b/src/osd/modules/debugger/qt/logwindow.cpp index 704a029e5ac..8bd0d55568d 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(xml_data_node &node) const { WindowQtConfig::addToXmlDataNode(node); } -void LogWindowQtConfig::recoverFromXmlNode(xml_data_node* node) +void LogWindowQtConfig::recoverFromXmlNode(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 1c3b18d38bb..dd1ebb4f8ad 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* node); + void addToXmlDataNode(xml_data_node &node) const; + void recoverFromXmlNode(xml_data_node const &node); }; diff --git a/src/osd/modules/debugger/qt/mainwindow.cpp b/src/osd/modules/debugger/qt/mainwindow.cpp index c247bdaf5a5..81be708c927 100644 --- a/src/osd/modules/debugger/qt/mainwindow.cpp +++ b/src/osd/modules/debugger/qt/mainwindow.cpp @@ -526,20 +526,20 @@ void MainWindowQtConfig::applyToQWidget(QWidget* widget) } -void MainWindowQtConfig::addToXmlDataNode(xml_data_node* node) const +void MainWindowQtConfig::addToXmlDataNode(xml_data_node &node) const { WindowQtConfig::addToXmlDataNode(node); - xml_set_attribute_int(node, "rightbar", m_rightBar); - xml_set_attribute(node, "qtwindowstate", m_windowState.toPercentEncoding().data()); + node.set_attribute_int("rightbar", m_rightBar); + node.set_attribute("qtwindowstate", m_windowState.toPercentEncoding().data()); } -void MainWindowQtConfig::recoverFromXmlNode(xml_data_node* node) +void MainWindowQtConfig::recoverFromXmlNode(xml_data_node const &node) { WindowQtConfig::recoverFromXmlNode(node); - const char* state = xml_get_attribute_string(node, "qtwindowstate", ""); + const char* state = node.get_attribute_string("qtwindowstate", ""); m_windowState = QByteArray::fromPercentEncoding(state); - m_rightBar = xml_get_attribute_int(node, "rightbar", m_rightBar); + m_rightBar = node.get_attribute_int("rightbar", m_rightBar); } DasmDockWidget::~DasmDockWidget() diff --git a/src/osd/modules/debugger/qt/mainwindow.h b/src/osd/modules/debugger/qt/mainwindow.h index 2c8e7feee67..920ac438356 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* node); + void addToXmlDataNode(xml_data_node &node) const; + void recoverFromXmlNode(xml_data_node const &node); }; diff --git a/src/osd/modules/debugger/qt/memorywindow.cpp b/src/osd/modules/debugger/qt/memorywindow.cpp index abb34cdcd8e..a15ce819acb 100644 --- a/src/osd/modules/debugger/qt/memorywindow.cpp +++ b/src/osd/modules/debugger/qt/memorywindow.cpp @@ -430,21 +430,21 @@ void MemoryWindowQtConfig::applyToQWidget(QWidget* widget) } -void MemoryWindowQtConfig::addToXmlDataNode(xml_data_node* node) const +void MemoryWindowQtConfig::addToXmlDataNode(xml_data_node &node) const { WindowQtConfig::addToXmlDataNode(node); - xml_set_attribute_int(node, "memoryregion", m_memoryRegion); - xml_set_attribute_int(node, "reverse", m_reverse); - xml_set_attribute_int(node, "addressmode", m_addressMode); - xml_set_attribute_int(node, "dataformat", m_dataFormat); + node.set_attribute_int("memoryregion", m_memoryRegion); + node.set_attribute_int("reverse", m_reverse); + node.set_attribute_int("addressmode", m_addressMode); + node.set_attribute_int("dataformat", m_dataFormat); } -void MemoryWindowQtConfig::recoverFromXmlNode(xml_data_node* node) +void MemoryWindowQtConfig::recoverFromXmlNode(xml_data_node const &node) { WindowQtConfig::recoverFromXmlNode(node); - m_memoryRegion = xml_get_attribute_int(node, "memoryregion", m_memoryRegion); - m_reverse = xml_get_attribute_int(node, "reverse", m_reverse); - m_addressMode = xml_get_attribute_int(node, "addressmode", m_addressMode); - m_dataFormat = xml_get_attribute_int(node, "dataformat", m_dataFormat); + m_memoryRegion = node.get_attribute_int("memoryregion", m_memoryRegion); + m_reverse = node.get_attribute_int("reverse", m_reverse); + m_addressMode = node.get_attribute_int("addressmode", m_addressMode); + m_dataFormat = node.get_attribute_int("dataformat", m_dataFormat); } diff --git a/src/osd/modules/debugger/qt/memorywindow.h b/src/osd/modules/debugger/qt/memorywindow.h index 7663787e890..42f81ac1178 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* node); + void addToXmlDataNode(xml_data_node &node) const; + void recoverFromXmlNode(xml_data_node const &node); }; diff --git a/src/osd/modules/debugger/qt/windowqt.cpp b/src/osd/modules/debugger/qt/windowqt.cpp index b29633fbf82..09709adbbf7 100644 --- a/src/osd/modules/debugger/qt/windowqt.cpp +++ b/src/osd/modules/debugger/qt/windowqt.cpp @@ -257,21 +257,21 @@ void WindowQtConfig::applyToQWidget(QWidget* widget) } -void WindowQtConfig::addToXmlDataNode(xml_data_node* node) const +void WindowQtConfig::addToXmlDataNode(xml_data_node &node) const { - xml_set_attribute_int(node, "type", m_type); - xml_set_attribute_int(node, "position_x", m_position.x()); - xml_set_attribute_int(node, "position_y", m_position.y()); - xml_set_attribute_int(node, "size_x", m_size.x()); - xml_set_attribute_int(node, "size_y", m_size.y()); + node.set_attribute_int("type", m_type); + node.set_attribute_int("position_x", m_position.x()); + node.set_attribute_int("position_y", m_position.y()); + node.set_attribute_int("size_x", m_size.x()); + node.set_attribute_int("size_y", m_size.y()); } -void WindowQtConfig::recoverFromXmlNode(xml_data_node* node) +void WindowQtConfig::recoverFromXmlNode(xml_data_node const &node) { - m_size.setX(xml_get_attribute_int(node, "size_x", m_size.x())); - m_size.setY(xml_get_attribute_int(node, "size_y", m_size.y())); - m_position.setX(xml_get_attribute_int(node, "position_x", m_position.x())); - m_position.setY(xml_get_attribute_int(node, "position_y", m_position.y())); - m_type = (WindowQtConfig::WindowType)xml_get_attribute_int(node, "type", m_type); + m_size.setX(node.get_attribute_int("size_x", m_size.x())); + m_size.setY(node.get_attribute_int("size_y", m_size.y())); + m_position.setX(node.get_attribute_int("position_x", m_position.x())); + m_position.setY(node.get_attribute_int("position_y", m_position.y())); + m_type = (WindowQtConfig::WindowType)node.get_attribute_int("type", m_type); } diff --git a/src/osd/modules/debugger/qt/windowqt.h b/src/osd/modules/debugger/qt/windowqt.h index 881d5716db1..6f9701f0196 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* node); + virtual void addToXmlDataNode(xml_data_node &node) const; + virtual void recoverFromXmlNode(xml_data_node const &node); }; |