Fix compiler warnings

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

7 files changed, 17 insertions, 16 deletions

diff --git a/src/jsonserver.cpp b/src/jsonserver.cpp
index 5a307a3..0063f11 100644
--- a/src/jsonserver.cpp
+++ b/src/jsonserver.cpp
@@ -498,9 +498,9 @@ SchemaValidator *JsonServer::outboundValidator()
 */
 void JsonServer::initSchemaValidation()
 {
-    QByteArray szInboundPath(qgetenv("JSONSERVER_SCHEMA_INBOUND_PATH"));
-    QByteArray szOutboundPath(qgetenv("JSONSERVER_SCHEMA_OUTBOUND_PATH"));
-    QString strSchemaControl(qgetenv("JSONSERVER_SCHEMA_CONTROL")); // "warn","drop" or "warn":"drop"
+    QString szInboundPath = QString::fromLocal8Bit(qgetenv("JSONSERVER_SCHEMA_INBOUND_PATH"));
+    QString szOutboundPath = QString::fromLocal8Bit(qgetenv("JSONSERVER_SCHEMA_OUTBOUND_PATH"));
+    QString strSchemaControl = QString::fromLocal8Bit(qgetenv("JSONSERVER_SCHEMA_CONTROL")); // "warn","drop" or "warn":"drop"
 
     if (!strSchemaControl.isEmpty())
     {
diff --git a/src/jsonstream.cpp b/src/jsonstream.cpp
index db365fc..5ee611d 100644
--- a/src/jsonstream.cpp
+++ b/src/jsonstream.cpp
@@ -198,7 +198,7 @@ void JsonStream::sendInternal(const QByteArray& byteArray)
 
     if (nBytes != byteArray.size())
         qCritical() << Q_FUNC_INFO << __LINE__
-                    << QString("Expected to write %1 bytes, actually %2.").arg(byteArray.size()).arg(nBytes);
+                    << QString::fromLatin1("Expected to write %1 bytes, actually %2.").arg(byteArray.size()).arg(nBytes);
 }
 
 /*!
diff --git a/src/jsonuidauthority.cpp b/src/jsonuidauthority.cpp
index e1b9c1e..60eea48 100644
--- a/src/jsonuidauthority.cpp
+++ b/src/jsonuidauthority.cpp
@@ -189,7 +189,7 @@ AuthorizationRecord JsonUIDAuthority::clientConnected(JsonStream *stream)
     if (!socket)
         return authRecord;
 
-    if (socket->socketDescriptor() == (quintptr)-1) {
+    if (socket->socketDescriptor() == (qintptr)-1) {
         qWarning() << Q_FUNC_INFO << "no socket descriptor available for connection" << socket;
         return authRecord;
     }
diff --git a/src/jsonuidrangeauthority.cpp b/src/jsonuidrangeauthority.cpp
index 798be37..da5b620 100644
--- a/src/jsonuidrangeauthority.cpp
+++ b/src/jsonuidrangeauthority.cpp
@@ -153,7 +153,7 @@ AuthorizationRecord JsonUIDRangeAuthority::clientConnected(JsonStream *stream)
     if (!socket)
         return authRecord;
 
-    if (socket->socketDescriptor() == (quintptr)-1) {
+    if (socket->socketDescriptor() == (qintptr)-1) {
         qWarning() << Q_FUNC_INFO << "no socket descriptor available for connection" << socket;
         return authRecord;
     }
diff --git a/src/qtjsonschema/checkpoints_p.h b/src/qtjsonschema/checkpoints_p.h
index e30b009..63e743c 100644
--- a/src/qtjsonschema/checkpoints_p.h
+++ b/src/qtjsonschema/checkpoints_p.h
@@ -396,7 +396,7 @@ public:
             else { // looks like object or array
                 Object object;
                 foreach (Check *check, checks) {
-                    Value value("", Object());
+                    Value value(QStringLiteral(""), Object());
                     check->checkDefault(value, object);
                 }
 
@@ -482,7 +482,7 @@ public:
 
         bool bNoAdditional;
         if ((bNoAdditional = Check::m_data->m_flags.testFlag(CheckSharedData::NoAdditionalItems))) {
-            if (m_bList && array.count() > m_schema.size())
+            if (m_bList && array.count() > (uint) m_schema.size())
                 return false; // AdditionalItems is set to false
         }
 
@@ -1328,7 +1328,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("Schema Error: %1 ( %2 )").arg(message).arg(str);
+    str = QString::fromLatin1("Schema Error: %1 ( %2 )").arg(message).arg(str);
     m_callbacks->setSubError(str, code);
 }
 
diff --git a/src/qtjsonschema/jsonobjecttypes_impl_p.h b/src/qtjsonschema/jsonobjecttypes_impl_p.h
index 7c743dd..74b2afb 100644
--- a/src/qtjsonschema/jsonobjecttypes_impl_p.h
+++ b/src/qtjsonschema/jsonobjecttypes_impl_p.h
@@ -379,7 +379,7 @@ inline void JsonObjectTypes::Service::setSubError(const QString &message, int er
     QJsonObject error;
     error.insert(SchemaError::kCodeStr, errorCode);
     error.insert(SchemaError::kMessageStr, message);
-    m_errorMap.insert(QString("%1").arg(m_errorMap.count()), error);
+    m_errorMap.insert(QString::number(m_errorMap.count()), error);
 }
 
 inline SchemaValidation::Schema<JsonObjectTypes> JsonObjectTypes::Service::loadSchema(const QString &schemaName)
diff --git a/src/qtjsonschema/schemavalidator.cpp b/src/qtjsonschema/schemavalidator.cpp
index 6a31930..827a9d9 100644
--- a/src/qtjsonschema/schemavalidator.cpp
+++ b/src/qtjsonschema/schemavalidator.cpp
@@ -250,7 +250,7 @@ QJsonObject SchemaValidator::_loadFromFolder(const QString & path, const QString
         // create a filter if required
         QStringList exts;
         if (!ext.isEmpty())
-            exts << QByteArray("*." + ext);
+            exts.append(QStringLiteral("*.")+QString::fromLatin1(ext));
 
         QStringList items(dir.entryList(exts, QDir::Files | QDir::Readable));
         foreach (QString filename, items)
@@ -277,7 +277,8 @@ QJsonObject SchemaValidator::_loadFromFolder(const QString & path, const QString
         {
             int nFailed = ret.count();
             ret.insert(SchemaError::kCodeStr, SchemaError::InvalidSchemaLoading);
-            ret.insert(SchemaError::kMessageStr, QString("Loading failed for %1 schemas. %2 schemas are loaded successfully.").arg(nFailed).arg(nLoaded));
+            ret.insert(SchemaError::kMessageStr,
+                       QString::fromLatin1("Loading failed for %1 schemas. %2 schemas are loaded successfully.").arg(nFailed).arg(nLoaded));
 
             if (nLoaded)
                 ret.insert(SchemaError::kCounterStr, nLoaded);
@@ -285,13 +286,13 @@ QJsonObject SchemaValidator::_loadFromFolder(const QString & path, const QString
         else if (!nLoaded) // no schemas were found
         {
             ret = makeError(SchemaError::InvalidSchemaLoading,
-                            QString("Folder '%1' does not contain any schema.").arg(dir.path()));
+                            QString::fromLatin1("Folder '%1' does not contain any schema.").arg(dir.path()));
         }
     }
     else
     {
         ret = makeError(SchemaError::InvalidSchemaFolder,
-                        QString("Folder '%1' does not exist.").arg(dir.path()));
+                        QString::fromLatin1("Folder '%1' does not exist.").arg(dir.path()));
     }
 
     if (!ret.isEmpty())
@@ -328,7 +329,7 @@ QJsonObject SchemaValidator::_loadFromFile(const QString &filename, SchemaNameIn
         else
         {   // file open error
             ret = makeError(SchemaError::FailedSchemaFileOpenRead,
-                            QString("Can't open/read '%1' schema file.").arg(schemaFile.fileName()));
+                            QString::fromLatin1("Can't open/read '%1' schema file.").arg(schemaFile.fileName()));
         }
 
         if (!ret.isEmpty())
@@ -376,7 +377,7 @@ QJsonObject SchemaValidator::_loadFromData(const QByteArray & json, const QStrin
     {
         // property containing schema name is absent
         return makeError(SchemaError::InvalidSchemaOperation,
-                            QString("name property '%1' must be present").arg(name));
+                            QString::fromLatin1("name property '%1' must be present").arg(name));
 
     }