Valgrind: Compile with QT_NO_CAST_FROM_ASCII

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

6 files changed, 23 insertions, 23 deletions

diff --git a/src/plugins/valgrind/callgrind/callgrindcontroller.cpp b/src/plugins/valgrind/callgrind/callgrindcontroller.cpp
index 1d2f9b0e46..b9e1b59c82 100644
--- a/src/plugins/valgrind/callgrind/callgrindcontroller.cpp
+++ b/src/plugins/valgrind/callgrind/callgrindcontroller.cpp
@@ -79,15 +79,15 @@ QString toOptionString(CallgrindController::Option option)
 
     switch (option) {
         case CallgrindController::Dump:
-            return "--dump";
+            return QLatin1String("--dump");
         case CallgrindController::ResetEventCounters:
-            return "--zero";
+            return QLatin1String("--zero");
         case CallgrindController::Pause:
-            return "--instr=off";
+            return QLatin1String("--instr=off");
         case CallgrindController::UnPause:
-            return "--instr=on";
+            return QLatin1String("--instr=on");
         default:
-            return ""; // never reached
+            return QString(); // never reached
     }
 }
 
@@ -144,7 +144,7 @@ void CallgrindController::processError(QProcess::ProcessError)
 {
     QTC_ASSERT(m_process, return);
     const QString error = m_process->errorString();
-    emit statusMessage(QString("An error occurred while trying to run %1: %2").arg(CALLGRIND_CONTROL_BINARY).arg(error));
+    emit statusMessage(tr("An error occurred while trying to run %1: %2").arg(CALLGRIND_CONTROL_BINARY).arg(error));
 
     m_process->deleteLater();
     m_process = 0;
@@ -197,7 +197,7 @@ void CallgrindController::getLocalDataFile()
     QTC_ASSERT(m_valgrindProc, return);
 
     // we look for callgrind.out.PID, but there may be updated ones called ~.PID.NUM
-    QString baseFileName = QString("callgrind.out.%1").
+    QString baseFileName = QString::fromLatin1("callgrind.out.%1").
             arg(m_valgrindProc->pid());
     const QString workingDir = m_valgrindProc->workingDirectory();
     // first, set the to-be-parsed file to callgrind.out.PID
@@ -208,13 +208,13 @@ void CallgrindController::getLocalDataFile()
         emit statusMessage(tr("Downloading remote profile data..."));
         m_ssh = remote->connection();
         // if there are files like callgrind.out.PID.NUM, set it to the most recent one of those
-        QString cmd = QString("ls -t %1* | head -n 1").arg(fileName);
+        QString cmd = QString::fromLatin1("ls -t %1* | head -n 1").arg(fileName);
         m_findRemoteFile = m_ssh->createRemoteProcess(cmd.toUtf8());
         connect(m_findRemoteFile.data(), SIGNAL(readyReadStandardOutput()), this,
             SLOT(foundRemoteFile()));
         m_findRemoteFile->start();
     } else {
-        QDir dir(workingDir, QString("%1.*").arg(baseFileName), QDir::Time);
+        QDir dir(workingDir, QString::fromLatin1("%1.*").arg(baseFileName), QDir::Time);
         QStringList outputFiles = dir.entryList();
         // if there are files like callgrind.out.PID.NUM, set it to the most recent one of those
         if (!outputFiles.isEmpty())
@@ -238,13 +238,13 @@ void CallgrindController::foundRemoteFile()
 void CallgrindController::sftpInitialized()
 {
     cleanupTempFile();
-    QTemporaryFile dataFile(QDir::tempPath() + QDir::separator() + "callgrind.out.");
+    QTemporaryFile dataFile(QDir::tempPath() + QDir::separator() + QLatin1String("callgrind.out."));
     QTC_ASSERT(dataFile.open(), return);
     m_tempDataFile = dataFile.fileName();
     dataFile.setAutoRemove(false);
     dataFile.close();
 
-    m_downloadJob = m_sftp->downloadFile(m_remoteFile, m_tempDataFile, QSsh::SftpOverwriteExisting);
+    m_downloadJob = m_sftp->downloadFile(QString::fromLocal8Bit(m_remoteFile), m_tempDataFile, QSsh::SftpOverwriteExisting);
 }
 
 void CallgrindController::sftpJobFinished(QSsh::SftpJobId job, const QString &error)
diff --git a/src/plugins/valgrind/callgrind/callgrindcycledetection.cpp b/src/plugins/valgrind/callgrind/callgrindcycledetection.cpp
index ce88d5e17c..939c701a39 100644
--- a/src/plugins/valgrind/callgrind/callgrindcycledetection.cpp
+++ b/src/plugins/valgrind/callgrind/callgrindcycledetection.cpp
@@ -95,7 +95,7 @@ void CycleDetection::tarjan(Node *node)
             cycle->setFile(node->function->fileId());
             m_cycle++;
             qint64 id = -1;
-            m_data->addCompressedFunction(QString("cycle %1").arg(m_cycle), id);
+            m_data->addCompressedFunction(QString::fromLatin1("cycle %1").arg(m_cycle), id);
             cycle->setName(id);
             cycle->setObject(node->function->objectId());
             cycle->setFunctions(functions);
diff --git a/src/plugins/valgrind/callgrind/callgrinddatamodel.cpp b/src/plugins/valgrind/callgrind/callgrinddatamodel.cpp
index 20df7fda22..b9a0979ee8 100644
--- a/src/plugins/valgrind/callgrind/callgrinddatamodel.cpp
+++ b/src/plugins/valgrind/callgrind/callgrinddatamodel.cpp
@@ -212,7 +212,7 @@ QModelIndex DataModel::indexForObject(const Function *function) const
 static QString noWrap(const QString &str)
 {
     QString escapedStr = str;
-    return escapedStr.replace(QLatin1Char('-'), "‑");
+    return escapedStr.replace(QLatin1Char('-'), QLatin1String("‑"));
 }
 
 static QString shortenTemplate(QString str)
diff --git a/src/plugins/valgrind/callgrind/callgrindfunction.cpp b/src/plugins/valgrind/callgrind/callgrindfunction.cpp
index 3164ec5cf2..e91610d71a 100644
--- a/src/plugins/valgrind/callgrind/callgrindfunction.cpp
+++ b/src/plugins/valgrind/callgrind/callgrindfunction.cpp
@@ -209,7 +209,7 @@ QString Function::location() const
     QString o = object();
     if (o.isEmpty())
         return QString();
-    if (f.isEmpty() || f == "???")
+    if (f.isEmpty() || f == QLatin1String("???"))
         return o;
     if (pos.isEmpty())
         return QCoreApplication::translate("Valgrind::Callgrind::Function", "%1 in %2").arg(f, o);
diff --git a/src/plugins/valgrind/callgrind/callgrindparsedata.cpp b/src/plugins/valgrind/callgrind/callgrindparsedata.cpp
index b7cef3ac07..c8db1fe1f7 100644
--- a/src/plugins/valgrind/callgrind/callgrindparsedata.cpp
+++ b/src/plugins/valgrind/callgrind/callgrindparsedata.cpp
@@ -182,13 +182,13 @@ QString ParseData::prettyStringForEvent(const QString &event)
     QString type;
     if (event.contains(QLatin1Char('L')))
         type = ParseData::Private::tr("Last-level"); // first, "L" overwrites the others
-    else if (event.at(0) == 'I')
+    else if (event.at(0) == QLatin1Char('I'))
         type = ParseData::Private::tr("Instruction");
-    else if (event.at(0) == 'D')
+    else if (event.at(0) == QLatin1Char('D'))
         type = ParseData::Private::tr("Cache");
-    else if (event.leftRef(2) == "Bc")
+    else if (event.leftRef(2) == QLatin1String("Bc"))
         type = ParseData::Private::tr("Conditional branches");
-    else if (event.leftRef(2) == "Bi")
+    else if (event.leftRef(2) == QLatin1String("Bi"))
         type = ParseData::Private::tr("Indirect branches");
 
     QStringList prettyString;
@@ -198,7 +198,7 @@ QString ParseData::prettyStringForEvent(const QString &event)
         prettyString << ParseData::Private::tr("level %1").arg(event.at(1));
     prettyString << (isRead ? ParseData::Private::tr("read") : ParseData::Private::tr("write"));
 
-    if (event.at(0) == 'B')
+    if (event.at(0) == QLatin1Char('B'))
         prettyString << (isMiss ? ParseData::Private::tr("mispredicted") : ParseData::Private::tr("executed"));
     else
         prettyString << (isMiss ? ParseData::Private::tr("miss") : ParseData::Private::tr("access"));
@@ -221,9 +221,9 @@ void ParseData::setEvents(const QStringList &events)
 
 QString ParseData::prettyStringForPosition(const QString &position)
 {
-    if (position == "line")
+    if (position == QLatin1String("line"))
         return ParseData::Private::tr("Line:"); // as in: "line number"
-    else if (position == "instr")
+    else if (position == QLatin1String("instr"))
         return ParseData::Private::tr("Instruction"); // as in: "instruction address"
     return ParseData::Private::tr("Position:"); // never reached, in theory
 }
@@ -243,7 +243,7 @@ void ParseData::setPositions(const QStringList &positions)
     d->m_positions = positions;
     d->m_lineNumberPositionIndex = -1;
     for (int i = 0; i < positions.size(); ++i) {
-        if (positions.at(i) == "line") {
+        if (positions.at(i) == QLatin1String("line")) {
             d->m_lineNumberPositionIndex = i;
             break;
         }
diff --git a/src/plugins/valgrind/callgrind/callgrindrunner.cpp b/src/plugins/valgrind/callgrind/callgrindrunner.cpp
index 6b9c59ca25..642cd96565 100644
--- a/src/plugins/valgrind/callgrind/callgrindrunner.cpp
+++ b/src/plugins/valgrind/callgrind/callgrindrunner.cpp
@@ -54,7 +54,7 @@ CallgrindRunner::CallgrindRunner(QObject *parent)
 
 QString CallgrindRunner::tool() const
 {
-    return QString("callgrind");
+    return QLatin1String("callgrind");
 }
 
 Parser *CallgrindRunner::parser() const