Fixed up a bunch of QString compiler warnings

Change-Id: I705d92fdf899685875a22d982a0a261e940a66ce
Reviewed-by: Chris Craig <ext-chris.craig@nokia.com>

5 files changed, 23 insertions, 19 deletions

diff --git a/src/jsonclient.cpp b/src/jsonclient.cpp
index a8c8ec7..c7af355 100644
--- a/src/jsonclient.cpp
+++ b/src/jsonclient.cpp
@@ -65,7 +65,7 @@ JsonClient::JsonClient(const QString& registration, QObject* parent)
     : QObject(parent),
       mStream(0)
 {
-    mRegistrationMessage.insert("token", registration);
+    mRegistrationMessage.insert(QStringLiteral("token"), registration);
 }
 
 /*!
diff --git a/src/jsonserver.cpp b/src/jsonserver.cpp
index 0063f11..248e5c9 100644
--- a/src/jsonserver.cpp
+++ b/src/jsonserver.cpp
@@ -505,7 +505,8 @@ void JsonServer::initSchemaValidation()
     if (!strSchemaControl.isEmpty())
     {
         ValidatorFlags flags(NoValidation);
-        foreach (QString str, strSchemaControl.toLower().split(QRegExp("[,:]"), QString::SkipEmptyParts)) {
+        foreach (QString str, strSchemaControl.toLower().split(QRegExp(QStringLiteral("[,:]")),
+                                                               QString::SkipEmptyParts)) {
             if (str == QLatin1String("warn"))
                 flags |= WarnIfInvalid;
             else if (str == QLatin1String("drop"))
diff --git a/src/qtjsonschema/checkpoints_p.h b/src/qtjsonschema/checkpoints_p.h
index b2c9812..64e21b8 100644
--- a/src/qtjsonschema/checkpoints_p.h
+++ b/src/qtjsonschema/checkpoints_p.h
@@ -742,7 +742,8 @@ public:
         bool ok;
         m_min = minimum.toInt(&ok);
         if (!ok) {
-            Check::m_schema->setLoadError("wrong 'minItems' value", minimum, SchemaError::SchemaWrongParamType);
+            Check::m_schema->setLoadError("wrong 'minItems' value", minimum,
+                                          SchemaError::SchemaWrongParamType);
         }
     }
 
@@ -766,7 +767,8 @@ public:
         bool ok;
         m_max = maximum.toInt(&ok);
         if (!ok) {
-            Check::m_schema->setLoadError("wrong 'maxItems' value", maximum, SchemaError::SchemaWrongParamType);
+            Check::m_schema->setLoadError("wrong 'maxItems' value", maximum,
+                                          SchemaError::SchemaWrongParamType);
         }
     }
 
@@ -934,7 +936,7 @@ public:
             if (QString::fromLatin1("date-time") == m_format) {
                 QString str;
                 if (!(str = value.toString(&ok)).isEmpty() && ok) {
-                    return QDateTime::fromString(str, "yyyy-MM-ddThh:mm:ssZ").isValid();
+                    return QDateTime::fromString(str, QStringLiteral("yyyy-MM-ddThh:mm:ssZ")).isValid();
                 }
             }
             break;
@@ -942,7 +944,7 @@ public:
             if (QString::fromLatin1("date") == m_format) {
                 QString str;
                 if (!(str = value.toString(&ok)).isEmpty() && ok) {
-                    return QDate::fromString(str, "yyyy-MM-dd").isValid();
+                    return QDate::fromString(str, QStringLiteral("yyyy-MM-dd")).isValid();
                 }
             }
             break;
@@ -950,7 +952,7 @@ public:
             if (QString::fromLatin1("time") == m_format) {
                 QString str;
                 if (!(str = value.toString(&ok)).isEmpty() && ok) {
-                    return QTime::fromString(str, "hh:mm:ss").isValid();
+                    return QTime::fromString(str, QStringLiteral("hh:mm:ss")).isValid();
                 }
             }
             break;
@@ -1319,7 +1321,7 @@ void SchemaPrivate<T>::setLoadError(const char *message, const Value & value, in
 
     QString str;
     QDebug(&str) << value.value(); // put parameter value into the message
-    str = QString::fromLatin1("Schema Error: %1 ( %2 )").arg(message).arg(str);
+    str = QString::fromLatin1("Schema Error: %1 ( %2 )").arg(QString::fromLatin1(message)).arg(str);
     m_callbacks->setSubError(str, code);
 }
 
diff --git a/src/qtjsonschema/schemamanager_impl_p.h b/src/qtjsonschema/schemamanager_impl_p.h
index 7a34735..deb629e 100644
--- a/src/qtjsonschema/schemamanager_impl_p.h
+++ b/src/qtjsonschema/schemamanager_impl_p.h
@@ -86,7 +86,7 @@ inline T SchemaManager<T,TT>::ensureCompiled(const QString &schemaName, MapSchem
     SchemaValidation::Schema<TT> schema(pair->second);
     if (schema.hasErrors())
     {
-        callbacks->setLoadError("Schema errors found. Schema can not be loaded properly.");
+        callbacks->setLoadError(QStringLiteral("Schema errors found. Schema can not be loaded properly."));
         return callbacks->error();
     }
     else if (!schema.isValid()) {
diff --git a/src/qtjsonschema/schemavalidator.cpp b/src/qtjsonschema/schemavalidator.cpp
index 827a9d9..597d648 100644
--- a/src/qtjsonschema/schemavalidator.cpp
+++ b/src/qtjsonschema/schemavalidator.cpp
@@ -337,8 +337,7 @@ QJsonObject SchemaValidator::_loadFromFile(const QString &filename, SchemaNameIn
     }
     else
     {
-        ret = makeError(SchemaError::FailedSchemaFileOpenRead,
-                        "Filename is empty");
+        ret = makeError(SchemaError::FailedSchemaFileOpenRead, QStringLiteral("Filename is empty"));
     }
     return ret;
 }
@@ -358,8 +357,7 @@ QJsonObject SchemaValidator::_loadFromData(const QByteArray & json, const QStrin
 
     if (doc.isNull() || schemaObject.isEmpty())
     {
-        return makeError(SchemaError::InvalidObject,
-                            "schema data is invalid");
+        return makeError(SchemaError::InvalidObject, QStringLiteral("schema data is invalid"));
     }
 
     QJsonObject ret;
@@ -389,7 +387,7 @@ QJsonObject SchemaValidator::_loadFromData(const QByteArray & json, const QStrin
     {
         // no schema type
         ret = makeError(SchemaError::InvalidSchemaOperation,
-                            "schema name is missing");
+                        QStringLiteral("schema name is missing"));
     }
     return ret;
 }
@@ -512,13 +510,16 @@ SchemaValidator::SchemaUniqueKeyNameMatcher::~SchemaUniqueKeyNameMatcher()
 */
 void SchemaValidator::SchemaUniqueKeyNameMatcher::createIndex(const QString &schemaName, const QJsonObject & schema)
 {
-    if (schema.contains("properties")) {
-        QJsonValue props = schema["properties"];
+    if (schema.contains(QStringLiteral("properties"))) {
+        QJsonValue props = schema[QStringLiteral("properties")];
         if (props.isObject() && props.toObject().contains(m_key)) {
             QJsonObject o = props.toObject()[m_key].toObject();
-            if (o.contains("required") && o.contains("type") && o.contains("pattern")) {
-                if (true == o["required"].toBool() && o["type"].toString() == QLatin1String("string")) {
-                    QString key = o["pattern"].toString();
+            if (o.contains(QStringLiteral("required")) &&
+                o.contains(QStringLiteral("type")) &&
+                o.contains(QStringLiteral("pattern"))) {
+                if (true == o[QStringLiteral("required")].toBool() &&
+                    o[QStringLiteral("type")].toString() == QStringLiteral("string")) {
+                    QString key = o[QStringLiteral("pattern")].toString();
                     if (!key.isEmpty())
                     {
                         QHash<QString,QStringList>::iterator it(d_ptr->m_items.find(key));