summaryrefslogtreecommitdiffstatshomepage
path: root/src
diff options
context:
space:
mode:
author Miodrag Milanovic <mmicko@gmail.com>2016-01-20 21:34:41 +0100
committer Miodrag Milanovic <mmicko@gmail.com>2016-01-20 21:34:41 +0100
commit69b44cd860f08dc613474a41ecb16b03bc7a81da (patch)
tree57ee8b5088b55f2f59e91a8d76cf9dbc250601c8 /src
parent5f313860207c707266a28a7223bd73c469fa5573 (diff)
Revert "fixed qt build (nw)"
This reverts commit a23a0abc768c2a56bc50195ca0379bfe6d3e95cb.
Diffstat (limited to 'src')
-rw-r--r--src/osd/modules/debugger/qt/deviceinformationwindow.cpp4
-rw-r--r--src/osd/modules/debugger/qt/deviceswindow.cpp4
-rw-r--r--src/osd/modules/debugger/qt/mainwindow.cpp6
3 files changed, 7 insertions, 7 deletions
diff --git a/src/osd/modules/debugger/qt/deviceinformationwindow.cpp b/src/osd/modules/debugger/qt/deviceinformationwindow.cpp
index 42e0304c1d5..3e610486b23 100644
--- a/src/osd/modules/debugger/qt/deviceinformationwindow.cpp
+++ b/src/osd/modules/debugger/qt/deviceinformationwindow.cpp
@@ -46,9 +46,9 @@ void DeviceInformationWindow::fill_device_information()
gl1->addWidget(new QLabel(QString("Tag"), primaryFrame), 0, 0);
gl1->addWidget(new QLabel(QString(m_device->tag().c_str()), primaryFrame), 0, 1);
gl1->addWidget(new QLabel(QString("Name"), primaryFrame), 1, 0);
- gl1->addWidget(new QLabel(QString(m_device->name().c_str()), primaryFrame), 1, 1);
+ gl1->addWidget(new QLabel(QString(m_device->name()), primaryFrame), 1, 1);
gl1->addWidget(new QLabel(QString("Shortname"), primaryFrame), 2, 0);
- gl1->addWidget(new QLabel(QString(m_device->shortname().c_str()), primaryFrame), 2, 1);
+ gl1->addWidget(new QLabel(QString(m_device->shortname()), primaryFrame), 2, 1);
int cpos = 3;
device_interface *intf = m_device->first_interface();
diff --git a/src/osd/modules/debugger/qt/deviceswindow.cpp b/src/osd/modules/debugger/qt/deviceswindow.cpp
index 7484e03cb1a..b9c8f276f69 100644
--- a/src/osd/modules/debugger/qt/deviceswindow.cpp
+++ b/src/osd/modules/debugger/qt/deviceswindow.cpp
@@ -19,8 +19,8 @@ QVariant DevicesWindowModel::data(const QModelIndex &index, int role) const
device_t *dev = static_cast<device_t *>(index.internalPointer());
switch(index.column()) {
- case 0: return dev == &m_machine->root_device() ? QString("<root>") : QString(dev->basetag().c_str());
- case 1: return QString(dev->name().c_str());
+ case 0: return dev == &m_machine->root_device() ? QString("<root>") : QString(dev->basetag());
+ case 1: return QString(dev->name());
}
return QVariant();
diff --git a/src/osd/modules/debugger/qt/mainwindow.cpp b/src/osd/modules/debugger/qt/mainwindow.cpp
index 11cdf1c33cc..b3ff2bf7861 100644
--- a/src/osd/modules/debugger/qt/mainwindow.cpp
+++ b/src/osd/modules/debugger/qt/mainwindow.cpp
@@ -145,7 +145,7 @@ void MainWindow::setProcessor(device_t* processor)
// Window title
std::string title;
- strprintf(title,"Debug: %s - %s '%s'", m_machine->system().name, processor->name().c_str(), processor->tag().c_str());
+ strprintf(title,"Debug: %s - %s '%s'", m_machine->system().name, processor->name(), processor->tag().c_str());
setWindowTitle(title.c_str());
}
@@ -476,10 +476,10 @@ void MainWindow::createImagesMenu()
for (device_image_interface *img = iter.first(); img != NULL; img = iter.next())
{
std::string menuName;
- strprintf(menuName,"%s : %s", img->device().name().c_str(), img->exists() ? img->filename() : "[empty slot]");
+ strprintf(menuName,"%s : %s", img->device().name(), img->exists() ? img->filename() : "[empty slot]");
QMenu* interfaceMenu = imagesMenu->addMenu(menuName.c_str());
- interfaceMenu->setObjectName(img->device().name().c_str());
+ interfaceMenu->setObjectName(img->device().name());
QAction* mountAct = new QAction("Mount...", interfaceMenu);
QAction* unmountAct = new QAction("Unmount", interfaceMenu);