Remove compiler warnings

Also fix a static global object and remove some QString conversion
errors in the process.

Change-Id: I8612ab2fbe4e083051f217682f2b24bc0af3b88d
Reviewed-by: Andrew Christian <andrew.christian@nokia.com>

10 files changed, 61 insertions, 61 deletions

diff --git a/src/core/gdbrewritedelegate.cpp b/src/core/gdbrewritedelegate.cpp
index 4f23120..f1a5eba 100644
--- a/src/core/gdbrewritedelegate.cpp
+++ b/src/core/gdbrewritedelegate.cpp
@@ -68,8 +68,8 @@ void GdbRewriteDelegate::rewrite(ProcessInfo& info)
 {
     QStringList args = info.arguments();
     args.prepend(info.program());
-    args.prepend("--");
-    info.setProgram("gdb");
+    args.prepend(QStringLiteral("--"));
+    info.setProgram(QStringLiteral("gdb"));
     info.setArguments(args);
 }
 
diff --git a/src/core/launcherclient.cpp b/src/core/launcherclient.cpp
index ffbcf88..1f30dd9 100644
--- a/src/core/launcherclient.cpp
+++ b/src/core/launcherclient.cpp
@@ -54,6 +54,9 @@ QT_BEGIN_NAMESPACE_PROCESSMANAGER
   Create a new LauncherClient with ProcessBackendManager \a manager
  */
 
+static inline QString kEvent() { return QStringLiteral("event"); }
+static inline QString kId() { return QStringLiteral("id"); }
+
 LauncherClient::LauncherClient(ProcessBackendManager *manager)
     : QObject(manager)
     , m_manager(manager)
