diff options
| author | Andrew Christian <andrew.christian@nokia.com> | 2012-02-29 10:14:39 +0100 |
|---|---|---|
| committer | Chris Craig <ext-chris.craig@nokia.com> | 2012-02-29 10:46:48 +0100 |
| commit | 5676398dc87098026d89e4ce09ac5fe5e9a81fec (patch) | |
| tree | 8019b966307cd57e35fde6526254606e3dd403e5 /src/qtjsonschema/checkpoints_p.h | |
| parent | a2b490b226a2606944ef1c2b52d13a2414568ad6 (diff) | |
Fixed up a bunch of QString compiler warnings
Change-Id: I705d92fdf899685875a22d982a0a261e940a66ce
Reviewed-by: Chris Craig <ext-chris.craig@nokia.com>
Diffstat (limited to 'src/qtjsonschema/checkpoints_p.h')
| -rw-r--r-- | src/qtjsonschema/checkpoints_p.h | 14 |
1 files changed, 8 insertions, 6 deletions
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); } |