diff options
| author | Silarn <jrim@rimpo.org> | 2019-01-05 20:00:16 -0600 |
|---|---|---|
| committer | Silarn <jrim@rimpo.org> | 2019-01-05 20:00:16 -0600 |
| commit | e35cdd6c89ea27dfb8f3ea1f918192514617a64d (patch) | |
| tree | f35f50185df88c5104ca6c47133d07b2254202a3 /src/logbuffer.cpp | |
| parent | 15e47114175d7dd86cd6e774aff1d7872e87a647 (diff) | |
| parent | f2c145b2fc9d6ffce838398e06f7aa583d05887d (diff) | |
Merge remote-tracking branch 'origin/Develop' into archive_conflicts_2
Diffstat (limited to 'src/logbuffer.cpp')
| -rw-r--r-- | src/logbuffer.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/logbuffer.cpp b/src/logbuffer.cpp index 522ce3c8..485e27db 100644 --- a/src/logbuffer.cpp +++ b/src/logbuffer.cpp @@ -127,7 +127,7 @@ void LogBuffer::log(QtMsgType type, const QMessageLogContext &context, {
// QMutexLocker doesn't support timeout...
if (!s_Mutex.tryLock(100)) {
- fprintf(stderr, "failed to log: %s", qPrintable(message));
+ fprintf(stderr, "failed to log: %s", qUtf8Printable(message));
return;
}
ON_BLOCK_EXIT([]() { s_Mutex.unlock(); });
@@ -137,17 +137,17 @@ void LogBuffer::log(QtMsgType type, const QMessageLogContext &context, }
if (type == QtDebugMsg) {
- fprintf(stdout, "%s [%c] %s\n", qPrintable(QTime::currentTime().toString()),
- msgTypeID(type), qPrintable(message));
+ fprintf(stdout, "%s [%c] %s\n", qUtf8Printable(QTime::currentTime().toString()),
+ msgTypeID(type), qUtf8Printable(message));
} else {
if (context.line != 0) {
fprintf(stdout, "%s [%c] (%s:%u) %s\n",
- qPrintable(QTime::currentTime().toString()), msgTypeID(type),
- context.file, context.line, qPrintable(message));
+ qUtf8Printable(QTime::currentTime().toString()), msgTypeID(type),
+ context.file, context.line, qUtf8Printable(message));
} else {
fprintf(stdout, "%s [%c] %s\n",
- qPrintable(QTime::currentTime().toString()), msgTypeID(type),
- qPrintable(message));
+ qUtf8Printable(QTime::currentTime().toString()), msgTypeID(type),
+ qUtf8Printable(message));
}
}
fflush(stdout);
|