Revert "remove releative include path and change include path order (#…

…678)" This reverts commit e5ece70.
OpenHD · Apr 2, 2024 · 0b2a83e · 0b2a83e
1 parent f7f692d
commit 0b2a83e
Show file tree

Hide file tree

Showing 46 changed files with 155 additions and 149 deletions.
diff --git a/app/osd/horizonladder.h b/app/osd/horizonladder.h
@@ -4,7 +4,7 @@
 #include <QQuickItem>
 #include <QQuickPaintedItem>
 #include <QPainter>
-#include "lib/lqtutils_master/lqtutils_prop.h"
+#include "../../lib/lqtutils_master/lqtutils_prop.h"
 
 class HorizonLadder : public QQuickPaintedItem {
     Q_OBJECT

diff --git a/app/telemetry/MavlinkTelemetry.h b/app/telemetry/MavlinkTelemetry.h
@@ -8,8 +8,8 @@
 #include <thread>
 
 #include "tutil/mavlink_include.h"
-#include "lib/lqtutils_master/lqtutils_prop.h"
-#include "common/TimeHelper.hpp"
+#include "../../lib/lqtutils_master/lqtutils_prop.h"
+#include "../common/TimeHelper.hpp"
 
 #include "connection/udp_connection.h"
 #include "connection/tcp_connection.h"

diff --git a/app/telemetry/action/create_cmd_helper.hpp b/app/telemetry/action/create_cmd_helper.hpp
@@ -1,7 +1,7 @@
 #ifndef CMD_HELPER_H
 #define CMD_HELPER_H
 
-#include "tutil/mavlink_include.h"
+#include "../tutil/mavlink_include.h"
 
 // Here we have various util methods to create mavlink_command_long_t commands
 namespace cmd::helper{

diff --git a/app/telemetry/action/fcaction.cpp b/app/telemetry/action/fcaction.cpp
@@ -1,12 +1,12 @@
 #include "fcaction.h"
 #include "qdebug.h"
 
-#include "logging/hudlogmessagesmodel.h"
-#include "MavlinkTelemetry.h"
+#include "../../logging/hudlogmessagesmodel.h"
+#include "../MavlinkTelemetry.h"
 #include "impl/cmdsender.h"
 
 #include "create_cmd_helper.hpp"
-#include "models/fcmavlinksystem.h"
+#include "../models/fcmavlinksystem.h"
 #include "tutil/mavlink_enum_to_string.h"
 
 FCAction::FCAction(QObject *parent)

diff --git a/app/telemetry/action/fcaction.h b/app/telemetry/action/fcaction.h
@@ -4,8 +4,8 @@
 #include <QObject>
 #include <mutex>
 
-#include "tutil/mavlink_include.h"
-#include "lib/lqtutils_master/lqtutils_prop.h"
+#include "../tutil/mavlink_include.h"
+#include "../../../lib/lqtutils_master/lqtutils_prop.h"
 
 /**
  * This is the one and only class from which messages / actions can be sent to the FC.

diff --git a/app/telemetry/action/fcmissionhandler.cpp b/app/telemetry/action/fcmissionhandler.cpp
@@ -1,9 +1,9 @@
 #include "fcmissionhandler.h"
-#include "tutil/qopenhdmavlinkhelper.hpp"
-#include "tutil/telemetryutil.hpp"
-#include "MavlinkTelemetry.h"
+#include "../tutil/qopenhdmavlinkhelper.hpp"
+#include "../tutil/telemetryutil.hpp"
+#include "../MavlinkTelemetry.h"
 
-#include "models/fcmavlinkmissionitemsmodel.h"
+#include "../models/fcmavlinkmissionitemsmodel.h"
 
 FCMissionHandler::FCMissionHandler(QObject *parent): QObject(parent)
 {

diff --git a/app/telemetry/action/fcmissionhandler.h b/app/telemetry/action/fcmissionhandler.h
@@ -11,9 +11,9 @@
 #include <mutex>
 #include <optional>
 
-#include "lib/lqtutils_master/lqtutils_prop.h"
+#include "../../../lib/lqtutils_master/lqtutils_prop.h"
 
-#include "tutil/mavlink_include.h"
+#include "../tutil/mavlink_include.h"
 
 /**
  * Simple class to (semi-reliably) get all the mission waypoints from the FC and more.

diff --git a/app/telemetry/action/fcmsgintervalhandler.cpp b/app/telemetry/action/fcmsgintervalhandler.cpp
@@ -2,9 +2,9 @@
 
 #include "create_cmd_helper.hpp"
 
-#include "logging/hudlogmessagesmodel.h"
+#include "../../logging/hudlogmessagesmodel.h"
 #include "impl/cmdsender.h"
-#include "MavlinkTelemetry.h"
+#include "../MavlinkTelemetry.h"
 
 FCMsgIntervalHandler &FCMsgIntervalHandler::instance()
 {

diff --git a/app/telemetry/action/fcmsgintervalhandler.h b/app/telemetry/action/fcmsgintervalhandler.h
@@ -7,7 +7,7 @@
 #include <optional>
 #include <qsettings.h>
 
-#include "tutil/mavlink_include.h"
+#include "../tutil/mavlink_include.h"
 
 /**
  * We need to manually request / set the message interval(s) for specific messages on ardupilot

diff --git a/app/telemetry/action/impl/cmdsender.cpp b/app/telemetry/action/impl/cmdsender.cpp
@@ -2,8 +2,8 @@
 
 #include <qdebug.h>
 
-#include "tutil/qopenhdmavlinkhelper.hpp"
-#include "MavlinkTelemetry.h"
+#include "../../tutil/qopenhdmavlinkhelper.hpp"
+#include "../../MavlinkTelemetry.h"
 #include "tutil/mavlink_enum_to_string.h"
 #include <future>
 

diff --git a/app/telemetry/action/impl/cmdsender.h b/app/telemetry/action/impl/cmdsender.h
@@ -1,15 +1,15 @@
 #ifndef CMDSENDER_H
 #define CMDSENDER_H
 
+#include "../../tutil/mavlink_include.h"
+
 #include <optional>
 #include <functional>
 #include <mutex>
 #include <list>
 #include <thread>
 #include <memory>
 
-#include "tutil/mavlink_include.h"
-
 /**
  * Simple, threadsafe class for sending mavlink command (long) over a lossy link.
  */

diff --git a/app/telemetry/action/impl/xparam.cpp b/app/telemetry/action/impl/xparam.cpp
@@ -6,8 +6,7 @@
 #include <future>
 
 #include <qdebug.h>
-
-#include "MavlinkTelemetry.h"
+#include "../../MavlinkTelemetry.h"
 
 XParam::XParam()
 {

diff --git a/app/telemetry/action/impl/xparam.h b/app/telemetry/action/impl/xparam.h
@@ -9,7 +9,7 @@
 #include <functional>
 #include <vector>
 
-#include "tutil/mavlink_include.h"
+#include "../../tutil/mavlink_include.h"
 
 class XParam
 {

diff --git a/app/telemetry/action/ohdaction.cpp b/app/telemetry/action/ohdaction.cpp
@@ -1,7 +1,7 @@
 #include "ohdaction.h"
 
-#include "tutil/openhd_defines.hpp"
 #include "create_cmd_helper.hpp"
+#include "../tutil/openhd_defines.hpp"
 #include "impl/cmdsender.h"
 
 //#include "../models/aohdsystem.h"

diff --git a/app/telemetry/connection/tcp_connection.h b/app/telemetry/connection/tcp_connection.h
@@ -1,6 +1,8 @@
 #ifndef TCPCONNECTION2_H
 #define TCPCONNECTION2_H
 
+#include "../tutil/mavlink_include.h"
+
 #include <thread>
 #include <memory.h>
 #include <atomic>
@@ -9,8 +11,6 @@
 #include <mutex>
 #include <functional>
 
-#include "tutil/mavlink_include.h"
-
 // TCP client connection that handles the following edge-case:
 // If the server becomes unavailable (no message for more than X seconds)
 // disconnect, then continously try re-connecting.

diff --git a/app/telemetry/models/aohdsystem.cpp b/app/telemetry/models/aohdsystem.cpp
@@ -1,26 +1,26 @@
 #include "aohdsystem.h"
 
+#include "../../common/StringHelper.hpp"
+#include "../../common/TimeHelper.hpp"
+#include "QOpenHDVideoHelper.hpp"
+#include "tutil/telemetryutil.hpp"
+#include "wificard.h"
+#include "rcchannelsmodel.h"
+#include "camerastreammodel.h"
+
 #include <string>
 #include <sstream>
 #include <MavlinkTelemetry.h>
 
 #include <logging/logmessagesmodel.h>
 #include <logging/hudlogmessagesmodel.h>
 
-#include "common/StringHelper.hpp"
-#include "common/TimeHelper.hpp"
-#include "QOpenHDVideoHelper.hpp"
-#include "tutil/telemetryutil.hpp"
-#include "wificard.h"
-#include "rcchannelsmodel.h"
-#include "camerastreammodel.h"
-
 #include "util/qopenhd.h"
-#include "tutil/qopenhdmavlinkhelper.hpp"
+#include "../tutil/qopenhdmavlinkhelper.hpp"
 
-#include "util/WorkaroundMessageBox.h"
-#include "settings/wblinksettingshelper.h"
-#include "settings/mavlinksettingsmodel.h"
+#include <../util/WorkaroundMessageBox.h>
+#include "../settings/wblinksettingshelper.h"
+#include "../settings/mavlinksettingsmodel.h"
 
 #include "openhd_core/platform.hpp"
 

diff --git a/app/telemetry/models/aohdsystem.h b/app/telemetry/models/aohdsystem.h
@@ -8,8 +8,9 @@
 #include <QQmlContext>
 #include <atomic>
 
+#include "../tutil/mavlink_include.h"
+
 #include "util/lqutils_include.h"
-#include "tutil/mavlink_include.h"
 #include "tutil/openhd_defines.hpp"
 
 /**

diff --git a/app/telemetry/models/camerastreammodel.cpp b/app/telemetry/models/camerastreammodel.cpp
@@ -1,13 +1,14 @@
 #include "camerastreammodel.h"
+#include "qdebug.h"
+#include "../tutil/telemetryutil.hpp"
+#include "../videostreaming/vscommon/QOpenHDVideoHelper.hpp"
 
-#include <regex>
 #include <qsettings.h>
-#include <qdebug.h>
+#include <regex>
+
+#include <logging/hudlogmessagesmodel.h>
+#include <logging/logmessagesmodel.h>
 
-#include "tutil/telemetryutil.hpp"
-#include "videostreaming/vscommon/QOpenHDVideoHelper.hpp"
-#include "logging/hudlogmessagesmodel.h"
-#include "logging/logmessagesmodel.h"
 #include "openhd_core/camera.hpp"
 
 static std::string video_codec_to_string(int value){

diff --git a/app/telemetry/models/camerastreammodel.h b/app/telemetry/models/camerastreammodel.h
@@ -3,7 +3,8 @@
 
 #include <QObject>
 
-#include "tutil/mavlink_include.h"
+#include "../tutil/mavlink_include.h"
+
 #include "util/lqutils_include.h"
 
 // NOTE1: This class exists to avoid duplicated code for primary and secondary camera(stream)-stats displayed in the HUD

diff --git a/app/telemetry/models/fcmavlinksystem.cpp b/app/telemetry/models/fcmavlinksystem.cpp
@@ -1,17 +1,22 @@
 #include "fcmavlinksystem.h"
+#include "rcchannelsmodel.h"
 
 #include <QDebug>
+#include "util/qopenhd.h"
+
+#include "../tutil/geodesi_helper.h"
+
 #include <QDateTime>
 
-#include "util/qopenhd.h"
-#include "tutil/geodesi_helper.h"
-#include "logging/logmessagesmodel.h"
-#include "logging/hudlogmessagesmodel.h"
+#include <logging/logmessagesmodel.h>
+#include <logging/hudlogmessagesmodel.h>
+
 #include "tutil/qopenhdmavlinkhelper.hpp"
 #include "tutil/telemetryutil.hpp"
-#include "action/fcaction.h"
-#include "rcchannelsmodel.h"
 
+#include "../action/fcaction.h"
+
+#include <QDateTime>
 
 FCMavlinkSystem::FCMavlinkSystem(QObject *parent): QObject(parent) {
     m_flight_time_timer = std::make_unique<QTimer>(this);

diff --git a/app/telemetry/models/fcmavlinksystem.h b/app/telemetry/models/fcmavlinksystem.h
@@ -1,16 +1,17 @@
 #ifndef FC_MAVLINK_SYSTEM_H
 #define FC_MAVLINK_SYSTEM_H
 
-#include <atomic>
-#include <optional>
-#include <memory>
-
 #include <QElapsedTimer>
 #include <QObject>
 #include <QTimer>
 #include <QQmlContext>
 
-#include "tutil/mavlink_include.h"
+#include "../tutil/mavlink_include.h"
+
+#include <atomic>
+#include <optional>
+#include <memory>
+
 #include "util/lqutils_include.h"
 
 /**

diff --git a/app/telemetry/models/rcchannelsmodel.cpp b/app/telemetry/models/rcchannelsmodel.cpp
@@ -1,6 +1,6 @@
 #include "rcchannelsmodel.h"
-#include <qdebug.h>
-#include "tutil/qopenhdmavlinkhelper.hpp"
+#include "qdebug.h"
+#include "../tutil/qopenhdmavlinkhelper.hpp"
 
 
 

diff --git a/app/telemetry/models/wificard.cpp b/app/telemetry/models/wificard.cpp
@@ -2,7 +2,7 @@
 
 #include <sstream>
 
-#include "logging/hudlogmessagesmodel.h"
+#include "../../logging/hudlogmessagesmodel.h"
 #include "tutil/qopenhdmavlinkhelper.hpp"
 
 

diff --git a/app/telemetry/models/wificard.h b/app/telemetry/models/wificard.h
@@ -2,12 +2,10 @@
 #define WIFICARD_H
 
 #include <memory>
-
 #include <qobject.h>
 #include <qtimer.h>
-
 #include "util/lqutils_include.h"
-#include "tutil/mavlink_include.h"
+#include "../tutil/mavlink_include.h"
 
 // Stats unique per each connected (wifibroadcast) wfi card
 // Air has only one card, ground can have one or more card(s)

diff --git a/app/telemetry/settings/mavlinksettingsmodel.cpp b/app/telemetry/settings/mavlinksettingsmodel.cpp
@@ -1,20 +1,20 @@
 #include "mavlinksettingsmodel.h"
-
-#include <qdebug.h>
-#include <QSettings>
-#include <QVariant>
-
+#include "qdebug.h"
 #include "documentedparam.h"
 
-#include "util/qopenhd.h"
+#include "../../util/qopenhd.h"
 #include "improvedintsetting.h"
 #include "improvedstringsetting.h"
 #include "tutil/openhd_defines.hpp"
-#include "action/impl/xparam.h"
+
+#include <QSettings>
+#include <QVariant>
+
+#include "../action/impl/xparam.h"
 // Dirty
-#include "models/openhd_core/camera.hpp"
-#include "models/aohdsystem.h"
-#include "util/WorkaroundMessageBox.h"
+#include "../models/openhd_core/camera.hpp"
+#include "../models/aohdsystem.h"
+#include "../util/WorkaroundMessageBox.h"
 
 MavlinkSettingsModel &MavlinkSettingsModel::instanceAirCamera()
 {

diff --git a/app/telemetry/settings/mavlinksettingsmodel.h b/app/telemetry/settings/mavlinksettingsmodel.h
@@ -9,9 +9,9 @@
 #include <mutex>
 #include <QJSValue>
 
-#include "tutil/mavlink_include.h"
-#include "lib/lqtutils_master/lqtutils_prop.h"
-#include "action/impl/xparam.h"
+#include "../tutil/mavlink_include.h"
+#include "../../../lib/lqtutils_master/lqtutils_prop.h"
+#include "../action/impl/xparam.h"
 
 // A QT wrapper around the mavlink extended / non-extended parameters protocoll on the client
 // (the side that changes parameter(s) provided by a specific system & component).