diff options
Diffstat (limited to 'src/logger/qlogger.h')
| -rw-r--r-- | src/logger/qlogger.h | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/src/logger/qlogger.h b/src/logger/qlogger.h index ba527de..a6811b1 100644 --- a/src/logger/qlogger.h +++ b/src/logger/qlogger.h @@ -79,31 +79,31 @@ QT_LOGGER_USE_NAMESPACE # undef qDebug #endif -#define qDebug \ - if (!QLoggingCategory::defaultCategory().isEnabled(QtDebugMsg)) \ - /*NOP*/; \ - else \ - QMessageLogger(__FILE__, __LINE__, Q_FUNC_INFO).debug +#define qDebug \ + if (!QLoggingCategory::defaultCategory().isEnabled(QtDebugMsg)) \ + /*NOP*/; \ + else \ + QMessageLogger(__FILE__, __LINE__, Q_FUNC_INFO, QLoggingCategory::defaultCategory().categoryName()).debug #if defined(qWarning) # undef qWarning #endif -#define qWarning \ - if (!QLoggingCategory::defaultCategory().isEnabled(QtWarningMsg)) \ - /*NOP*/; \ - else \ - QMessageLogger(__FILE__, __LINE__, Q_FUNC_INFO).warning +#define qWarning \ + if (!QLoggingCategory::defaultCategory().isEnabled(QtWarningMsg)) \ + /*NOP*/; \ + else \ + QMessageLogger(__FILE__, __LINE__, Q_FUNC_INFO, QLoggingCategory::defaultCategory().categoryName()).warning #if defined(qCritical) # undef qCritical #endif -#define qCritical \ - if (!QLoggingCategory::defaultCategory().isEnabled(QtCriticalMsg)) \ - /*NOP*/; \ - else \ - QMessageLogger(__FILE__, __LINE__, Q_FUNC_INFO).critical +#define qCritical \ + if (!QLoggingCategory::defaultCategory().isEnabled(QtCriticalMsg)) \ + /*NOP*/; \ + else \ + QMessageLogger(__FILE__, __LINE__, Q_FUNC_INFO, QLoggingCategory::defaultCategory().categoryName()).critical //This marco creates the QLoggingCategory object in an empty namespace //to prevent linker problems if someone else uses the categorytype in an other place. @@ -116,18 +116,18 @@ QT_LOGGER_USE_NAMESPACE if (!category.isEnabled(QtDebugMsg)) \ /*NOP*/; \ else \ - QMessageLogger(__FILE__, __LINE__, Q_FUNC_INFO).debug() << category.categoryName() << ": " + QMessageLogger(__FILE__, __LINE__, Q_FUNC_INFO, category.categoryName()).debug() #define qCWarning(category) \ if (!category.isEnabled(QtWarningMsg)) \ /*NOP*/; \ else \ - QMessageLogger(__FILE__, __LINE__, Q_FUNC_INFO).warning() << category.categoryName() << ": " + QMessageLogger(__FILE__, __LINE__, Q_FUNC_INFO, category.categoryName()).warning() #define qCCritical(category) \ if (!category.isEnabled(QtCriticalMsg)) \ /*NOP*/; \ else \ - QMessageLogger(__FILE__, __LINE__, Q_FUNC_INFO).critical() << category.categoryName() << ": " + QMessageLogger(__FILE__, __LINE__, Q_FUNC_INFO, category.categoryName()).critical() #endif // QLOGGER_H |