mirror of
https://github.com/holub/mame
synced 2025-10-07 09:25:34 +03:00
patch up Qt debugger for new xmlfile API (nw)
This commit is contained in:
parent
28d1c7004d
commit
54444fecff
@ -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);
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -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);
|
||||
}
|
||||
|
@ -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);
|
||||
};
|
||||
|
||||
|
||||
|
@ -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);
|
||||
}
|
||||
|
@ -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);
|
||||
};
|
||||
|
||||
|
||||
|
@ -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", ":");
|
||||
}
|
||||
|
@ -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);
|
||||
};
|
||||
|
||||
|
||||
|
@ -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);
|
||||
}
|
||||
|
@ -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);
|
||||
};
|
||||
|
||||
|
||||
|
@ -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);
|
||||
}
|
||||
|
@ -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);
|
||||
};
|
||||
|
||||
|
||||
|
@ -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()
|
||||
|
@ -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);
|
||||
};
|
||||
|
||||
|
||||
|
@ -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);
|
||||
}
|
||||
|
@ -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);
|
||||
};
|
||||
|
||||
|
||||
|
@ -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);
|
||||
}
|
||||
|
@ -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);
|
||||
};
|
||||
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user