From dabec3274882bd4858135f31b0f178053e70c5a9 Mon Sep 17 00:00:00 2001 From: Muhammed Galib Uludag Date: Wed, 28 Jul 2021 16:23:43 +0300 Subject: [PATCH 1/2] Added common class for all qt objects Removed separate class for qt_sinks and also send logs to any custom qt (QObject) classes (QML, QFile, custom Widget etc.) --- include/spdlog/sinks/qt_sinks.h | 107 ++++++++++---------------------- 1 file changed, 33 insertions(+), 74 deletions(-) diff --git a/include/spdlog/sinks/qt_sinks.h b/include/spdlog/sinks/qt_sinks.h index 22850961..a8abb62d 100644 --- a/include/spdlog/sinks/qt_sinks.h +++ b/include/spdlog/sinks/qt_sinks.h @@ -4,8 +4,8 @@ #pragma once // -// Custom sink for QPlainTextEdit or QTextEdit and its childs(QTextBrowser... etc) -// Building and using requires Qt library. +// Custom sink for QPlainTextEdit or QTextEdit and its childs(QTextBrowser... +// etc) Building and using requires Qt library. // #include "spdlog/common.h" @@ -13,113 +13,72 @@ #include "spdlog/details/synchronous_factory.h" #include "spdlog/sinks/base_sink.h" +#include #include #include // -// qtextedit_sink class +// qt_sink class // namespace spdlog { namespace sinks { -template -class qtextedit_sink : public base_sink { +template class qt_sink : public base_sink { public: - qtextedit_sink(QTextEdit *textedit = nullptr) { - if (textedit != nullptr) { - qtextedit_ = textedit; + qt_sink(QObject *qt_object = nullptr, const std::string &meta_method = "") { + if (qt_object != nullptr) { + qt_object_ = qt_object; + meta_method_ = meta_method; } else { - throw spdlog_ex("Error opening QTextEdit"); + throw spdlog_ex("Error opening qt sink"); } } - ~qtextedit_sink() { flush_(); } + ~qt_sink() { flush_(); } protected: void sink_it_(const details::log_msg &msg) override { memory_buf_t formatted; base_sink::formatter_->format(msg, formatted); string_view_t str = string_view_t(formatted.data(), formatted.size()); - QMetaObject::invokeMethod(qtextedit_,"append", Qt::AutoConnection, Q_ARG(QString, QString::fromUtf8(str.data(), static_cast(str.size())).trimmed())); + QMetaObject::invokeMethod(qt_object_, meta_method_.c_str(), Qt::AutoConnection, + Q_ARG(QString, QString::fromUtf8(str.data(), static_cast(str.size())).trimmed())); } void flush_() override {} private: - QTextEdit* qtextedit_ = nullptr; -}; - -// -// qplaintextedit_sink class -// -template -class qplaintextedit_sink : public base_sink { -public: - qplaintextedit_sink(QPlainTextEdit *textedit = nullptr) { - if (textedit != nullptr) { - qplaintextedit_ = textedit; - } else { - throw spdlog_ex("Error opening QPlainTextEdit"); - } - } - - ~qplaintextedit_sink() { flush_(); } - -protected: - void sink_it_(const details::log_msg &msg) override { - memory_buf_t formatted; - base_sink::formatter_->format(msg, formatted); - string_view_t str = string_view_t(formatted.data(), formatted.size()); - QMetaObject::invokeMethod(qplaintextedit_, "appendPlainText", Qt::AutoConnection, Q_ARG(QString, QString::fromUtf8(str.data(), static_cast(str.size())).trimmed())); - } - - void flush_() override {} - -private: - QPlainTextEdit* qplaintextedit_ = nullptr; + QObject *qt_object_ = nullptr; + std::string meta_method_; }; #include "spdlog/details/null_mutex.h" #include -using qtextedit_sink_mt = qtextedit_sink; -using qtextedit_sink_st = qtextedit_sink; - -using qplaintextedit_sink_mt = qplaintextedit_sink; -using qplaintextedit_sink_st = qplaintextedit_sink; - +using qt_sink_mt = qt_sink; +using qt_sink_st = qt_sink; } // namespace sinks // // Factory functions // -template +template inline std::shared_ptr -qtextedit_logger_mt(const std::string &logger_name, - QTextEdit *qtextedit = nullptr) { - return Factory::template create(logger_name, - qtextedit); +qt_logger_mt(const std::string &logger_name, T *qt_object = nullptr, const std::string &meta_method = "") { + std::string meta_method_ = meta_method; + if (std::is_base_of::value) + meta_method_ = "append"; + else if (std::is_same::value) + meta_method_ = "appendPlainText"; + return Factory::template create(logger_name, qt_object, meta_method_); } -template +template inline std::shared_ptr -qtextedit_logger_st(const std::string &logger_name, - QTextEdit *qtextedit = nullptr) { - return Factory::template create(logger_name, - qtextedit); -} - -template -inline std::shared_ptr -qplaintextedit_logger_mt(const std::string &logger_name, - QPlainTextEdit *qplaintextedit = nullptr) { - return Factory::template create(logger_name, - qplaintextedit); -} - -template -inline std::shared_ptr -qplaintextedit_logger_st(const std::string &logger_name, - QPlainTextEdit *qplaintextedit = nullptr) { - return Factory::template create(logger_name, - qplaintextedit); +qt_logger_st(const std::string &logger_name, T *qt_object = nullptr, const std::string &meta_method = "") { + std::string meta_method_ = meta_method; + if (std::is_base_of::value) + meta_method_ = "append"; + else if (std::is_same::value) + meta_method_ = "appendPlainText"; + return Factory::template create(logger_name, qt_object, meta_method_); } } // namespace spdlog From fe9cb54e0d3a7d62a6fe8ffe6b1e2cd780bf8fc3 Mon Sep 17 00:00:00 2001 From: Muhammed Galib Uludag Date: Wed, 28 Jul 2021 22:35:09 +0300 Subject: [PATCH 2/2] Added factory function overloads for QTextEdit, QPlainTextEdit and QObject Added factory funtion overloads for QTextEdit, QPlainTextEdit and QObject objects cleaned qt_sink ctor --- include/spdlog/sinks/qt_sinks.h | 51 +++++++++++++++++++-------------- 1 file changed, 30 insertions(+), 21 deletions(-) diff --git a/include/spdlog/sinks/qt_sinks.h b/include/spdlog/sinks/qt_sinks.h index a8abb62d..25b2aae9 100644 --- a/include/spdlog/sinks/qt_sinks.h +++ b/include/spdlog/sinks/qt_sinks.h @@ -13,7 +13,6 @@ #include "spdlog/details/synchronous_factory.h" #include "spdlog/sinks/base_sink.h" -#include #include #include @@ -25,12 +24,8 @@ namespace sinks { template class qt_sink : public base_sink { public: qt_sink(QObject *qt_object = nullptr, const std::string &meta_method = "") { - if (qt_object != nullptr) { qt_object_ = qt_object; meta_method_ = meta_method; - } else { - throw spdlog_ex("Error opening qt sink"); - } } ~qt_sink() { flush_(); } @@ -60,25 +55,39 @@ using qt_sink_st = qt_sink; // // Factory functions // -template +template inline std::shared_ptr -qt_logger_mt(const std::string &logger_name, T *qt_object = nullptr, const std::string &meta_method = "") { - std::string meta_method_ = meta_method; - if (std::is_base_of::value) - meta_method_ = "append"; - else if (std::is_same::value) - meta_method_ = "appendPlainText"; - return Factory::template create(logger_name, qt_object, meta_method_); +qt_logger_mt(const std::string &logger_name, QTextEdit* qt_object, const std::string &meta_method = "append") { + return Factory::template create(logger_name, qt_object, meta_method); } -template +template inline std::shared_ptr -qt_logger_st(const std::string &logger_name, T *qt_object = nullptr, const std::string &meta_method = "") { - std::string meta_method_ = meta_method; - if (std::is_base_of::value) - meta_method_ = "append"; - else if (std::is_same::value) - meta_method_ = "appendPlainText"; - return Factory::template create(logger_name, qt_object, meta_method_); +qt_logger_st(const std::string &logger_name, QTextEdit* qt_object, const std::string &meta_method = "append") { + return Factory::template create(logger_name, qt_object, meta_method); +} + +template +inline std::shared_ptr +qt_logger_mt(const std::string &logger_name, QPlainTextEdit* qt_object , const std::string &meta_method = "appendPlainText") { + return Factory::template create(logger_name, qt_object, meta_method); +} + +template +inline std::shared_ptr +qt_logger_st(const std::string &logger_name, QPlainTextEdit* qt_object, const std::string &meta_method = "appendPlainText") { + return Factory::template create(logger_name, qt_object, meta_method); +} + +template +inline std::shared_ptr +qt_logger_mt(const std::string &logger_name, QObject* qt_object, const std::string &meta_method) { + return Factory::template create(logger_name, qt_object, meta_method); +} + +template +inline std::shared_ptr +qt_logger_st(const std::string &logger_name, QObject* qt_object, const std::string &meta_method) { + return Factory::template create(logger_name, qt_object, meta_method); } } // namespace spdlog