diff --git a/UI/ui_button.hpp b/UI/ui_button.hpp index c31a82a..c7a23a3 100644 --- a/UI/ui_button.hpp +++ b/UI/ui_button.hpp @@ -1,5 +1,4 @@ #pragma once - #include "ui_item.hpp" #define UI_BUTTON_TYPE std::string("ui_button") diff --git a/UI/ui_can.hpp b/UI/ui_can.hpp index f191ffb..80edab6 100644 --- a/UI/ui_can.hpp +++ b/UI/ui_can.hpp @@ -1,5 +1,4 @@ #pragma once - #include "ui_item.hpp" #include diff --git a/UI/ui_checkbox.hpp b/UI/ui_checkbox.hpp index a45c64a..7c462b4 100644 --- a/UI/ui_checkbox.hpp +++ b/UI/ui_checkbox.hpp @@ -1,6 +1,5 @@ #pragma once #include "ui_item.hpp" -#include #define UI_CHECKBOX_TYPE std::string("ui_checkbox") diff --git a/UI/ui_combobox.hpp b/UI/ui_combobox.hpp index 24c6b07..2274b7b 100644 --- a/UI/ui_combobox.hpp +++ b/UI/ui_combobox.hpp @@ -1,5 +1,4 @@ #pragma once - #include "ui_item.hpp" #define UI_COMBOBOX_TYPE std::string("ui_combobox") diff --git a/UI/ui_double_spinbox.hpp b/UI/ui_double_spinbox.hpp index 95cc0a8..0ec3123 100644 --- a/UI/ui_double_spinbox.hpp +++ b/UI/ui_double_spinbox.hpp @@ -1,6 +1,4 @@ -#ifndef UI_DOUBLE_SPINBOX_H -#define UI_DOUBLE_SPINBOX_H - +#pragma once #include "ui_item.hpp" #define UI_DOUBLE_SPINBOX_TYPE std::string("ui_double_spinbox") @@ -28,5 +26,3 @@ class UI_double_spinbox : public UI_item double m_max; double m_value; }; - -#endif // UI_DOUBLE_SPINBOX_H diff --git a/UI/ui_hex_spinbox.hpp b/UI/ui_hex_spinbox.hpp index 76cb0fe..1ded6dc 100644 --- a/UI/ui_hex_spinbox.hpp +++ b/UI/ui_hex_spinbox.hpp @@ -1,6 +1,4 @@ -#ifndef UI_HEX_SPINBOX_HPP -#define UI_HEX_SPINBOX_HPP - +#pragma once #include "ui_item.hpp" #define UI_HEX_SPINBOX_TYPE std::string("ui_hex_spinbox") @@ -28,5 +26,3 @@ class UI_hex_spinbox : public UI_item double m_max; double m_value; }; - -#endif // UI_HEX_SPINBOX_HPP diff --git a/UI/ui_plot.hpp b/UI/ui_plot.hpp index b55c58c..e3e9394 100644 --- a/UI/ui_plot.hpp +++ b/UI/ui_plot.hpp @@ -1,6 +1,4 @@ -#ifndef UI_PLOT_H -#define UI_PLOT_H - +#pragma once #include "ui_item.hpp" #define UI_PLOT_TYPE std::string("ui_plot") @@ -35,5 +33,3 @@ class UI_plot : public UI_item bool m_x_label_enabled; bool m_y_label_enabled; }; - -#endif // UI_PLOT_H diff --git a/UI/ui_spinbox.hpp b/UI/ui_spinbox.hpp index 2cf67cc..52cc6ad 100644 --- a/UI/ui_spinbox.hpp +++ b/UI/ui_spinbox.hpp @@ -1,6 +1,4 @@ -#ifndef UI_SPINBOX_HPP -#define UI_SPINBOX_HPP - +#pragma once #include "ui_item.hpp" #define UI_SPINBOX_TYPE std::string("ui_spinbox") @@ -28,5 +26,3 @@ class UI_spinbox : public UI_item double m_max; double m_value; }; - -#endif // UI_SPINBOX_HPP diff --git a/UI/ui_stacked_widget.hpp b/UI/ui_stacked_widget.hpp index c97b677..dd3451d 100644 --- a/UI/ui_stacked_widget.hpp +++ b/UI/ui_stacked_widget.hpp @@ -1,6 +1,4 @@ -#ifndef UI_STACKED_WIDGET_HPP -#define UI_STACKED_WIDGET_HPP - +#pragma once #include "ui_item.hpp" #define UI_STACKED_WIDGET_TYPE std::string("ui_stacked_widget") @@ -22,5 +20,3 @@ class UI_stacked_widget : public UI_item size_t m_tab_count; size_t m_current_tab; }; - -#endif // UI_STACKED_WIDGET_HPP diff --git a/UI/ui_status_bar.hpp b/UI/ui_status_bar.hpp index 2d8708f..08e4973 100644 --- a/UI/ui_status_bar.hpp +++ b/UI/ui_status_bar.hpp @@ -1,6 +1,4 @@ -#ifndef UI_STATUS_BAR_HPP -#define UI_STATUS_BAR_HPP - +#pragma once #include "ui_item.hpp" #define UI_STATUS_BAR_TYPE std::string("ui_status_bar") @@ -21,5 +19,3 @@ class UI_status_bar : public UI_item std::string m_current_message; size_t m_timeout; }; - -#endif // UI_STATUS_BAR_HPP diff --git a/UI/ui_tab_widget.hpp b/UI/ui_tab_widget.hpp index fc7d139..45a829f 100644 --- a/UI/ui_tab_widget.hpp +++ b/UI/ui_tab_widget.hpp @@ -1,6 +1,4 @@ -#ifndef UI_TAB_WIDGET_HPP -#define UI_TAB_WIDGET_HPP - +#pragma once #include "ui_item.hpp" #define UI_TAB_WIDGET_TYPE std::string("ui_tab_widget") @@ -33,5 +31,3 @@ class UI_tab_widget : public UI_item std::vector m_tab_names; std::vector m_tab_visible; }; - -#endif // UI_TAB_WIDGET_HPP diff --git a/UI/ui_table.hpp b/UI/ui_table.hpp index 7f32386..4995eb0 100644 --- a/UI/ui_table.hpp +++ b/UI/ui_table.hpp @@ -1,5 +1,4 @@ -#ifndef UI_TABLE_HPP -#define UI_TABLE_HPP +#pragma once #include "ui_item.hpp" #define UI_TABLE_TYPE std::string("ui_table") @@ -43,5 +42,3 @@ class UI_table : public UI_item std::vector m_valid; std::vector m_table; }; - -#endif // UI_TABLE_HPP diff --git a/client/helpers.hpp b/client/helpers.hpp index 3d35698..a5a60be 100644 --- a/client/helpers.hpp +++ b/client/helpers.hpp @@ -1,6 +1,4 @@ -#ifndef HELPERS_H -#define HELPERS_H - +#pragma once #include #include #include @@ -18,5 +16,3 @@ void set_widget_color(QWidget *widget, QString color, QString bg); QColor widget_bg_color(QWidget *widget); QColor widget_color(QWidget *widget); void reset_widget_color(QWidget *widget); - -#endif // HELPERS_H diff --git a/client/mainwindow.hpp b/client/mainwindow.hpp index 00589a9..bc72d8f 100644 --- a/client/mainwindow.hpp +++ b/client/mainwindow.hpp @@ -1,6 +1,4 @@ -#ifndef MAINWINDOW_H -#define MAINWINDOW_H - +#pragma once #include "networkerror.hpp" #include "simulator_base.hpp" #include "web_socket_wrapper.hpp" @@ -48,5 +46,3 @@ class MainWindow : public QMainWindow std::map> m_sims; }; - -#endif // MAINWINDOW_H diff --git a/client/networkerror.hpp b/client/networkerror.hpp index 8aa7b2e..8ea2d0f 100644 --- a/client/networkerror.hpp +++ b/client/networkerror.hpp @@ -1,6 +1,4 @@ -#ifndef NETWORKERROR_H -#define NETWORKERROR_H - +#pragma once #include namespace Ui @@ -20,5 +18,3 @@ class NetworkError : public QDialog private: Ui::NetworkError *ui; }; - -#endif // NETWORKERROR_H diff --git a/client/simulator_base.hpp b/client/simulator_base.hpp index 905b0cd..368ceb5 100644 --- a/client/simulator_base.hpp +++ b/client/simulator_base.hpp @@ -1,6 +1,4 @@ -#ifndef SIMULATOR_BASE_H -#define SIMULATOR_BASE_H - +#pragma once #include "spdlog/spdlog.h" #include #include @@ -90,5 +88,3 @@ class Simulator_base : public QMainWindow bool m_first_load = true; std::vector m_ui_lookup; }; - -#endif // SIMULATOR_BASE_H diff --git a/client/simulators/can_debugger.hpp b/client/simulators/can_debugger.hpp index e96a09b..ae72b16 100644 --- a/client/simulators/can_debugger.hpp +++ b/client/simulators/can_debugger.hpp @@ -1,6 +1,4 @@ -#ifndef SIM_CAN_DEBUGGER_H -#define SIM_CAN_DEBUGGER_H - +#pragma once #include "simulator_base.hpp" #include @@ -20,5 +18,3 @@ class Can_Debugger : public Simulator_base private: Ui::Can_Debugger *ui; }; - -#endif // SIM_CAN_DEBUGGER_H diff --git a/client/simulators/test.hpp b/client/simulators/test.hpp index a9656f3..5d3d6cb 100644 --- a/client/simulators/test.hpp +++ b/client/simulators/test.hpp @@ -1,6 +1,4 @@ -#ifndef SIM_TEST_H -#define SIM_TEST_H - +#pragma once #include "simulator_base.hpp" #include "web_socket_wrapper.hpp" #include @@ -23,5 +21,3 @@ class Test_Sim : public Simulator_base private: Ui::Test_Sim *ui; }; - -#endif // SIM_TEST_H diff --git a/client/ui/better_radiobutton.hpp b/client/ui/better_radiobutton.hpp index 9ff9ac7..b84766f 100644 --- a/client/ui/better_radiobutton.hpp +++ b/client/ui/better_radiobutton.hpp @@ -1,6 +1,4 @@ -#ifndef BETTER_RADIOBUTTON_H -#define BETTER_RADIOBUTTON_H - +#pragma once #include #include @@ -23,5 +21,3 @@ class Better_Radiobutton : public QWidget std::vector m_radiobuttons; QString m_checked; }; - -#endif // BETTER_RADIOBUTTON_H diff --git a/client/ui/can_transceive.hpp b/client/ui/can_transceive.hpp index ded2332..8798b65 100644 --- a/client/ui/can_transceive.hpp +++ b/client/ui/can_transceive.hpp @@ -1,6 +1,4 @@ -#ifndef CAN_TRANSCEIVE_H -#define CAN_TRANSCEIVE_H - +#pragma once #include "hex_spinbox.hpp" #include @@ -29,5 +27,3 @@ class Can_Transceive : public QWidget Ui::Can_Transceive *ui; std::vector can_send_hexspinboxes; }; - -#endif // CAN_TRANSCEIVE_H diff --git a/client/ui/hex_spinbox.hpp b/client/ui/hex_spinbox.hpp index 69e8931..627c051 100644 --- a/client/ui/hex_spinbox.hpp +++ b/client/ui/hex_spinbox.hpp @@ -1,6 +1,4 @@ -#ifndef _HEXSPINBOX_H_ -#define _HEXSPINBOX_H_ - +#pragma once #include #include #include @@ -28,5 +26,3 @@ class HexSpinBox : public QSpinBox QRegularExpressionValidator *validator; QString format; }; - -#endif // _HEXSPINBOX_H_ diff --git a/client/ui/led.hpp b/client/ui/led.hpp index a3294d4..29293db 100644 --- a/client/ui/led.hpp +++ b/client/ui/led.hpp @@ -1,6 +1,4 @@ -#ifndef LED_H -#define LED_H - +#pragma once #include "QPushButton" class Led : public QPushButton @@ -16,5 +14,3 @@ class Led : public QPushButton bool is_read_only(QWidget *widget); void set_read_only(QWidget *widget, bool read_only); }; - -#endif // LED_H diff --git a/client/ui/plot_wrapper.hpp b/client/ui/plot_wrapper.hpp index 41556e9..13f31aa 100644 --- a/client/ui/plot_wrapper.hpp +++ b/client/ui/plot_wrapper.hpp @@ -1,6 +1,4 @@ -#ifndef PLOT_WRAPPER_HPP -#define PLOT_WRAPPER_HPP - +#pragma once #include #include #include @@ -16,5 +14,3 @@ class Plot_wrapper : public QwtPlot private: QwtPlotCurve *m_curve; }; - -#endif // PLOT_WRAPPER_HPP diff --git a/client/web_socket_wrapper.hpp b/client/web_socket_wrapper.hpp index d4de51c..de420d4 100644 --- a/client/web_socket_wrapper.hpp +++ b/client/web_socket_wrapper.hpp @@ -1,6 +1,4 @@ -#ifndef WEB_SOCKET_WRAPPER_H -#define WEB_SOCKET_WRAPPER_H - +#pragma once #include #include Q_FORWARD_DECLARE_OBJC_CLASS(QWebSocket); @@ -67,5 +65,3 @@ class Web_socket_wrapper : public QObject QTimer *m_ping_timer; QTimer *m_pong_timer; }; - -#endif // WEB_SOCKET_WRAPPER_H diff --git a/external/git_tag_cpp b/external/git_tag_cpp index 9d15e60..ebd8da5 160000 --- a/external/git_tag_cpp +++ b/external/git_tag_cpp @@ -1 +1 @@ -Subproject commit 9d15e605c412639bda1dd1cf752739b2b481583e +Subproject commit ebd8da580367ee7174f220eafe467c38f097f1bf diff --git a/server/VISA/visa.hpp b/server/VISA/visa.hpp index ec7fbe3..ea17ca9 100644 --- a/server/VISA/visa.hpp +++ b/server/VISA/visa.hpp @@ -1,7 +1,4 @@ -#ifndef VISA_HPP -#define VISA_HPP - -#include "tcp_client.hpp" +#pragma once #include class Visa : public QObject @@ -32,5 +29,3 @@ class Visa : public QObject bool m_data_ready; QString m_data; }; - -#endif // VISA_HPP diff --git a/server/gpio/gpio.hpp b/server/gpio/gpio.hpp index dca8956..8f761e5 100644 --- a/server/gpio/gpio.hpp +++ b/server/gpio/gpio.hpp @@ -1,6 +1,4 @@ -#ifndef GPIO_HPP -#define GPIO_HPP - +#pragma once #include #if defined(__linux__) && (defined(__aarch64__) || defined(__x86_64__)) #include @@ -29,5 +27,3 @@ class GPIO : public QObject #endif unsigned int m_offset; }; - -#endif // GPIO_HPP diff --git a/server/simulator_base.hpp b/server/simulator_base.hpp index f027c8e..7584d56 100644 --- a/server/simulator_base.hpp +++ b/server/simulator_base.hpp @@ -1,5 +1,4 @@ #pragma once - #include "spdlog/spdlog.h" #include #include diff --git a/server/websocket.hpp b/server/websocket.hpp index 7297732..bd9558d 100644 --- a/server/websocket.hpp +++ b/server/websocket.hpp @@ -1,5 +1,4 @@ #pragma once - #include #include #include