From c086036c2f6042d0e836f6fdad97bfe6e7811b50 Mon Sep 17 00:00:00 2001 From: Jihye Won Date: Tue, 9 Jun 2015 20:01:58 +0900 Subject: [PATCH] qt: modified Qt logging format Change-Id: I5a5bf2193d35b9332075fde077c698cec2568988 Signed-off-by: Jihye Won --- tizen/src/display/qt5_supplement.cpp | 31 ++++++++++++++++++++-------- 1 file changed, 22 insertions(+), 9 deletions(-) diff --git a/tizen/src/display/qt5_supplement.cpp b/tizen/src/display/qt5_supplement.cpp index a9618f3e68..eedda37a7c 100644 --- a/tizen/src/display/qt5_supplement.cpp +++ b/tizen/src/display/qt5_supplement.cpp @@ -377,24 +377,37 @@ void qt5_process_captured(bool captured, void *pixels, int width, int height) void qMessageOutput(QtMsgType type, const QMessageLogContext &context, const QString &msg) { QByteArray localMsg = msg.toLocal8Bit(); - QByteArray dateMsg = QDateTime::currentDateTime().toString("hh:mm:ss").toLocal8Bit(); + QByteArray dateMsg = QDateTime::currentDateTime().toString("hh:mm:ss.zzz").toLocal8Bit(); + + QString path = context.file; + char *fname = NULL; + int posFname = path.lastIndexOf('/') + 1; + int posDot = path.lastIndexOf('.'); + + if (( posFname != 0 ) && ( posDot != -1)) { + int fnameLen = path.length() - posFname; + path = path.right(fnameLen); + fnameLen = posDot - posFname; + path.truncate(fnameLen); + } + fname = path.toLocal8Bit().data(); switch (type) { case QtDebugMsg: - fprintf(stdout, "%s [Debug:%s:%u] %s\n", dateMsg.constData(), - context.category, context.line, localMsg.trimmed().constData()); + fprintf(stdout, "%s [INFO:%15.15s:%5u] %s\n", dateMsg.constData(), + fname, context.line, localMsg.trimmed().constData()); break; case QtWarningMsg: - fprintf(stdout, "%s [Warning:%s:%u] %s\n", dateMsg.constData(), - context.category, context.line, localMsg.trimmed().constData()); + fprintf(stdout, "%s [WARN:%15.15s:%5u] %s\n", dateMsg.constData(), + fname, context.line, localMsg.trimmed().constData()); break; case QtCriticalMsg: - fprintf(stderr, "%s [Critical:%s:%u] %s\n", dateMsg.constData(), - context.category, context.line, localMsg.trimmed().constData()); + fprintf(stderr, "%s [ERR :%15.15s:%5u] %s\n", dateMsg.constData(), + fname, context.line, localMsg.trimmed().constData()); break; case QtFatalMsg: - fprintf(stderr, "%s [Fatal:%s:%u] %s\n", dateMsg.constData(), - context.category, context.line, localMsg.trimmed().constData()); + fprintf(stderr, "%s [SEVR:%15.15s:%5u] %s\n", dateMsg.constData(), + fname, context.line, localMsg.trimmed().constData()); QString err; QMessageBox::critical(0, "Emulator", -- 2.34.1