From d8ac1df7896bcf36ef81838a727a8a05dac75d90 Mon Sep 17 00:00:00 2001
From: Dean Lee <deanlee3@gmail.com>
Date: Wed, 16 Jun 2021 15:08:02 +0800
Subject: [PATCH] Qt: cleanup includes (#21282)

* cleanup includes

* remove include <qtwidgets>

* more
old-commit-hash: 2c6d27f4828bc57e69f86aed0d1f48364233dffb
---
 selfdrive/ui/qt/offroad/networking.h  | 2 --
 selfdrive/ui/qt/offroad/onboarding.cc | 4 ----
 selfdrive/ui/qt/offroad/onboarding.h  | 1 -
 selfdrive/ui/qt/offroad/settings.cc   | 2 --
 selfdrive/ui/qt/offroad/settings.h    | 2 --
 selfdrive/ui/qt/offroad/wifiManager.h | 2 +-
 selfdrive/ui/qt/onroad.h              | 7 +++++--
 selfdrive/ui/qt/setup/setup.h         | 2 --
 selfdrive/ui/qt/setup/wifi.cc         | 1 -
 selfdrive/ui/qt/setup/wifi.h          | 3 ---
 selfdrive/ui/qt/sidebar.cc            | 2 ++
 selfdrive/ui/qt/sidebar.h             | 3 ++-
 selfdrive/ui/qt/util.h                | 6 +++++-
 selfdrive/ui/qt/widgets/controls.h    | 1 -
 selfdrive/ui/qt/widgets/keyboard.cc   | 1 -
 selfdrive/ui/qt/widgets/keyboard.h    | 1 +
 selfdrive/ui/qt/widgets/scrollview.cc | 1 +
 selfdrive/ui/qt/widgets/scrollview.h  | 1 -
 selfdrive/ui/qt/widgets/ssh_keys.cc   | 3 ---
 selfdrive/ui/qt/widgets/toggle.cc     | 2 ++
 selfdrive/ui/qt/widgets/toggle.h      | 4 +++-
 selfdrive/ui/qt/window.cc             | 2 ++
 22 files changed, 24 insertions(+), 29 deletions(-)

diff --git a/selfdrive/ui/qt/offroad/networking.h b/selfdrive/ui/qt/offroad/networking.h
index fcadc44ee6..ef0153ee92 100644
--- a/selfdrive/ui/qt/offroad/networking.h
+++ b/selfdrive/ui/qt/offroad/networking.h
@@ -1,8 +1,6 @@
 #pragma once
 
 #include <QButtonGroup>
-#include <QPushButton>
-#include <QStackedWidget>
 #include <QVBoxLayout>
 #include <QWidget>
 
diff --git a/selfdrive/ui/qt/offroad/onboarding.cc b/selfdrive/ui/qt/offroad/onboarding.cc
index ed0552d98c..0842a29e97 100644
--- a/selfdrive/ui/qt/offroad/onboarding.cc
+++ b/selfdrive/ui/qt/offroad/onboarding.cc
@@ -1,18 +1,14 @@
 #include "selfdrive/ui/qt/offroad/onboarding.h"
 
-#include <QDesktopWidget>
 #include <QLabel>
 #include <QPainter>
 #include <QQmlContext>
 #include <QQuickWidget>
 #include <QVBoxLayout>
 
-#include "selfdrive/common/params.h"
 #include "selfdrive/common/util.h"
-#include "selfdrive/ui/qt/home.h"
 #include "selfdrive/ui/qt/widgets/input.h"
 
-
 void TrainingGuide::mouseReleaseEvent(QMouseEvent *e) {
   QPoint touch = QPoint(e->x(), e->y()) - imageCorner;
   //qDebug() << touch.x() << ", " << touch.y();
diff --git a/selfdrive/ui/qt/offroad/onboarding.h b/selfdrive/ui/qt/offroad/onboarding.h
index 51a055d878..584adda4f0 100644
--- a/selfdrive/ui/qt/offroad/onboarding.h
+++ b/selfdrive/ui/qt/offroad/onboarding.h
@@ -4,7 +4,6 @@
 #include <QMouseEvent>
 #include <QPushButton>
 #include <QStackedWidget>
-#include <QTextEdit>
 #include <QWidget>
 
 #include "selfdrive/common/params.h"
diff --git a/selfdrive/ui/qt/offroad/settings.cc b/selfdrive/ui/qt/offroad/settings.cc
index 0fe401da90..1c2480e5b7 100644
--- a/selfdrive/ui/qt/offroad/settings.cc
+++ b/selfdrive/ui/qt/offroad/settings.cc
@@ -16,9 +16,7 @@
 #include "selfdrive/hardware/hw.h"
 #include "selfdrive/ui/qt/widgets/controls.h"
 #include "selfdrive/ui/qt/widgets/input.h"
-#include "selfdrive/ui/qt/widgets/offroad_alerts.h"
 #include "selfdrive/ui/qt/widgets/scrollview.h"
-#include "selfdrive/ui/qt/widgets/ssh_keys.h"
 #include "selfdrive/ui/qt/widgets/toggle.h"
 #include "selfdrive/ui/ui.h"
 #include "selfdrive/ui/qt/util.h"
diff --git a/selfdrive/ui/qt/offroad/settings.h b/selfdrive/ui/qt/offroad/settings.h
index 4d3d3977d3..9670d8d907 100644
--- a/selfdrive/ui/qt/offroad/settings.h
+++ b/selfdrive/ui/qt/offroad/settings.h
@@ -5,9 +5,7 @@
 #include <QFrame>
 #include <QLabel>
 #include <QPushButton>
-#include <QScrollArea>
 #include <QStackedWidget>
-#include <QTimer>
 #include <QWidget>
 
 
diff --git a/selfdrive/ui/qt/offroad/wifiManager.h b/selfdrive/ui/qt/offroad/wifiManager.h
index 9969f9a698..31b1288635 100644
--- a/selfdrive/ui/qt/offroad/wifiManager.h
+++ b/selfdrive/ui/qt/offroad/wifiManager.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <QWidget>
 #include <QtDBus>
+#include <QWidget>
 
 enum class SecurityType {
   OPEN,
diff --git a/selfdrive/ui/qt/onroad.h b/selfdrive/ui/qt/onroad.h
index 5653c41536..ae2cfda8f7 100644
--- a/selfdrive/ui/qt/onroad.h
+++ b/selfdrive/ui/qt/onroad.h
@@ -2,13 +2,16 @@
 
 #include <map>
 
+#include <QOpenGLFunctions>
+#include <QOpenGLWidget>
 #include <QSoundEffect>
-#include <QtWidgets>
+#include <QStackedLayout>
+#include <QWidget>
 
 #include "cereal/gen/cpp/log.capnp.h"
 #include "selfdrive/hardware/hw.h"
-#include "selfdrive/ui/ui.h"
 #include "selfdrive/ui/qt/qt_window.h"
+#include "selfdrive/ui/ui.h"
 
 typedef cereal::CarControl::HUDControl::AudibleAlert AudibleAlert;
 
diff --git a/selfdrive/ui/qt/setup/setup.h b/selfdrive/ui/qt/setup/setup.h
index 251db56bf3..c6764ec688 100644
--- a/selfdrive/ui/qt/setup/setup.h
+++ b/selfdrive/ui/qt/setup/setup.h
@@ -1,5 +1,3 @@
-#include <QLineEdit>
-#include <QPushButton>
 #include <QStackedWidget>
 #include <QString>
 #include <QWidget>
diff --git a/selfdrive/ui/qt/setup/wifi.cc b/selfdrive/ui/qt/setup/wifi.cc
index 08b1e32da6..f31da0c02d 100644
--- a/selfdrive/ui/qt/setup/wifi.cc
+++ b/selfdrive/ui/qt/setup/wifi.cc
@@ -6,7 +6,6 @@
 #include <cstdlib>
 
 #include <QApplication>
-#include <QLabel>
 #include <QVBoxLayout>
 
 #include "selfdrive/ui/qt/offroad/networking.h"
diff --git a/selfdrive/ui/qt/setup/wifi.h b/selfdrive/ui/qt/setup/wifi.h
index faf6dfe45e..cb73b4a9a5 100644
--- a/selfdrive/ui/qt/setup/wifi.h
+++ b/selfdrive/ui/qt/setup/wifi.h
@@ -1,6 +1,3 @@
-#include <QLineEdit>
-#include <QPushButton>
-#include <QString>
 #include <QWidget>
 
 class WifiSetup : public QWidget {
diff --git a/selfdrive/ui/qt/sidebar.cc b/selfdrive/ui/qt/sidebar.cc
index 48f6f1e07a..31542b49f5 100644
--- a/selfdrive/ui/qt/sidebar.cc
+++ b/selfdrive/ui/qt/sidebar.cc
@@ -1,5 +1,7 @@
 #include "selfdrive/ui/qt/sidebar.h"
 
+#include <QMouseEvent>
+
 #include "selfdrive/ui/qt/qt_window.h"
 #include "selfdrive/common/util.h"
 #include "selfdrive/hardware/hw.h"
diff --git a/selfdrive/ui/qt/sidebar.h b/selfdrive/ui/qt/sidebar.h
index fe1ec63647..202912daf0 100644
--- a/selfdrive/ui/qt/sidebar.h
+++ b/selfdrive/ui/qt/sidebar.h
@@ -1,6 +1,7 @@
 #pragma once
 
-#include <QtWidgets>
+#include <QFrame>
+#include <QMap>
 
 #include "selfdrive/ui/ui.h"
 
diff --git a/selfdrive/ui/qt/util.h b/selfdrive/ui/qt/util.h
index 81c06d8a5c..59ff0cf9d8 100644
--- a/selfdrive/ui/qt/util.h
+++ b/selfdrive/ui/qt/util.h
@@ -1,6 +1,10 @@
 #pragma once
 
-#include <QtWidgets>
+#include <QDateTime>
+#include <QLayout>
+#include <QLayoutItem>
+#include <QPainter>
+#include <QSurfaceFormat>
 
 #include "selfdrive/common/params.h"
 
diff --git a/selfdrive/ui/qt/widgets/controls.h b/selfdrive/ui/qt/widgets/controls.h
index ee63e0629d..4ffd04bc10 100644
--- a/selfdrive/ui/qt/widgets/controls.h
+++ b/selfdrive/ui/qt/widgets/controls.h
@@ -4,7 +4,6 @@
 #include <QHBoxLayout>
 #include <QLabel>
 #include <QPushButton>
-#include <QVBoxLayout>
 
 #include "selfdrive/common/params.h"
 #include "selfdrive/ui/qt/widgets/toggle.h"
diff --git a/selfdrive/ui/qt/widgets/keyboard.cc b/selfdrive/ui/qt/widgets/keyboard.cc
index 5838febeb7..b37b7e0e3a 100644
--- a/selfdrive/ui/qt/widgets/keyboard.cc
+++ b/selfdrive/ui/qt/widgets/keyboard.cc
@@ -4,7 +4,6 @@
 #include <QDebug>
 #include <QHBoxLayout>
 #include <QPushButton>
-#include <QStackedLayout>
 #include <QVBoxLayout>
 
 const int DEFAULT_STRETCH = 1;
diff --git a/selfdrive/ui/qt/widgets/keyboard.h b/selfdrive/ui/qt/widgets/keyboard.h
index c89f4fc6a7..14df6c7331 100644
--- a/selfdrive/ui/qt/widgets/keyboard.h
+++ b/selfdrive/ui/qt/widgets/keyboard.h
@@ -7,6 +7,7 @@
 #include <QStackedLayout>
 #include <QString>
 #include <QWidget>
+
 class KeyboardLayout : public QWidget {
   Q_OBJECT
 
diff --git a/selfdrive/ui/qt/widgets/scrollview.cc b/selfdrive/ui/qt/widgets/scrollview.cc
index cf3b5124fc..18cd6ee675 100644
--- a/selfdrive/ui/qt/widgets/scrollview.cc
+++ b/selfdrive/ui/qt/widgets/scrollview.cc
@@ -1,6 +1,7 @@
 #include "selfdrive/ui/qt/widgets/scrollview.h"
 
 #include <QScrollBar>
+#include <QScroller>
 
 ScrollView::ScrollView(QWidget *w, QWidget *parent) : QScrollArea(parent) {
   setWidget(w);
diff --git a/selfdrive/ui/qt/widgets/scrollview.h b/selfdrive/ui/qt/widgets/scrollview.h
index 755ed646fa..024331aa39 100644
--- a/selfdrive/ui/qt/widgets/scrollview.h
+++ b/selfdrive/ui/qt/widgets/scrollview.h
@@ -1,7 +1,6 @@
 #pragma once
 
 #include <QScrollArea>
-#include <QScroller>
 
 class ScrollView : public QScrollArea {
   Q_OBJECT
diff --git a/selfdrive/ui/qt/widgets/ssh_keys.cc b/selfdrive/ui/qt/widgets/ssh_keys.cc
index c71cef5e6a..c8403797c4 100644
--- a/selfdrive/ui/qt/widgets/ssh_keys.cc
+++ b/selfdrive/ui/qt/widgets/ssh_keys.cc
@@ -1,8 +1,5 @@
 #include "selfdrive/ui/qt/widgets/ssh_keys.h"
 
-#include <QHBoxLayout>
-#include <QNetworkReply>
-
 #include "selfdrive/common/params.h"
 #include "selfdrive/ui/qt/api.h"
 #include "selfdrive/ui/qt/widgets/input.h"
diff --git a/selfdrive/ui/qt/widgets/toggle.cc b/selfdrive/ui/qt/widgets/toggle.cc
index f60d97613d..e319f80179 100644
--- a/selfdrive/ui/qt/widgets/toggle.cc
+++ b/selfdrive/ui/qt/widgets/toggle.cc
@@ -1,5 +1,7 @@
 #include "selfdrive/ui/qt/widgets/toggle.h"
 
+#include <QPainter>
+
 Toggle::Toggle(QWidget *parent) : QAbstractButton(parent),
 _height(80),
 _height_rect(60),
diff --git a/selfdrive/ui/qt/widgets/toggle.h b/selfdrive/ui/qt/widgets/toggle.h
index d2773f2073..e7263a008f 100644
--- a/selfdrive/ui/qt/widgets/toggle.h
+++ b/selfdrive/ui/qt/widgets/toggle.h
@@ -1,6 +1,8 @@
 #pragma once
 
-#include <QtWidgets>
+#include <QAbstractButton>
+#include <QMouseEvent>
+#include <QPropertyAnimation>
 
 class Toggle : public QAbstractButton {
   Q_OBJECT
diff --git a/selfdrive/ui/qt/window.cc b/selfdrive/ui/qt/window.cc
index 0eae99e495..8edfb2efae 100644
--- a/selfdrive/ui/qt/window.cc
+++ b/selfdrive/ui/qt/window.cc
@@ -1,5 +1,7 @@
 #include "selfdrive/ui/qt/window.h"
 
+#include <QFontDatabase>
+
 #include "selfdrive/hardware/hw.h"
 
 MainWindow::MainWindow(QWidget *parent) : QWidget(parent) {