From 9f2fdd8af991d9d685143f8c80cfc4989fcf6518 Mon Sep 17 00:00:00 2001 From: Sander Speetjens Date: Sun, 29 Mar 2026 13:10:21 +0200 Subject: [PATCH] Lint --- client/main.cpp | 14 ++++++++------ client/mainwindow.cpp | 2 +- server/main.cpp | 14 ++++++++------ server/simulators.cpp | 2 +- 4 files changed, 18 insertions(+), 14 deletions(-) diff --git a/client/main.cpp b/client/main.cpp index e21546d..6a918bb 100644 --- a/client/main.cpp +++ b/client/main.cpp @@ -1,4 +1,5 @@ #include "git_version.h" +#include "magic_enum/magic_enum.hpp" #include "mainwindow.hpp" #include "spdlog/async.h" #include "spdlog/sinks/stdout_color_sinks.h" @@ -8,7 +9,6 @@ #include #include #include -#include "magic_enum/magic_enum.hpp" #ifdef EMSCRIPTEN #include @@ -56,16 +56,18 @@ int main(int argc, char *argv[]) QCoreApplication::translate("main", "default"), QLatin1String("")); parser.addOption(default_sim_option); - QCommandLineOption log_option(QStringList() << "l" - << "log", - QCoreApplication::translate("main", "Log level for the unisim server [default: trace]."), - QCoreApplication::translate("main", "log"), QLatin1String("trace")); + QCommandLineOption log_option( + QStringList() << "l" + << "log", + QCoreApplication::translate("main", "Log level for the unisim server [default: trace]."), + QCoreApplication::translate("main", "log"), QLatin1String("trace")); parser.addOption(log_option); parser.process(a); // Initialize the logger init_logger(); - spdlog::set_level(magic_enum::enum_cast(parser.value(log_option).toStdString()).value_or(spdlog::level::off)); + spdlog::set_level(magic_enum::enum_cast(parser.value(log_option).toStdString()) + .value_or(spdlog::level::off)); QUrl url; url.setScheme("ws"); diff --git a/client/mainwindow.cpp b/client/mainwindow.cpp index b4aeac5..e7a4a81 100644 --- a/client/mainwindow.cpp +++ b/client/mainwindow.cpp @@ -20,7 +20,7 @@ MainWindow::MainWindow(QUrl ws_url, QString sim, QWidget *parent) [](const char *filename_in, int line_in, const char *funcname_in, int level, QString msg) { if (spdlog::default_logger_raw()->should_log((spdlog::level::level_enum)level)) spdlog::default_logger_raw()->log(spdlog::source_loc{filename_in, line_in, funcname_in}, - (spdlog::level::level_enum)level, msg.toStdString()); + (spdlog::level::level_enum)level, msg.toStdString()); }); QDirIterator it(QCoreApplication::applicationDirPath(), QStringList() << "*libui_*.so" << "*libui_*.dll", diff --git a/server/main.cpp b/server/main.cpp index b1d499b..e4ed246 100644 --- a/server/main.cpp +++ b/server/main.cpp @@ -6,8 +6,8 @@ #include "spdlog/sinks/stdout_color_sinks.h" #include "spdlog/spdlog.h" -#include "magic_enum/magic_enum.hpp" #include "git_version.h" +#include "magic_enum/magic_enum.hpp" #include "simulators.hpp" void init_logger() @@ -38,10 +38,11 @@ int main(int argc, char *argv[]) << "port", QCoreApplication::translate("main", "Port for the unisim server [default: 9002]."), QCoreApplication::translate("main", "port"), QLatin1String("9002")); - QCommandLineOption log_option(QStringList() << "l" - << "log", - QCoreApplication::translate("main", "Log level for the unisim server [default: trace]."), - QCoreApplication::translate("main", "log"), QLatin1String("trace")); + QCommandLineOption log_option( + QStringList() << "l" + << "log", + QCoreApplication::translate("main", "Log level for the unisim server [default: trace]."), + QCoreApplication::translate("main", "log"), QLatin1String("trace")); QCommandLineOption can_port0_option(QStringList() << "c" << "c0", QCoreApplication::translate("main", "CAN device 0."), QCoreApplication::translate("main", "can device 0.")); @@ -76,7 +77,8 @@ int main(int argc, char *argv[]) // Initialize the logger init_logger(); - spdlog::set_level(magic_enum::enum_cast(parser.value(log_option).toStdString()).value_or(spdlog::level::off)); + spdlog::set_level(magic_enum::enum_cast(parser.value(log_option).toStdString()) + .value_or(spdlog::level::off)); // The server starts in this thread SPDLOG_INFO("Starting server"); diff --git a/server/simulators.cpp b/server/simulators.cpp index 0ab803e..5568287 100644 --- a/server/simulators.cpp +++ b/server/simulators.cpp @@ -162,7 +162,7 @@ void Simulators::switch_simulator(std::string name) [](const char *filename_in, int line_in, const char *funcname_in, int level, QString msg) { if (spdlog::default_logger_raw()->should_log((spdlog::level::level_enum)level)) spdlog::default_logger_raw()->log(spdlog::source_loc{filename_in, line_in, funcname_in}, - (spdlog::level::level_enum)level, msg.toStdString()); + (spdlog::level::level_enum)level, msg.toStdString()); }); this->start(); }