Qt: cleanup includes (#21282)

* cleanup includes

* remove include <qtwidgets>

* more
old-commit-hash: 2c6d27f482
commatwo_master
Dean Lee 4 years ago committed by GitHub
parent 1256dbb6c3
commit d8ac1df789
  1. 2
      selfdrive/ui/qt/offroad/networking.h
  2. 4
      selfdrive/ui/qt/offroad/onboarding.cc
  3. 1
      selfdrive/ui/qt/offroad/onboarding.h
  4. 2
      selfdrive/ui/qt/offroad/settings.cc
  5. 2
      selfdrive/ui/qt/offroad/settings.h
  6. 2
      selfdrive/ui/qt/offroad/wifiManager.h
  7. 7
      selfdrive/ui/qt/onroad.h
  8. 2
      selfdrive/ui/qt/setup/setup.h
  9. 1
      selfdrive/ui/qt/setup/wifi.cc
  10. 3
      selfdrive/ui/qt/setup/wifi.h
  11. 2
      selfdrive/ui/qt/sidebar.cc
  12. 3
      selfdrive/ui/qt/sidebar.h
  13. 6
      selfdrive/ui/qt/util.h
  14. 1
      selfdrive/ui/qt/widgets/controls.h
  15. 1
      selfdrive/ui/qt/widgets/keyboard.cc
  16. 1
      selfdrive/ui/qt/widgets/keyboard.h
  17. 1
      selfdrive/ui/qt/widgets/scrollview.cc
  18. 1
      selfdrive/ui/qt/widgets/scrollview.h
  19. 3
      selfdrive/ui/qt/widgets/ssh_keys.cc
  20. 2
      selfdrive/ui/qt/widgets/toggle.cc
  21. 4
      selfdrive/ui/qt/widgets/toggle.h
  22. 2
      selfdrive/ui/qt/window.cc

@ -1,8 +1,6 @@
#pragma once #pragma once
#include <QButtonGroup> #include <QButtonGroup>
#include <QPushButton>
#include <QStackedWidget>
#include <QVBoxLayout> #include <QVBoxLayout>
#include <QWidget> #include <QWidget>

@ -1,18 +1,14 @@
#include "selfdrive/ui/qt/offroad/onboarding.h" #include "selfdrive/ui/qt/offroad/onboarding.h"
#include <QDesktopWidget>
#include <QLabel> #include <QLabel>
#include <QPainter> #include <QPainter>
#include <QQmlContext> #include <QQmlContext>
#include <QQuickWidget> #include <QQuickWidget>
#include <QVBoxLayout> #include <QVBoxLayout>
#include "selfdrive/common/params.h"
#include "selfdrive/common/util.h" #include "selfdrive/common/util.h"
#include "selfdrive/ui/qt/home.h"
#include "selfdrive/ui/qt/widgets/input.h" #include "selfdrive/ui/qt/widgets/input.h"
void TrainingGuide::mouseReleaseEvent(QMouseEvent *e) { void TrainingGuide::mouseReleaseEvent(QMouseEvent *e) {
QPoint touch = QPoint(e->x(), e->y()) - imageCorner; QPoint touch = QPoint(e->x(), e->y()) - imageCorner;
//qDebug() << touch.x() << ", " << touch.y(); //qDebug() << touch.x() << ", " << touch.y();

@ -4,7 +4,6 @@
#include <QMouseEvent> #include <QMouseEvent>
#include <QPushButton> #include <QPushButton>
#include <QStackedWidget> #include <QStackedWidget>
#include <QTextEdit>
#include <QWidget> #include <QWidget>
#include "selfdrive/common/params.h" #include "selfdrive/common/params.h"

@ -16,9 +16,7 @@
#include "selfdrive/hardware/hw.h" #include "selfdrive/hardware/hw.h"
#include "selfdrive/ui/qt/widgets/controls.h" #include "selfdrive/ui/qt/widgets/controls.h"
#include "selfdrive/ui/qt/widgets/input.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/scrollview.h"
#include "selfdrive/ui/qt/widgets/ssh_keys.h"
#include "selfdrive/ui/qt/widgets/toggle.h" #include "selfdrive/ui/qt/widgets/toggle.h"
#include "selfdrive/ui/ui.h" #include "selfdrive/ui/ui.h"
#include "selfdrive/ui/qt/util.h" #include "selfdrive/ui/qt/util.h"

@ -5,9 +5,7 @@
#include <QFrame> #include <QFrame>
#include <QLabel> #include <QLabel>
#include <QPushButton> #include <QPushButton>
#include <QScrollArea>
#include <QStackedWidget> #include <QStackedWidget>
#include <QTimer>
#include <QWidget> #include <QWidget>

@ -1,7 +1,7 @@
#pragma once #pragma once
#include <QWidget>
#include <QtDBus> #include <QtDBus>
#include <QWidget>
enum class SecurityType { enum class SecurityType {
OPEN, OPEN,

@ -2,13 +2,16 @@
#include <map> #include <map>
#include <QOpenGLFunctions>
#include <QOpenGLWidget>
#include <QSoundEffect> #include <QSoundEffect>
#include <QtWidgets> #include <QStackedLayout>
#include <QWidget>
#include "cereal/gen/cpp/log.capnp.h" #include "cereal/gen/cpp/log.capnp.h"
#include "selfdrive/hardware/hw.h" #include "selfdrive/hardware/hw.h"
#include "selfdrive/ui/ui.h"
#include "selfdrive/ui/qt/qt_window.h" #include "selfdrive/ui/qt/qt_window.h"
#include "selfdrive/ui/ui.h"
typedef cereal::CarControl::HUDControl::AudibleAlert AudibleAlert; typedef cereal::CarControl::HUDControl::AudibleAlert AudibleAlert;

@ -1,5 +1,3 @@
#include <QLineEdit>
#include <QPushButton>
#include <QStackedWidget> #include <QStackedWidget>
#include <QString> #include <QString>
#include <QWidget> #include <QWidget>

@ -6,7 +6,6 @@
#include <cstdlib> #include <cstdlib>
#include <QApplication> #include <QApplication>
#include <QLabel>
#include <QVBoxLayout> #include <QVBoxLayout>
#include "selfdrive/ui/qt/offroad/networking.h" #include "selfdrive/ui/qt/offroad/networking.h"

@ -1,6 +1,3 @@
#include <QLineEdit>
#include <QPushButton>
#include <QString>
#include <QWidget> #include <QWidget>
class WifiSetup : public QWidget { class WifiSetup : public QWidget {

@ -1,5 +1,7 @@
#include "selfdrive/ui/qt/sidebar.h" #include "selfdrive/ui/qt/sidebar.h"
#include <QMouseEvent>
#include "selfdrive/ui/qt/qt_window.h" #include "selfdrive/ui/qt/qt_window.h"
#include "selfdrive/common/util.h" #include "selfdrive/common/util.h"
#include "selfdrive/hardware/hw.h" #include "selfdrive/hardware/hw.h"

@ -1,6 +1,7 @@
#pragma once #pragma once
#include <QtWidgets> #include <QFrame>
#include <QMap>
#include "selfdrive/ui/ui.h" #include "selfdrive/ui/ui.h"

@ -1,6 +1,10 @@
#pragma once #pragma once
#include <QtWidgets> #include <QDateTime>
#include <QLayout>
#include <QLayoutItem>
#include <QPainter>
#include <QSurfaceFormat>
#include "selfdrive/common/params.h" #include "selfdrive/common/params.h"

@ -4,7 +4,6 @@
#include <QHBoxLayout> #include <QHBoxLayout>
#include <QLabel> #include <QLabel>
#include <QPushButton> #include <QPushButton>
#include <QVBoxLayout>
#include "selfdrive/common/params.h" #include "selfdrive/common/params.h"
#include "selfdrive/ui/qt/widgets/toggle.h" #include "selfdrive/ui/qt/widgets/toggle.h"

@ -4,7 +4,6 @@
#include <QDebug> #include <QDebug>
#include <QHBoxLayout> #include <QHBoxLayout>
#include <QPushButton> #include <QPushButton>
#include <QStackedLayout>
#include <QVBoxLayout> #include <QVBoxLayout>
const int DEFAULT_STRETCH = 1; const int DEFAULT_STRETCH = 1;

@ -7,6 +7,7 @@
#include <QStackedLayout> #include <QStackedLayout>
#include <QString> #include <QString>
#include <QWidget> #include <QWidget>
class KeyboardLayout : public QWidget { class KeyboardLayout : public QWidget {
Q_OBJECT Q_OBJECT

@ -1,6 +1,7 @@
#include "selfdrive/ui/qt/widgets/scrollview.h" #include "selfdrive/ui/qt/widgets/scrollview.h"
#include <QScrollBar> #include <QScrollBar>
#include <QScroller>
ScrollView::ScrollView(QWidget *w, QWidget *parent) : QScrollArea(parent) { ScrollView::ScrollView(QWidget *w, QWidget *parent) : QScrollArea(parent) {
setWidget(w); setWidget(w);

@ -1,7 +1,6 @@
#pragma once #pragma once
#include <QScrollArea> #include <QScrollArea>
#include <QScroller>
class ScrollView : public QScrollArea { class ScrollView : public QScrollArea {
Q_OBJECT Q_OBJECT

@ -1,8 +1,5 @@
#include "selfdrive/ui/qt/widgets/ssh_keys.h" #include "selfdrive/ui/qt/widgets/ssh_keys.h"
#include <QHBoxLayout>
#include <QNetworkReply>
#include "selfdrive/common/params.h" #include "selfdrive/common/params.h"
#include "selfdrive/ui/qt/api.h" #include "selfdrive/ui/qt/api.h"
#include "selfdrive/ui/qt/widgets/input.h" #include "selfdrive/ui/qt/widgets/input.h"

@ -1,5 +1,7 @@
#include "selfdrive/ui/qt/widgets/toggle.h" #include "selfdrive/ui/qt/widgets/toggle.h"
#include <QPainter>
Toggle::Toggle(QWidget *parent) : QAbstractButton(parent), Toggle::Toggle(QWidget *parent) : QAbstractButton(parent),
_height(80), _height(80),
_height_rect(60), _height_rect(60),

@ -1,6 +1,8 @@
#pragma once #pragma once
#include <QtWidgets> #include <QAbstractButton>
#include <QMouseEvent>
#include <QPropertyAnimation>
class Toggle : public QAbstractButton { class Toggle : public QAbstractButton {
Q_OBJECT Q_OBJECT

@ -1,5 +1,7 @@
#include "selfdrive/ui/qt/window.h" #include "selfdrive/ui/qt/window.h"
#include <QFontDatabase>
#include "selfdrive/hardware/hw.h" #include "selfdrive/hardware/hw.h"
MainWindow::MainWindow(QWidget *parent) : QWidget(parent) { MainWindow::MainWindow(QWidget *parent) : QWidget(parent) {

Loading…
Cancel
Save