diff options
author | Jake Petroules <jake.petroules@petroules.com> | 2014-01-08 14:36:16 -0500 |
---|---|---|
committer | Jake Petroules <jake.petroules@petroules.com> | 2014-01-14 17:41:47 +0100 |
commit | 49a051bd4b320aff32066181932dc27a4eea63c5 (patch) | |
tree | a8f5c6e56bb275d2ae8c83179065623385d1395a /src/lib/corelib/logging | |
parent | cf706560d394e582a897d2a69e79ce5740d2459d (diff) |
Prepare for using QT_NO_CAST_FROM/TO_ASCII.
Change-Id: Ib39e49e896cbddf5a5bd851088500991d962355a
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
Diffstat (limited to 'src/lib/corelib/logging')
-rw-r--r-- | src/lib/corelib/logging/ilogsink.cpp | 2 | ||||
-rw-r--r-- | src/lib/corelib/logging/logger.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/corelib/logging/ilogsink.cpp b/src/lib/corelib/logging/ilogsink.cpp index 118fdf106..01128b3c8 100644 --- a/src/lib/corelib/logging/ilogsink.cpp +++ b/src/lib/corelib/logging/ilogsink.cpp @@ -38,7 +38,7 @@ namespace qbs { QString logLevelTag(LoggerLevel level) { if (level == LoggerInfo) - return QByteArray(); + return QString(); QString str = logLevelName(level).toUpper(); if (!str.isEmpty()) str.append(QLatin1String(": ")); diff --git a/src/lib/corelib/logging/logger.cpp b/src/lib/corelib/logging/logger.cpp index 9f7a19c01..efc87e4cc 100644 --- a/src/lib/corelib/logging/logger.cpp +++ b/src/lib/corelib/logging/logger.cpp @@ -150,7 +150,7 @@ LogWriter operator<<(LogWriter w, const QSet<QString> &strSet) LogWriter operator<<(LogWriter w, const QVariant &variant) { - QString str = variant.typeName() + QLatin1Char('('); + QString str = QLatin1String(variant.typeName()) + QLatin1Char('('); if (variant.type() == QVariant::List) { bool firstLoop = true; foreach (const QVariant &item, variant.toList()) { @@ -180,7 +180,7 @@ LogWriter operator<<(LogWriter w, qint64 n) LogWriter operator<<(LogWriter w, bool b) { - return w << QString(QLatin1String(b ? "true" : "false")); + return w << QString::fromLatin1(b ? "true" : "false"); } LogWriter operator<<(LogWriter w, const MessageTag &tag) |