Debugger: Compile with QT_NO_CAST_FROM_ASCII.

(except gdbmi.cpp, name_demangler.cpp). Remove some unneeded
conversions, change some maps to take QByteArray keys.

Change-Id: I010f1251998a441fe5c8c87901b1e0c277c0391c
Reviewed-by: hjk <qthjk@ovi.com>

1 files changed, 4 insertions, 4 deletions

diff --git a/src/plugins/debugger/watchutils.cpp b/src/plugins/debugger/watchutils.cpp
index 6d6aa39ddc..7b0291e5db 100644
--- a/src/plugins/debugger/watchutils.cpp
+++ b/src/plugins/debugger/watchutils.cpp
@@ -510,10 +510,10 @@ QString quoteUnprintableLatin1(const QByteArray &ba)
     for (int i = 0, n = ba.size(); i != n; ++i) {
         const unsigned char c = ba.at(i);
         if (isprint(c)) {
-            res += c;
+            res += QLatin1Char(c);
         } else {
             qsnprintf(buf, sizeof(buf) - 1, "\\%x", int(c));
-            res += buf;
+            res += QLatin1String(buf);
         }
     }
     return res;
@@ -669,7 +669,7 @@ QString cppExpressionAt(TextEditor::ITextEditor *editor, int pos,
 
     const QPlainTextEdit *plaintext = qobject_cast<QPlainTextEdit*>(editor->widget());
     if (!plaintext)
-        return QByteArray();
+        return QString();
 
     QString expr = plaintext->textCursor().selectedText();
     CppModelManagerInterface *modelManager = CppModelManagerInterface::instance();
@@ -698,7 +698,7 @@ QString cppExpressionAt(TextEditor::ITextEditor *editor, int pos,
                 *function = AbstractEditorSupport::functionAt(modelManager,
                     file->fileName(), *line, *column);
 
-    return expr.toUtf8();
+    return expr;
 }
 
 QString cppFunctionAt(const QString &fileName, int line)