From b06b3ecb60c651dacf079513635f7d9d99228783 Mon Sep 17 00:00:00 2001 From: Dean Lee Date: Wed, 9 Jun 2021 03:09:30 +0800 Subject: [PATCH] Use full include path (#21194) --- selfdrive/camerad/cameras/camera_qcom2.cc | 3 ++- selfdrive/camerad/transforms/rgb_to_yuv.cc | 2 +- selfdrive/common/swaglog.cc | 2 +- selfdrive/common/visionimg.h | 2 +- selfdrive/modeld/models/commonmodel.cc | 2 +- selfdrive/modeld/models/dmonitoring.cc | 3 ++- selfdrive/modeld/models/driving.cc | 3 +-- selfdrive/modeld/runners/onnxmodel.cc | 2 +- selfdrive/modeld/runners/thneedmodel.cc | 2 +- selfdrive/modeld/transforms/loadyuv.cc | 2 +- selfdrive/modeld/transforms/transform.cc | 2 +- selfdrive/ui/paint.cc | 2 +- selfdrive/ui/qt/maps/map.cc | 3 ++- selfdrive/ui/qt/maps/map_helpers.cc | 3 ++- selfdrive/ui/qt/offroad/networking.cc | 2 +- selfdrive/ui/qt/offroad/onboarding.cc | 2 +- selfdrive/ui/qt/offroad/settings.cc | 2 +- selfdrive/ui/qt/offroad/wifiManager.cc | 2 +- selfdrive/ui/qt/request_repeater.cc | 2 +- selfdrive/ui/qt/setup/setup.cc | 2 +- selfdrive/ui/qt/setup/wifi.cc | 2 +- selfdrive/ui/qt/spinner.cc | 2 +- selfdrive/ui/qt/widgets/controls.cc | 2 +- selfdrive/ui/qt/widgets/drive_stats.cc | 2 +- selfdrive/ui/qt/widgets/input.cc | 2 +- selfdrive/ui/qt/widgets/keyboard.cc | 2 +- selfdrive/ui/qt/widgets/offroad_alerts.cc | 2 +- selfdrive/ui/qt/widgets/scrollview.cc | 2 +- selfdrive/ui/qt/widgets/setup.cc | 2 +- selfdrive/ui/qt/widgets/ssh_keys.cc | 2 +- selfdrive/ui/qt/widgets/toggle.cc | 2 +- selfdrive/ui/qt/window.cc | 2 +- 32 files changed, 36 insertions(+), 33 deletions(-) diff --git a/selfdrive/camerad/cameras/camera_qcom2.cc b/selfdrive/camerad/cameras/camera_qcom2.cc index 44f77d80b6..a81779e941 100644 --- a/selfdrive/camerad/cameras/camera_qcom2.cc +++ b/selfdrive/camerad/cameras/camera_qcom2.cc @@ -1,3 +1,5 @@ +#include "selfdrive/camerad/cameras/camera_qcom2.h" + #include #include #include @@ -19,7 +21,6 @@ #include "sensor2_i2c.h" #include "selfdrive/common/swaglog.h" -#include "selfdrive/camerad/cameras/camera_qcom2.h" #define FRAME_WIDTH 1928 #define FRAME_HEIGHT 1208 diff --git a/selfdrive/camerad/transforms/rgb_to_yuv.cc b/selfdrive/camerad/transforms/rgb_to_yuv.cc index 1fdeb593db..661568fc62 100644 --- a/selfdrive/camerad/transforms/rgb_to_yuv.cc +++ b/selfdrive/camerad/transforms/rgb_to_yuv.cc @@ -1,4 +1,4 @@ -#include "rgb_to_yuv.h" +#include "selfdrive/camerad/transforms/rgb_to_yuv.h" #include diff --git a/selfdrive/common/swaglog.cc b/selfdrive/common/swaglog.cc index 80d2379d97..c42d486422 100644 --- a/selfdrive/common/swaglog.cc +++ b/selfdrive/common/swaglog.cc @@ -2,7 +2,7 @@ #define _GNU_SOURCE #endif -#include "swaglog.h" +#include "selfdrive/common/swaglog.h" #include #include diff --git a/selfdrive/common/visionimg.h b/selfdrive/common/visionimg.h index cf3b36b79a..e8917f3bd6 100644 --- a/selfdrive/common/visionimg.h +++ b/selfdrive/common/visionimg.h @@ -1,6 +1,6 @@ #pragma once -#include "visionbuf.h" +#include "cereal/visionipc/visionbuf.h" #ifdef __APPLE__ #include diff --git a/selfdrive/modeld/models/commonmodel.cc b/selfdrive/modeld/models/commonmodel.cc index 495bfe7829..30ee1b4e3e 100644 --- a/selfdrive/modeld/models/commonmodel.cc +++ b/selfdrive/modeld/models/commonmodel.cc @@ -1,4 +1,4 @@ -#include "commonmodel.h" +#include "selfdrive/modeld/models/commonmodel.h" #include #include diff --git a/selfdrive/modeld/models/dmonitoring.cc b/selfdrive/modeld/models/dmonitoring.cc index 9a1b8723a7..9425128b32 100644 --- a/selfdrive/modeld/models/dmonitoring.cc +++ b/selfdrive/modeld/models/dmonitoring.cc @@ -1,3 +1,5 @@ +#include "selfdrive/modeld/models/dmonitoring.h" + #include #include "libyuv.h" @@ -6,7 +8,6 @@ #include "selfdrive/common/params.h" #include "selfdrive/common/timing.h" #include "selfdrive/hardware/hw.h" -#include "selfdrive/modeld/models/dmonitoring.h" #define MODEL_WIDTH 320 #define MODEL_HEIGHT 640 diff --git a/selfdrive/modeld/models/driving.cc b/selfdrive/modeld/models/driving.cc index aea0d43194..29c227c7a4 100644 --- a/selfdrive/modeld/models/driving.cc +++ b/selfdrive/modeld/models/driving.cc @@ -1,5 +1,4 @@ - -#include "driving.h" +#include "selfdrive/modeld/models/driving.h" #include #include diff --git a/selfdrive/modeld/runners/onnxmodel.cc b/selfdrive/modeld/runners/onnxmodel.cc index 8631c62861..5df30e5af4 100644 --- a/selfdrive/modeld/runners/onnxmodel.cc +++ b/selfdrive/modeld/runners/onnxmodel.cc @@ -1,4 +1,4 @@ -#include "onnxmodel.h" +#include "selfdrive/modeld/runners/onnxmodel.h" #include #include diff --git a/selfdrive/modeld/runners/thneedmodel.cc b/selfdrive/modeld/runners/thneedmodel.cc index c83a58b029..1dec72dd42 100644 --- a/selfdrive/modeld/runners/thneedmodel.cc +++ b/selfdrive/modeld/runners/thneedmodel.cc @@ -1,4 +1,4 @@ -#include "thneedmodel.h" +#include "selfdrive/modeld/runners/thneedmodel.h" #include diff --git a/selfdrive/modeld/transforms/loadyuv.cc b/selfdrive/modeld/transforms/loadyuv.cc index d3686a667e..04a12a8525 100644 --- a/selfdrive/modeld/transforms/loadyuv.cc +++ b/selfdrive/modeld/transforms/loadyuv.cc @@ -1,4 +1,4 @@ -#include "loadyuv.h" +#include "selfdrive/modeld/transforms/loadyuv.h" #include #include diff --git a/selfdrive/modeld/transforms/transform.cc b/selfdrive/modeld/transforms/transform.cc index 6cf48220a1..f3e30fd1ce 100644 --- a/selfdrive/modeld/transforms/transform.cc +++ b/selfdrive/modeld/transforms/transform.cc @@ -1,4 +1,4 @@ -#include "transform.h" +#include "selfdrive/modeld/transforms/transform.h" #include #include diff --git a/selfdrive/ui/paint.cc b/selfdrive/ui/paint.cc index eb834ef9fd..353cacbca4 100644 --- a/selfdrive/ui/paint.cc +++ b/selfdrive/ui/paint.cc @@ -1,4 +1,4 @@ -#include "paint.h" +#include "selfdrive/ui/paint.h" #include diff --git a/selfdrive/ui/qt/maps/map.cc b/selfdrive/ui/qt/maps/map.cc index 61e05367fe..010fa9673d 100644 --- a/selfdrive/ui/qt/maps/map.cc +++ b/selfdrive/ui/qt/maps/map.cc @@ -1,3 +1,5 @@ +#include "selfdrive/ui/qt/maps/map.h" + #include #include @@ -8,7 +10,6 @@ #include "selfdrive/ui/ui.h" #include "selfdrive/ui/qt/util.h" #include "selfdrive/ui/qt/maps/map_helpers.h" -#include "selfdrive/ui/qt/maps/map.h" const int PAN_TIMEOUT = 100; diff --git a/selfdrive/ui/qt/maps/map_helpers.cc b/selfdrive/ui/qt/maps/map_helpers.cc index 8778e23be0..e841a6f1d4 100644 --- a/selfdrive/ui/qt/maps/map_helpers.cc +++ b/selfdrive/ui/qt/maps/map_helpers.cc @@ -1,7 +1,8 @@ +#include "selfdrive/ui/qt/maps/map_helpers.h" + #include #include -#include "selfdrive/ui/qt/maps/map_helpers.h" #include "selfdrive/common/params.h" diff --git a/selfdrive/ui/qt/offroad/networking.cc b/selfdrive/ui/qt/offroad/networking.cc index 901315ac52..d38268213f 100644 --- a/selfdrive/ui/qt/offroad/networking.cc +++ b/selfdrive/ui/qt/offroad/networking.cc @@ -1,4 +1,4 @@ -#include "networking.h" +#include "selfdrive/ui/qt/offroad/networking.h" #include #include diff --git a/selfdrive/ui/qt/offroad/onboarding.cc b/selfdrive/ui/qt/offroad/onboarding.cc index c0ede84a64..6cfc2e13b9 100644 --- a/selfdrive/ui/qt/offroad/onboarding.cc +++ b/selfdrive/ui/qt/offroad/onboarding.cc @@ -1,4 +1,4 @@ -#include "onboarding.h" +#include "selfdrive/ui/qt/offroad/onboarding.h" #include #include diff --git a/selfdrive/ui/qt/offroad/settings.cc b/selfdrive/ui/qt/offroad/settings.cc index 9b75080a90..ff0a345cd7 100644 --- a/selfdrive/ui/qt/offroad/settings.cc +++ b/selfdrive/ui/qt/offroad/settings.cc @@ -1,4 +1,4 @@ -#include "settings.h" +#include "selfdrive/ui/qt/offroad/settings.h" #include #include diff --git a/selfdrive/ui/qt/offroad/wifiManager.cc b/selfdrive/ui/qt/offroad/wifiManager.cc index 7ffaccb1c1..1e2cccb507 100644 --- a/selfdrive/ui/qt/offroad/wifiManager.cc +++ b/selfdrive/ui/qt/offroad/wifiManager.cc @@ -1,4 +1,4 @@ -#include "wifiManager.h" +#include "selfdrive/ui/qt/offroad/wifiManager.h" #include diff --git a/selfdrive/ui/qt/request_repeater.cc b/selfdrive/ui/qt/request_repeater.cc index ee6680cc78..601589eceb 100644 --- a/selfdrive/ui/qt/request_repeater.cc +++ b/selfdrive/ui/qt/request_repeater.cc @@ -1,4 +1,4 @@ -#include "request_repeater.h" +#include "selfdrive/ui/qt/request_repeater.h" RequestRepeater::RequestRepeater(QObject *parent, const QString &requestURL, const QString &cacheKey, int period) : HttpRequest(parent, requestURL, cacheKey) { diff --git a/selfdrive/ui/qt/setup/setup.cc b/selfdrive/ui/qt/setup/setup.cc index 4be0e0bc30..1c6fbdef0f 100644 --- a/selfdrive/ui/qt/setup/setup.cc +++ b/selfdrive/ui/qt/setup/setup.cc @@ -1,4 +1,4 @@ -#include "setup.h" +#include "selfdrive/ui/qt/setup/setup.h" #include #include diff --git a/selfdrive/ui/qt/setup/wifi.cc b/selfdrive/ui/qt/setup/wifi.cc index 7791614111..be32bdc073 100644 --- a/selfdrive/ui/qt/setup/wifi.cc +++ b/selfdrive/ui/qt/setup/wifi.cc @@ -1,4 +1,4 @@ -#include "wifi.h" +#include "selfdrive/ui/qt/setup/wifi.h" #include #include diff --git a/selfdrive/ui/qt/spinner.cc b/selfdrive/ui/qt/spinner.cc index b91bd7bc4a..79a4f1049d 100644 --- a/selfdrive/ui/qt/spinner.cc +++ b/selfdrive/ui/qt/spinner.cc @@ -1,4 +1,4 @@ -#include "spinner.h" +#include "selfdrive/ui/qt/spinner.h" #include #include diff --git a/selfdrive/ui/qt/widgets/controls.cc b/selfdrive/ui/qt/widgets/controls.cc index 24c586113e..a3b23f36cd 100644 --- a/selfdrive/ui/qt/widgets/controls.cc +++ b/selfdrive/ui/qt/widgets/controls.cc @@ -1,4 +1,4 @@ -#include "controls.h" +#include "selfdrive/ui/qt/widgets/controls.h" QFrame *horizontal_line(QWidget *parent) { QFrame *line = new QFrame(parent); diff --git a/selfdrive/ui/qt/widgets/drive_stats.cc b/selfdrive/ui/qt/widgets/drive_stats.cc index 1395c150c5..a0bca85115 100644 --- a/selfdrive/ui/qt/widgets/drive_stats.cc +++ b/selfdrive/ui/qt/widgets/drive_stats.cc @@ -1,4 +1,4 @@ -#include "drive_stats.h" +#include "selfdrive/ui/qt/widgets/drive_stats.h" #include #include diff --git a/selfdrive/ui/qt/widgets/input.cc b/selfdrive/ui/qt/widgets/input.cc index 4e9d2e668a..80b533cb12 100644 --- a/selfdrive/ui/qt/widgets/input.cc +++ b/selfdrive/ui/qt/widgets/input.cc @@ -1,4 +1,4 @@ -#include "input.h" +#include "selfdrive/ui/qt/widgets/input.h" #include diff --git a/selfdrive/ui/qt/widgets/keyboard.cc b/selfdrive/ui/qt/widgets/keyboard.cc index 6613897b18..1f81ba718f 100644 --- a/selfdrive/ui/qt/widgets/keyboard.cc +++ b/selfdrive/ui/qt/widgets/keyboard.cc @@ -1,4 +1,4 @@ -#include "keyboard.h" +#include "selfdrive/ui/qt/widgets/keyboard.h" #include #include diff --git a/selfdrive/ui/qt/widgets/offroad_alerts.cc b/selfdrive/ui/qt/widgets/offroad_alerts.cc index 7816b251f9..d067327b7b 100644 --- a/selfdrive/ui/qt/widgets/offroad_alerts.cc +++ b/selfdrive/ui/qt/widgets/offroad_alerts.cc @@ -1,4 +1,4 @@ -#include "offroad_alerts.h" +#include "selfdrive/ui/qt/widgets/offroad_alerts.h" #include #include diff --git a/selfdrive/ui/qt/widgets/scrollview.cc b/selfdrive/ui/qt/widgets/scrollview.cc index 31be17c7bf..b9992f4b2f 100644 --- a/selfdrive/ui/qt/widgets/scrollview.cc +++ b/selfdrive/ui/qt/widgets/scrollview.cc @@ -1,4 +1,4 @@ -#include "scrollview.h" +#include "selfdrive/ui/qt/widgets/scrollview.h" #include diff --git a/selfdrive/ui/qt/widgets/setup.cc b/selfdrive/ui/qt/widgets/setup.cc index 2633220eaa..c0b044273b 100644 --- a/selfdrive/ui/qt/widgets/setup.cc +++ b/selfdrive/ui/qt/widgets/setup.cc @@ -1,4 +1,4 @@ -#include "setup.h" +#include "selfdrive/ui/qt/widgets/setup.h" #include #include diff --git a/selfdrive/ui/qt/widgets/ssh_keys.cc b/selfdrive/ui/qt/widgets/ssh_keys.cc index 4facaf1b07..c71cef5e6a 100644 --- a/selfdrive/ui/qt/widgets/ssh_keys.cc +++ b/selfdrive/ui/qt/widgets/ssh_keys.cc @@ -1,4 +1,4 @@ -#include "ssh_keys.h" +#include "selfdrive/ui/qt/widgets/ssh_keys.h" #include #include diff --git a/selfdrive/ui/qt/widgets/toggle.cc b/selfdrive/ui/qt/widgets/toggle.cc index d4eb215d34..c07ada2313 100644 --- a/selfdrive/ui/qt/widgets/toggle.cc +++ b/selfdrive/ui/qt/widgets/toggle.cc @@ -1,4 +1,4 @@ -#include "toggle.h" +#include "selfdrive/ui/qt/widgets/toggle.h" Toggle::Toggle(QWidget *parent) : QAbstractButton(parent), _height(80), diff --git a/selfdrive/ui/qt/window.cc b/selfdrive/ui/qt/window.cc index fe7539616d..ea5ae1ce0d 100644 --- a/selfdrive/ui/qt/window.cc +++ b/selfdrive/ui/qt/window.cc @@ -1,4 +1,4 @@ -#include "window.h" +#include "selfdrive/ui/qt/window.h" #include "selfdrive/hardware/hw.h"