diff options
Diffstat (limited to 'src/plugins/debugger/memoryview.cpp')
| -rw-r--r-- | src/plugins/debugger/memoryview.cpp | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/src/plugins/debugger/memoryview.cpp b/src/plugins/debugger/memoryview.cpp index a451b7e243..31d2ac95ae 100644 --- a/src/plugins/debugger/memoryview.cpp +++ b/src/plugins/debugger/memoryview.cpp @@ -134,7 +134,7 @@ void MemoryView::setMarkup(const QList<MemoryMarkup> &m) */ RegisterMemoryView::RegisterMemoryView(QWidget *binEditor, quint64 addr, - const QByteArray ®Name, + const QString ®Name, RegisterHandler *handler, QWidget *parent) : MemoryView(binEditor, parent), m_registerName(regName), m_registerAddress(addr) @@ -144,16 +144,15 @@ RegisterMemoryView::RegisterMemoryView(QWidget *binEditor, quint64 addr, updateContents(); } -void RegisterMemoryView::onRegisterChanged(const QByteArray &name, quint64 value) +void RegisterMemoryView::onRegisterChanged(const QString &name, quint64 value) { if (name == m_registerName) setRegisterAddress(value); } -QString RegisterMemoryView::title(const QByteArray ®isterName, quint64 a) +QString RegisterMemoryView::title(const QString ®isterName, quint64 a) { - return tr("Memory at Register \"%1\" (0x%2)") - .arg(QString::fromUtf8(registerName)).arg(a, 0, 16); + return tr("Memory at Register \"%1\" (0x%2)").arg(registerName).arg(a, 0, 16); } void RegisterMemoryView::setRegisterAddress(quint64 v) @@ -169,12 +168,9 @@ void RegisterMemoryView::setRegisterAddress(quint64 v) setMarkup(registerMarkup(v, m_registerName)); } -QList<MemoryMarkup> RegisterMemoryView::registerMarkup(quint64 a, const QByteArray ®Name) +QList<MemoryMarkup> RegisterMemoryView::registerMarkup(quint64 a, const QString ®Name) { - QList<MemoryMarkup> result; - result.push_back(MemoryMarkup(a, 1, QColor(Qt::blue).lighter(), - tr("Register \"%1\"").arg(QString::fromUtf8(regName)))); - return result; + return { MemoryMarkup(a, 1, QColor(Qt::blue).lighter(), tr("Register \"%1\"").arg(regName)) }; } } // namespace Internal |