@@ -67,10 +70,10 @@ LauncherClient::LauncherClient(ProcessBackendManager *manager)
 void LauncherClient::receive(const QJsonObject& message)
 {
     // qDebug() << Q_FUNC_INFO << message;
-    QString cmd = message.value("command").toString();
-    int id = message.value("id").toDouble();
+    QString cmd = message.value(QStringLiteral("command")).toString();
+    int id = message.value(QStringLiteral("id")).toDouble();
     if ( cmd == QLatin1String("start") ) {
-        ProcessInfo info(message.value("info").toObject().toVariantMap());
+        ProcessInfo info(message.value(QStringLiteral("info")).toObject().toVariantMap());
         ProcessBackend *backend = m_manager->create(info, this);
         if (backend) {
             connect(backend, SIGNAL(started()), SLOT(started()));
@@ -91,15 +94,15 @@ void LauncherClient::receive(const QJsonObject& message)
     else if ( cmd == QLatin1String("stop") ) {
         ProcessBackend *backend = m_idToBackend.value(id);
         if (backend) {
-            int timeout = message.value("timeout").toDouble();
+            int timeout = message.value(QStringLiteral("timeout")).toDouble();
             backend->stop(timeout);
         }
     }
     else if ( cmd == QLatin1String("set") ) {
         ProcessBackend *backend = m_idToBackend.value(id);
         if (backend) {
-            QString key = message.value("key").toString();
-            int value   = message.value("value").toDouble();
+            QString key = message.value(QStringLiteral("key")).toString();
+            int value   = message.value(QStringLiteral("value")).toDouble();
             if (key == QLatin1String("priority"))
                 backend->setDesiredPriority(value);
             else if (key == QLatin1String("oomAdjustment"))
@@ -107,16 +110,13 @@ void LauncherClient::receive(const QJsonObject& message)
         }
     }
     else if ( cmd == QLatin1String("write") ) {
-        QByteArray data = message.value("data").toString().toLocal8Bit();
+        QByteArray data = message.value(QStringLiteral("data")).toString().toLocal8Bit();
         ProcessBackend *backend = m_idToBackend.value(id);
         if (backend)
             backend->write(data);
     }
 }
 
-static const QLatin1String kEvent("event");
-static const QLatin1String kId("id");
-
 /*!
   \internal
  */
@@ -125,9 +125,9 @@ void LauncherClient::started()
 {
     ProcessBackend *backend = qobject_cast<ProcessBackend *>(sender());
     QJsonObject msg;
-    msg.insert(kEvent, QLatin1String("started"));
-    msg.insert(kId, m_backendToId.value(backend));
-    msg.insert("pid", (double) backend->pid());
+    msg.insert(kEvent(), QLatin1String("started"));
+    msg.insert(kId(), m_backendToId.value(backend));
+    msg.insert(QStringLiteral("pid"), (double) backend->pid());
     emit send(msg);
 }
 
@@ -139,10 +139,10 @@ void LauncherClient::finished(int exitCode, QProcess::ExitStatus exitStatus)
 {
     ProcessBackend *backend = qobject_cast<ProcessBackend *>(sender());
     QJsonObject msg;
-    msg.insert(kEvent, QLatin1String("finished"));
-    msg.insert(kId, m_backendToId.value(backend));
-    msg.insert("exitCode", exitCode);
-    msg.insert("exitStatus", exitStatus);
+    msg.insert(kEvent(), QLatin1String("finished"));
+    msg.insert(kId(), m_backendToId.value(backend));
+    msg.insert(QStringLiteral("exitCode"), exitCode);
+    msg.insert(QStringLiteral("exitStatus"), exitStatus);
     emit send(msg);
 }
 
@@ -154,10 +154,10 @@ void LauncherClient::error(QProcess::ProcessError err)
 {
     ProcessBackend *backend = qobject_cast<ProcessBackend *>(sender());
     QJsonObject msg;
-    msg.insert(kEvent, QLatin1String("error"));
-    msg.insert(kId, m_backendToId.value(backend));
-    msg.insert("error", err);
-    msg.insert("errorString", backend->errorString());
+    msg.insert(kEvent(), QLatin1String("error"));
+    msg.insert(kId(), m_backendToId.value(backend));
+    msg.insert(QStringLiteral("error"), err);
+    msg.insert(QStringLiteral("errorString"), backend->errorString());
     emit send(msg);
 }
 
@@ -169,9 +169,9 @@ void LauncherClient::stateChanged(QProcess::ProcessState state)
 {
     ProcessBackend *backend = qobject_cast<ProcessBackend *>(sender());
     QJsonObject msg;
-    msg.insert(kEvent, QLatin1String("stateChanged"));
-    msg.insert(kId, m_backendToId.value(backend));
-    msg.insert("stateChanged", state);
+    msg.insert(kEvent(), QLatin1String("stateChanged"));
+    msg.insert(kId(), m_backendToId.value(backend));
+    msg.insert(QStringLiteral("stateChanged"), state);
     emit send(msg);
 }
 
@@ -183,8 +183,8 @@ void LauncherClient::standardOutput(const QByteArray& data)
 {
     ProcessBackend *backend = qobject_cast<ProcessBackend *>(sender());
     QJsonObject msg;
-    msg.insert(kEvent, QLatin1String("output"));
-    msg.insert(kId, m_backendToId.value(backend));
+    msg.insert(kEvent(), QLatin1String("output"));
+    msg.insert(kId(), m_backendToId.value(backend));
     msg.insert(QLatin1String("stdout"), QString::fromLocal8Bit(data.data(), data.size()));
     emit send(msg);
 }
@@ -197,8 +197,8 @@ void LauncherClient::standardError(const QByteArray& data)
 {
     ProcessBackend *backend = qobject_cast<ProcessBackend *>(sender());
     QJsonObject msg;
-    msg.insert(kEvent, QLatin1String("output"));
-    msg.insert(kId, m_backendToId.value(backend));
+    msg.insert(kEvent(), QLatin1String("output"));
+    msg.insert(kId(), m_backendToId.value(backend));
     msg.insert(QLatin1String("stderr"), QString::fromLocal8Bit(data.data(), data.size()));
     emit send(msg);
 }
diff --git a/src/core/pipelauncher.cpp b/src/core/pipelauncher.cpp
index d825822..57e80ac 100644
--- a/src/core/pipelauncher.cpp
+++ b/src/core/pipelauncher.cpp
@@ -97,7 +97,7 @@ void PipeLauncher::inReady(int fd)
         QByteArray msg = m_inbuf.left(message_size);
         m_inbuf = m_inbuf.mid(message_size);
         QJsonObject message = QJsonDocument::fromBinaryData(msg).object();
-        if (message.value("remote").toString() == QLatin1String("stop"))
+        if (message.value(QStringLiteral("remote")).toString() == QLatin1String("stop"))
             exit(0);
         m_client->receive(message);
     }
diff --git a/src/core/processbackend.cpp b/src/core/processbackend.cpp
index 301b5c5..5288e65 100644
--- a/src/core/processbackend.cpp
+++ b/src/core/processbackend.cpp
@@ -379,7 +379,7 @@ static void _writeByteArrayToFd(const QByteArray& data, const QByteArray& prefix
 void ProcessBackend::handleStandardOutput(const QByteArray &byteArray)
 {
     if (m_echo == EchoStdoutOnly || m_echo == EchoStdoutStderr) {
-        QByteArray prefix = QString("%1 [%2]: ").arg(m_name).arg(pid()).toLocal8Bit();
+        QByteArray prefix = QString::fromLatin1("%1 [%2]: ").arg(m_name).arg(pid()).toLocal8Bit();
         _writeByteArrayToFd( byteArray, prefix, stderr );
     }
     emit standardOutput(byteArray);
@@ -393,7 +393,7 @@ void ProcessBackend::handleStandardOutput(const QByteArray &byteArray)
 void ProcessBackend::handleStandardError(const QByteArray &byteArray)
 {
     if (m_echo == EchoStderrOnly || m_echo == EchoStdoutStderr) {
-        QByteArray prefix = QString("%1 [%2] ERR: ").arg(m_name).arg(pid()).toLocal8Bit();
+        QByteArray prefix = QString::fromLatin1("%1 [%2] ERR: ").arg(m_name).arg(pid()).toLocal8Bit();
         _writeByteArrayToFd( byteArray, prefix, stderr );
     }
     emit standardError(byteArray);
@@ -407,8 +407,8 @@ void ProcessBackend::handleStandardError(const QByteArray &byteArray)
 
 void ProcessBackend::createName()
 {
-    m_name = QString("%1-%2").arg(m_info.identifier().isEmpty()
-                                  ? QString("process")
+    m_name = QString::fromLatin1("%1-%2").arg(m_info.identifier().isEmpty()
+                                  ? QString::fromLatin1("process")
                                   : m_info.identifier()).arg(m_id);
 }
 
diff --git a/src/core/procutils.cpp b/src/core/procutils.cpp
index c3dafc6..a8ddd41 100644
--- a/src/core/procutils.cpp
+++ b/src/core/procutils.cpp
@@ -73,7 +73,7 @@ ExecutingProcessInfo::ExecutingProcessInfo(pid_t pid)
     : m_data(0)
 {
 #if defined(Q_OS_LINUX)
-    static QRegExp statFile("^(\\d+) \\(.*\\) [RSDZTW] (\\d+) (\\d+) (\\d+)(?: \\d+){11} (\\d+) (\\d+)");
+    static QRegExp statFile(QStringLiteral("^(\\d+) \\(.*\\) [RSDZTW] (\\d+) (\\d+) (\\d+)(?: \\d+){11} (\\d+) (\\d+)"));
     /*
        Index, name, format, description (from man 5 page for proc)
        0  pid %d        The process ID.
@@ -99,7 +99,7 @@ ExecutingProcessInfo::ExecutingProcessInfo(pid_t pid)
     QByteArray contents = file.readAll();
     file.close();
 
-    if (statFile.indexIn(contents) != 0) {
+    if (statFile.indexIn(QString::fromLocal8Bit(contents)) != 0) {
         qWarning("Did not match pid=%d", pid);
         return;
     }
@@ -264,11 +264,11 @@ QString ProcUtils::execNameForPid(qint64 pid)
 #if defined(Q_OS_LINUX)
     enum { BUFFERSIZE = 1024 };
     char buf[BUFFERSIZE];
-    QString fn = QLatin1String("/proc/") + QString::number(pid).toLatin1() + QLatin1String("/exe");
+    QString fn = QLatin1String("/proc/") + QString::number(pid) + QLatin1String("/exe");
     ssize_t len = readlink(fn.toLatin1(), buf, sizeof(buf) - 1);
     if (len != -1) {
         buf[len] = '\0';
-        return QString(buf);
+        return QString::fromLocal8Bit(buf);
     }
 #else
     Q_UNUSED(pid);
@@ -280,7 +280,7 @@ qint64 ProcUtils::ppidForPid(pid_t pid)
 {
     int ppid = 0;
 #if defined(Q_OS_LINUX)
-    QFile statFile(QLatin1String("/proc/") + QString::number(pid) + "/stat");
+    QFile statFile(QLatin1String("/proc/") + QString::number(pid) + QStringLiteral("/stat"));
     statFile.open(QIODevice::ReadOnly);
 
     QByteArray contents = statFile.readAll();
diff --git a/src/core/remoteprocessbackend.cpp b/src/core/remoteprocessbackend.cpp
index 4c5a447..5d80863 100644
--- a/src/core/remoteprocessbackend.cpp
+++ b/src/core/remoteprocessbackend.cpp
@@ -127,8 +127,8 @@ void RemoteProcessBackend::setDesiredPriority(qint32 priority)
         QJsonObject object;
         object.insert(kCommand, QLatin1String("set"));
         object.insert(kId, m_id);
-        object.insert("key", QLatin1String("priority"));
-        object.insert("value", priority);
+        object.insert(QStringLiteral("key"), QLatin1String("priority"));
+        object.insert(QStringLiteral("value"), priority);
         m_factory->send(object);
     }
 }
@@ -162,8 +162,8 @@ void RemoteProcessBackend::setDesiredOomAdjustment(qint32 oomAdjustment)
         QJsonObject object;
         object.insert(kCommand, QLatin1String("set"));
         object.insert(kId, m_id);
-        object.insert("key", QLatin1String("oomAdjustment"));
-        object.insert("value", oomAdjustment);
+        object.insert(QStringLiteral("key"), QLatin1String("oomAdjustment"));
+        object.insert(QStringLiteral("value"), oomAdjustment);
         m_factory->send(object);
     }
 }
@@ -248,30 +248,30 @@ QString RemoteProcessBackend::errorString() const
 
 void RemoteProcessBackend::receive(const QJsonObject& message)
 {
-    QString event = message.value("event").toString();
+    QString event = message.value(QStringLiteral("event")).toString();
     // qDebug() << Q_FUNC_INFO << message;
     if (event == QLatin1String("started")) {
-        m_pid = message.value("pid").toDouble();
+        m_pid = message.value(QStringLiteral("pid")).toDouble();
         emit started();
     }
     else if (event == QLatin1String("error")) {
-        m_errorString = message.value("errorString").toString();
-        emit error(static_cast<QProcess::ProcessError>(message.value("error").toDouble()));
+        m_errorString = message.value(QStringLiteral("errorString")).toString();
+        emit error(static_cast<QProcess::ProcessError>(message.value(QStringLiteral("error")).toDouble()));
     }
     else if (event == QLatin1String("finished")) {
-        emit finished(message.value("exitCode").toDouble(),
-                      static_cast<QProcess::ExitStatus>(message.value("exitStatus").toDouble()));
+        emit finished(message.value(QStringLiteral("exitCode")).toDouble(),
+                      static_cast<QProcess::ExitStatus>(message.value(QStringLiteral("exitStatus")).toDouble()));
     }
     else if (event == QLatin1String("stateChanged")) {
-        m_state = static_cast<QProcess::ProcessState>(message.value("stateChanged").toDouble());
+        m_state = static_cast<QProcess::ProcessState>(message.value(QStringLiteral("stateChanged")).toDouble());
         emit stateChanged(m_state);
     }
     else if (event == QLatin1String("output")) {
-        if (message.contains("stdout")) {
-            handleStandardOutput(message.value("stdout").toString().toLocal8Bit());
+        if (message.contains(QStringLiteral("stdout"))) {
+            handleStandardOutput(message.value(QStringLiteral("stdout")).toString().toLocal8Bit());
         }
-        if (message.contains("stderr")) {
-            handleStandardError(message.value("stderr").toString().toLocal8Bit());
+        if (message.contains(QStringLiteral("stderr"))) {
+            handleStandardError(message.value(QStringLiteral("stderr")).toString().toLocal8Bit());
         }
     }
     else
diff --git a/src/core/unixprocessbackend.cpp b/src/core/unixprocessbackend.cpp
index 286b486..3760354 100644
--- a/src/core/unixprocessbackend.cpp
+++ b/src/core/unixprocessbackend.cpp
@@ -261,10 +261,10 @@ qint64 UnixProcessBackend::write(const char *data, qint64 maxSize)
 */
 void UnixProcessBackend::handleProcessStarted()
 {
-    if (m_info.contains("priority") && setpriority(PRIO_PROCESS, m_process->pid(), m_info.priority()))
+    if (m_info.contains(QStringLiteral("priority")) && setpriority(PRIO_PROCESS, m_process->pid(), m_info.priority()))
         qWarning() << "Failed to set process priority at startup from " << actualPriority() <<
             "to" << m_info.priority()  << " : errno = " << errno;
-    if (m_info.contains("oomAdjustment") &&
+    if (m_info.contains(QStringLiteral("oomAdjustment")) &&
         !ProcUtils::setOomAdjustment(m_process->pid(), m_info.oomAdjustment()))
         qWarning() << "Failed to set process oom score at startup from " << actualOomAdjustment() <<
             "to" << m_info.oomAdjustment();
diff --git a/src/declarative/processinfotemplate.cpp b/src/declarative/processinfotemplate.cpp
index 33e9fb9..deeddae 100644
--- a/src/declarative/processinfotemplate.cpp
+++ b/src/declarative/processinfotemplate.cpp
@@ -414,8 +414,8 @@ QVariant ProcessInfoTemplate::bindScript(const QDeclarativeScriptString &script)
         // only contain null values.  So we wrap everything in a simple JSON object, and then pick
         // out the real value after evaluating it.
 
-        QString scriptStr = "script";
-        QString jsonWrapper = QString("{\"%1\": %2}").arg(scriptStr).arg(script.script());
+        QString scriptStr = QStringLiteral("script");
+        QString jsonWrapper = QString::fromLatin1("{\"%1\": %2}").arg(scriptStr).arg(script.script());
         QDeclarativeExpression expr(script.context(), this, jsonWrapper);
 
         return expr.evaluate().toMap().value(scriptStr);
diff --git a/tests/auto/declarative/testDeclarative/main.cpp b/tests/auto/declarative/testDeclarative/main.cpp
index d61b1ad..bb5875c 100644
--- a/tests/auto/declarative/testDeclarative/main.cpp
+++ b/tests/auto/declarative/testDeclarative/main.cpp
@@ -73,7 +73,7 @@ ssize_t readline(char *buffer, int max_len)
 }
 
 int
-main(int argc, char **argv)
+main(int /*argc*/, char ** /*argv*/)
 {
     char buffer[kBufSize+1];
 
diff --git a/tests/auto/processmanager/testClient/main.cpp b/tests/auto/processmanager/testClient/main.cpp
index d61b1ad..bb5875c 100644
--- a/tests/auto/processmanager/testClient/main.cpp
+++ b/tests/auto/processmanager/testClient/main.cpp
@@ -73,7 +73,7 @@ ssize_t readline(char *buffer, int max_len)
 }
 
 int
-main(int argc, char **argv)
+main(int /*argc*/, char ** /*argv*/)
 {
     char buffer[kBufSize+1];