From 726b907cc356995b7a9c28ee8dc8b2f2314e9103 Mon Sep 17 00:00:00 2001
From: hjk <hjk@theqtcompany.com>
Date: Tue, 7 Jun 2016 17:04:53 +0200
Subject: Debugger: Remove debuggerstringutils.h

With QT_RESTRICTED_CAST_FROM_ASCII making GdbMi etc operate on
QString is feasible again. Take this as opportunity to move
debugger encoding handling closer to a 'conversion on input and
output if needed, storage in QString only' scheme.

Change-Id: I2f10c9fa8a6c62c44f4e6682efe3769e9fba30f7
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
---
 src/plugins/debugger/memoryview.cpp | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

(limited to 'src/plugins/debugger/memoryview.cpp')

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 &regName,
+                                       const QString &regName,
                                        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 &registerName, quint64 a)
+QString RegisterMemoryView::title(const QString &registerName, 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 &regName)
+QList<MemoryMarkup> RegisterMemoryView::registerMarkup(quint64 a, const QString &regName)
 {
-    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
-- 
cgit v1.2.1