missed from merge

selfdrive/ui/qt/request_repeater.cc

@@ -28,7 +28,7 @@ void RequestRepeater::setupCacheProcess(const QString &cacheKey) {
     }
     QObject::connect(this, &HttpRequest::requestDone, [=](const QString &resp, bool success) {
       if (success && resp != prevResp) {
-        params.put(cache_key.toStdString(), resp.toStdString());
+        params.put(cacheKey.toStdString(), resp.toStdString());
         prevResp = resp;
       }
     });

selfdrive/ui/sunnypilot/qt/onroad/annotated_camera.cc

@@ -1406,16 +1406,11 @@ void AnnotatedCameraWidgetSP::drawLead(QPainter &painter, const cereal::RadarSta
 }
 
 void AnnotatedCameraWidgetSP::paintGL() {
-}
-
-void AnnotatedCameraWidgetSP::paintEvent(QPaintEvent *event) {
   UIStateSP *s = uiStateSP();
   SubMaster &sm = *(s->sm);
   const double start_draw_t = millis_since_boot();
   const cereal::ModelDataV2::Reader &model = sm["modelV2"].getModelV2();
 
-  QPainter painter(this);
-
   // draw camera frame
   {
     std::lock_guard lk(frame_lock);
@@ -1460,10 +1455,8 @@ void AnnotatedCameraWidgetSP::paintEvent(QPaintEvent *event) {
     } else {
       CameraWidget::updateCalibration(DEFAULT_CALIBRATION);
     }
-    painter.beginNativePainting();
     CameraWidget::setFrameId(model.getFrameId());
     CameraWidget::paintGL();
-    painter.endNativePainting();
   }
 
   QPainter painter(this);

selfdrive/ui/sunnypilot/qt/onroad/annotated_camera.h

@@ -223,7 +223,6 @@ protected:
   inline QColor whiteColor(int alpha = 255) { return QColor(255, 255, 255, alpha); }
   inline QColor blackColor(int alpha = 255) { return QColor(0, 0, 0, alpha); }
 
-  void paintEvent(QPaintEvent *event) override;
   void rocketFuel(QPainter &p);
 
   double prev_draw_t = 0;

selfdrive/ui/sunnypilot/qt/widgets/scrollview.cc

@@ -28,9 +28,6 @@ Last updated: July 29, 2024
 
 #include <QScrollBar>
 
-ScrollViewSP::ScrollViewSP(QWidget *w, QWidget *parent) : ScrollView(w, parent) {
-}
-
 void ScrollViewSP::setLastScrollPosition() {
   lastScrollPosition = verticalScrollBar()->value();
 }