From 1386d1215b80f5c889d8e8a1ac910ec38192dcc6 Mon Sep 17 00:00:00 2001 From: Jaosn Wen Date: Sun, 14 Jul 2024 23:01:44 -0400 Subject: [PATCH] Reapply "SP Controls: Fix duplicate classes" This reverts commit 142db222cee018fe3654a522e9827baa7ef7753b. --- selfdrive/ui/sunnypilot/qt/widgets/sp_priv_controls.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/selfdrive/ui/sunnypilot/qt/widgets/sp_priv_controls.h b/selfdrive/ui/sunnypilot/qt/widgets/sp_priv_controls.h index 98dc6a34c9..e77e5a807e 100644 --- a/selfdrive/ui/sunnypilot/qt/widgets/sp_priv_controls.h +++ b/selfdrive/ui/sunnypilot/qt/widgets/sp_priv_controls.h @@ -19,6 +19,8 @@ // This is for compatibility purposes, until we properly do inheritance splitting // This is because some controls were needing LabelControlSP, but the original code was using LabelControl // which was modified in-place in the past but since we now have a new file, we will be moving it to LabelControlSP +#define AbstractControl AbstractControlCustomSP +#define LayoutWidget LayoutWidgetSP #define LabelControl LabelControlSP #define ElidedLabel ElidedLabelSP #define ButtonControl ButtonControlSP