From 8215718e7a03e8b80f593096377426a44fa3a289 Mon Sep 17 00:00:00 2001 From: Sander Speetjens Date: Thu, 24 Apr 2025 13:26:25 +0200 Subject: [PATCH] client remove includes from sim base header to source --- client/main.cpp | 2 ++ client/mainwindow.cpp | 4 ++++ client/simulator_base.cpp | 5 +++++ client/simulator_base.hpp | 12 ++++++------ 4 files changed, 17 insertions(+), 6 deletions(-) diff --git a/client/main.cpp b/client/main.cpp index b4ce939..ea7b050 100644 --- a/client/main.cpp +++ b/client/main.cpp @@ -3,6 +3,8 @@ #include "spdlog/sinks/stdout_color_sinks.h" #include "spdlog/spdlog.h" #include +#include +#include void init_logger() { diff --git a/client/mainwindow.cpp b/client/mainwindow.cpp index d532dbd..4bdfdfa 100644 --- a/client/mainwindow.cpp +++ b/client/mainwindow.cpp @@ -1,5 +1,9 @@ #include "mainwindow.hpp" #include "ui_mainwindow.h" +#include +#include +#include +#include typedef Simulator_base *(*Get_UI)(Web_socket_wrapper *, QWidget *); diff --git a/client/simulator_base.cpp b/client/simulator_base.cpp index c2b9e2a..10deb60 100644 --- a/client/simulator_base.cpp +++ b/client/simulator_base.cpp @@ -1,6 +1,11 @@ #include "simulator_base.hpp" #include "can_transceive.hpp" +#include "helpers.hpp" +#include "led.hpp" +#include "networkerror.hpp" #include "plot_wrapper.hpp" +#include "web_socket_wrapper.hpp" +#include Simulator_base::Simulator_base(QString sim_name, Web_socket_wrapper *web_socket, QWidget *parent) : QMainWindow{parent}, m_error_dialog(new NetworkError(this)), m_timer_update(new QTimer()), diff --git a/client/simulator_base.hpp b/client/simulator_base.hpp index 4f6b497..8814f4e 100644 --- a/client/simulator_base.hpp +++ b/client/simulator_base.hpp @@ -1,16 +1,16 @@ #ifndef SIMULATOR_BASE_H #define SIMULATOR_BASE_H -#include "IterableEnum.hpp" -#include "helpers.hpp" -#include "led.hpp" -#include "networkerror.hpp" #include "spdlog/spdlog.h" -#include "web_socket_wrapper.hpp" #include #include -#include #include + +Q_FORWARD_DECLARE_OBJC_CLASS(Web_socket_wrapper); +Q_FORWARD_DECLARE_OBJC_CLASS(QTimer); +Q_FORWARD_DECLARE_OBJC_CLASS(NetworkError); +Q_FORWARD_DECLARE_OBJC_CLASS(QLabel); + using json = nlohmann::json; #define PUSH_UI_ITEM(item) push_ui_item(ui->item)