mawei/sunnypilot
1
0
Fork 0
mirror of https://github.com/sunnypilot/sunnypilot.git synced 2026-06-24 12:12:07 +08:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Only when building map"

Browse Source 
This reverts commit 5c1c833223.
This commit is contained in:
Jaosn Wen
2024-07-14 22:35:37 -04:00
parent c4abe230a7
commit ec0c2edd66
1 changed files with 2 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
selfdrive/ui/sunnypilot/qt/widgets/sp_priv_controls.h
+2 -9
View File
@@ -19,21 +19,14 @@
// 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
#define Toggle ToggleSP
#define ToggleControl ToggleControlSP
// To avoid multiple definition errors for AbstractControl and LayoutWidget when ENABLE_MAPS is defined,
// we redefine these classes with custom names (AbstractControlCustomSP and LayoutWidgetSP).
// This ensures that the linker does not encounter duplicate symbols for these classes from different sources.
// This redefinition is only necessary when building with map support; it is not needed if map functionality is not required.
#ifdef ENABLE_MAPS
#define AbstractControl AbstractControlCustomSP
#define LayoutWidget LayoutWidgetSP
#endif
QFrame *horizontal_line(QWidget *parent = nullptr);
class ElidedLabelSP : public QLabel {