From dba973c9331a5ba6c4d534d2a4876e683a6db39e Mon Sep 17 00:00:00 2001 From: Orgad Shaneh Date: Mon, 26 Nov 2012 15:02:17 +0200 Subject: Valgrind: Compile with QT_NO_CAST_FROM_ASCII Change-Id: I935579630c4d2f3a7bce69756da9eceb5e2bc005 Reviewed-by: hjk --- src/plugins/valgrind/memcheck/memcheckrunner.cpp | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'src/plugins/valgrind/memcheck/memcheckrunner.cpp') diff --git a/src/plugins/valgrind/memcheck/memcheckrunner.cpp b/src/plugins/valgrind/memcheck/memcheckrunner.cpp index 48393113c9..16a06590db 100644 --- a/src/plugins/valgrind/memcheck/memcheckrunner.cpp +++ b/src/plugins/valgrind/memcheck/memcheckrunner.cpp @@ -83,7 +83,7 @@ MemcheckRunner::~MemcheckRunner() QString MemcheckRunner::tool() const { - return QString("memcheck"); + return QLatin1String("memcheck"); } void MemcheckRunner::setParser(XmlProtocol::ThreadedParser *parser) @@ -110,10 +110,10 @@ bool MemcheckRunner::start() connect(&d->logServer, SIGNAL(newConnection()), SLOT(logSocketConnected())); QStringList memcheckArguments; - memcheckArguments << QString("--xml=yes") - << QString("--xml-socket=127.0.0.1:%1").arg(QString::number(xmlPortNumber)) - << QString("--child-silent-after-fork=yes") - << QString("--log-socket=127.0.0.1:%1").arg(QString::number(logPortNumber)) + memcheckArguments << QLatin1String("--xml=yes") + << QString::fromLatin1("--xml-socket=127.0.0.1:%1").arg(xmlPortNumber) + << QLatin1String("--child-silent-after-fork=yes") + << QString::fromLatin1("--log-socket=127.0.0.1:%1").arg(logPortNumber) << valgrindArguments(); setValgrindArguments(memcheckArguments); } @@ -139,10 +139,10 @@ bool MemcheckRunner::start() connect(&d->logServer, SIGNAL(newConnection()), SLOT(logSocketConnected())); QStringList memcheckArguments; - memcheckArguments << QString("--xml=yes") - << QString("--xml-socket=%1:%2").arg(ip, QString::number(xmlPortNumber)) - << QString("--child-silent-after-fork=yes") - << QString("--log-socket=%1:%2").arg(ip, QString::number(logPortNumber)); + memcheckArguments << QLatin1String("--xml=yes") + << QString::fromLatin1("--xml-socket=%1:%2").arg(ip).arg(xmlPortNumber) + << QLatin1String("--child-silent-after-fork=yes") + << QString::fromLatin1("--log-socket=%1:%2").arg(ip).arg(logPortNumber); setValgrindArguments(memcheckArguments); } -- cgit v1.2.1