From cfca7157b98c9dc8e0852fe6484bc3f75008af7d Mon Sep 17 00:00:00 2001 From: Nicolas Werner Date: Sat, 18 Sep 2021 00:22:33 +0200 Subject: Change indentation to 4 spaces --- src/Logging.cpp | 117 ++++++++++++++++++++++++++++---------------------------- 1 file changed, 58 insertions(+), 59 deletions(-) (limited to 'src/Logging.cpp') diff --git a/src/Logging.cpp b/src/Logging.cpp index 67bcaf7a..a18a1cee 100644 --- a/src/Logging.cpp +++ b/src/Logging.cpp @@ -25,35 +25,35 @@ constexpr auto MAX_LOG_FILES = 3; void qmlMessageHandler(QtMsgType type, const QMessageLogContext &context, const QString &msg) { - std::string localMsg = msg.toStdString(); - const char *file = context.file ? context.file : ""; - const char *function = context.function ? context.function : ""; - - if ( - // The default style has the point size set. If you use pixel size anywhere, you get - // that warning, which is useless, since sometimes you need the pixel size to match the - // text to the size of the outer element for example. This is done in the avatar and - // without that you get one warning for every Avatar displayed, which is stupid! - msg.endsWith(QStringLiteral("Both point size and pixel size set. Using pixel size."))) - return; - - switch (type) { - case QtDebugMsg: - nhlog::qml()->debug("{} ({}:{}, {})", localMsg, file, context.line, function); - break; - case QtInfoMsg: - nhlog::qml()->info("{} ({}:{}, {})", localMsg, file, context.line, function); - break; - case QtWarningMsg: - nhlog::qml()->warn("{} ({}:{}, {})", localMsg, file, context.line, function); - break; - case QtCriticalMsg: - nhlog::qml()->critical("{} ({}:{}, {})", localMsg, file, context.line, function); - break; - case QtFatalMsg: - nhlog::qml()->critical("{} ({}:{}, {})", localMsg, file, context.line, function); - break; - } + std::string localMsg = msg.toStdString(); + const char *file = context.file ? context.file : ""; + const char *function = context.function ? context.function : ""; + + if ( + // The default style has the point size set. If you use pixel size anywhere, you get + // that warning, which is useless, since sometimes you need the pixel size to match the + // text to the size of the outer element for example. This is done in the avatar and + // without that you get one warning for every Avatar displayed, which is stupid! + msg.endsWith(QStringLiteral("Both point size and pixel size set. Using pixel size."))) + return; + + switch (type) { + case QtDebugMsg: + nhlog::qml()->debug("{} ({}:{}, {})", localMsg, file, context.line, function); + break; + case QtInfoMsg: + nhlog::qml()->info("{} ({}:{}, {})", localMsg, file, context.line, function); + break; + case QtWarningMsg: + nhlog::qml()->warn("{} ({}:{}, {})", localMsg, file, context.line, function); + break; + case QtCriticalMsg: + nhlog::qml()->critical("{} ({}:{}, {})", localMsg, file, context.line, function); + break; + case QtFatalMsg: + nhlog::qml()->critical("{} ({}:{}, {})", localMsg, file, context.line, function); + break; + } } } @@ -63,60 +63,59 @@ bool enable_debug_log_from_commandline = false; void init(const std::string &file_path) { - auto file_sink = std::make_shared( - file_path, MAX_FILE_SIZE, MAX_LOG_FILES); - - auto console_sink = std::make_shared(); - - std::vector sinks; - sinks.push_back(file_sink); - sinks.push_back(console_sink); - - net_logger = std::make_shared("net", std::begin(sinks), std::end(sinks)); - ui_logger = std::make_shared("ui", std::begin(sinks), std::end(sinks)); - db_logger = std::make_shared("db", std::begin(sinks), std::end(sinks)); - crypto_logger = - std::make_shared("crypto", std::begin(sinks), std::end(sinks)); - qml_logger = std::make_shared("qml", std::begin(sinks), std::end(sinks)); - - if (nheko::enable_debug_log || enable_debug_log_from_commandline) { - db_logger->set_level(spdlog::level::trace); - ui_logger->set_level(spdlog::level::trace); - crypto_logger->set_level(spdlog::level::trace); - net_logger->set_level(spdlog::level::trace); - qml_logger->set_level(spdlog::level::trace); - } - - qInstallMessageHandler(qmlMessageHandler); + auto file_sink = std::make_shared( + file_path, MAX_FILE_SIZE, MAX_LOG_FILES); + + auto console_sink = std::make_shared(); + + std::vector sinks; + sinks.push_back(file_sink); + sinks.push_back(console_sink); + + net_logger = std::make_shared("net", std::begin(sinks), std::end(sinks)); + ui_logger = std::make_shared("ui", std::begin(sinks), std::end(sinks)); + db_logger = std::make_shared("db", std::begin(sinks), std::end(sinks)); + crypto_logger = std::make_shared("crypto", std::begin(sinks), std::end(sinks)); + qml_logger = std::make_shared("qml", std::begin(sinks), std::end(sinks)); + + if (nheko::enable_debug_log || enable_debug_log_from_commandline) { + db_logger->set_level(spdlog::level::trace); + ui_logger->set_level(spdlog::level::trace); + crypto_logger->set_level(spdlog::level::trace); + net_logger->set_level(spdlog::level::trace); + qml_logger->set_level(spdlog::level::trace); + } + + qInstallMessageHandler(qmlMessageHandler); } std::shared_ptr ui() { - return ui_logger; + return ui_logger; } std::shared_ptr net() { - return net_logger; + return net_logger; } std::shared_ptr db() { - return db_logger; + return db_logger; } std::shared_ptr crypto() { - return crypto_logger; + return crypto_logger; } std::shared_ptr qml() { - return qml_logger; + return qml_logger; } } -- cgit 1.5.1