From 1f6d6b0a8f8404641a4342698c9aa200b920cd9b Mon Sep 17 00:00:00 2001
From: Shane Smiskol <shane@smiskol.com>
Date: Thu, 20 Jul 2023 15:17:51 -0700
Subject: [PATCH] can just use clicked

---
 selfdrive/ui/qt/maps/map.cc |  1 -
 selfdrive/ui/qt/onroad.cc   | 18 +-----------------
 selfdrive/ui/qt/onroad.h    |  1 -
 3 files changed, 1 insertion(+), 19 deletions(-)

diff --git a/selfdrive/ui/qt/maps/map.cc b/selfdrive/ui/qt/maps/map.cc
index 86ab2f1812..9a143d33f4 100644
--- a/selfdrive/ui/qt/maps/map.cc
+++ b/selfdrive/ui/qt/maps/map.cc
@@ -24,7 +24,6 @@ const QString ICON_SUFFIX = ".png";
 
 MapWindow::MapWindow(const QMapboxGLSettings &settings) : m_settings(settings), velocity_filter(0, 10, 0.05) {
   QObject::connect(uiState(), &UIState::uiUpdate, this, &MapWindow::updateState);
-  QObject::connect(uiState(), &UIState::uiUpdate, this, &MapWindow::updateState);
 
   map_overlay = new QWidget (this);
   map_overlay->setAttribute(Qt::WA_TranslucentBackground, true);
diff --git a/selfdrive/ui/qt/onroad.cc b/selfdrive/ui/qt/onroad.cc
index a5263c7405..b961510548 100644
--- a/selfdrive/ui/qt/onroad.cc
+++ b/selfdrive/ui/qt/onroad.cc
@@ -20,12 +20,6 @@ OnroadWindow::OnroadWindow(QWidget *parent) : QWidget(parent) {
   main_layout->addLayout(stacked_layout);
 
   nvg = new AnnotatedCameraWidget(VISION_STREAM_ROAD, this);
-  QObject::connect(nvg, &AnnotatedCameraWidget::mapSettingsRequested, [=]() {
-    qDebug() << "double clicked!";
-//    if (map) {
-//      map->mapSettingsRequested();
-//    }
-  });
 
   QWidget * split_wrapper = new QWidget;
   split = new QHBoxLayout(split_wrapper);
@@ -233,16 +227,6 @@ MapSettingsButton::MapSettingsButton(QWidget *parent) : QPushButton(parent) {
   setFixedSize(btn_size, btn_size);
 
   settings_img = loadPixmap("../assets/navigation/nav-settings.png", {img_size, img_size});
-  QObject::connect(this, &QPushButton::clicked, this, &MapSettingsButton::changeMode);
-}
-
-void MapSettingsButton::changeMode() {
-  emit mapSettingsRequested();
-//  const auto cp = (*uiState()->sm)["carParams"].getCarParams();
-//  bool can_change = hasLongitudinalControl(cp) && params.getBool("ExperimentalModeConfirmed");
-//  if (can_change) {
-//    params.putBool("ExperimentalMode", !experimental_mode);
-//  }
 }
 
 void MapSettingsButton::paintEvent(QPaintEvent *event) {
@@ -273,7 +257,7 @@ AnnotatedCameraWidget::AnnotatedCameraWidget(VisionStreamType type, QWidget* par
 
   map_settings_btn = new MapSettingsButton(this);
   // TODO: connect to clicked!
-  QObject::connect(map_settings_btn, &MapSettingsButton::mapSettingsRequested, this, &AnnotatedCameraWidget::mapSettingsRequested);
+  QObject::connect(map_settings_btn, &MapSettingsButton::clicked, this, &AnnotatedCameraWidget::mapSettingsRequested);
 //  QObject::connect(map_settings_btn, &MapSettingsButton::mapSettingsRequested, [=]() {
 //    qDebug() << "clicked!";
 //    if (map) {
diff --git a/selfdrive/ui/qt/onroad.h b/selfdrive/ui/qt/onroad.h
index b4cb5a4d68..e00b85d234 100644
--- a/selfdrive/ui/qt/onroad.h
+++ b/selfdrive/ui/qt/onroad.h
@@ -59,7 +59,6 @@ signals:
 
 private:
   void paintEvent(QPaintEvent *event) override;
-  void changeMode();
 
   QPixmap settings_img;
 };