mirrors/linphone-desktop
1
0
Fork 0
mirror of https://gitlab.linphone.org/BC/public/linphone-desktop.git synced 2026-01-30 10:29:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix(src/app/logger/Logger): avoid useless var in release mode

Browse source
This commit is contained in:
Ronan Abhamon 2017-05-29 10:54:13 +02:00
parent 4939fadd0b
commit d7bd022997
2 changed files with 8 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
linphone-desktop/src/Utils.hpp
View file

@ -28,8 +28,6 @@
// =============================================================================
class QQuickWindow;
namespace Utils {
inline QString linphoneStringToQString (const std::string &string) {
return QString::fromLocal8Bit(string.c_str(), static_cast<int>(string.size()));

17
linphone-desktop/src/app/logger/Logger.cpp
View file

@ -121,23 +121,22 @@ void Logger::log (QtMsgType type, const QMessageLogContext &context, const QStri
} else
return;
const char *context_str = "";
const char *contextStr = "";
#ifdef QT_MESSAGELOGCONTEXT
QByteArray context_arr;
QByteArray contextArr;
{
const char *file = context.file;
const char *pos = file ? ::Utils::rstrstr(file, SRC_PATTERN) : file;
context_arr = QStringLiteral("%1:%2: ")
contextArr = QStringLiteral("%1:%2: ")
.arg(pos ? pos + sizeof(SRC_PATTERN) - 1 : file)
.arg(context.line)
.toLocal8Bit();
context_str = context_arr.constData();
contextStr = contextArr.constData();
}
#else
(void)context;
#endif // ifdef QT_MESSAGELOGCONTEXT
QByteArray localMsg = msg.toLocal8Bit();
@ -145,8 +144,8 @@ void Logger::log (QtMsgType type, const QMessageLogContext &context, const QStri
mMutex.lock();
fprintf(stderr, format, dateTime.constData(), QThread::currentThread(), context_str, localMsg.constData());
bctbx_log(QT_DOMAIN, level, "QT: %s%s", context_str, localMsg.constData());
fprintf(stderr, format, dateTime.constData(), QThread::currentThread(), contextStr, localMsg.constData());
bctbx_log(QT_DOMAIN, level, "QT: %s%s", contextStr, localMsg.constData());
mMutex.unlock();