Qt: cleanup includes (#21282)

* cleanup includes * remove include <qtwidgets> * more old-commit-hash: 2c6d27f482
4 years ago · d8ac1df789
parent 1256dbb6c3
commit d8ac1df789
22 changed files with 24 additions and 29 deletions
--- 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>

--- 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();
--- 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"
--- 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"
--- 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>


--- 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,
--- 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;

--- 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>
--- 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"
--- 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 {
--- 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"
--- 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"

--- 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"

--- 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"
--- 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;
--- 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

--- 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);
--- 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
--- 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"
--- 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),
--- 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
--- 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) {