mawei/dragonpilot
1
0
Fork 0
mirror of https://github.com/dragonpilot/dragonpilot.git synced 2026-02-23 16:03:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

Revert "ui: fix memory leak in MapSettings (#28701)"

Browse Source 
This reverts commit 5a00b42092.
This commit is contained in:
Adeeb Shihadeh
2023-06-30 13:22:20 -07:00
parent f0b65d3e92
commit 3e1ba3ff35
2 changed files with 12 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
selfdrive/ui/qt/maps/map_settings.cc
View File

@@ -130,12 +130,12 @@ void MapSettings::updateCurrentRoute() {
qWarning() << "JSON Parse failed on NavDestination" << dest;
return;
}
auto destination = std::make_unique<NavDestination>(doc.object());
auto destination = new NavDestination(doc.object());
if (current_destination && *destination == *current_destination) return;
current_destination = std::move(destination);
current_widget->set(current_destination.get(), true);
current_destination = destination;
current_widget->set(current_destination, true);
} else {
current_destination.reset(nullptr);
current_destination = nullptr;
current_widget->unset("", true);
}
if (isVisible()) refresh();
@@ -149,7 +149,7 @@ void MapSettings::parseResponse(const QString &response, bool success) {
void MapSettings::refresh() {
bool has_home = false, has_work = false;
auto destinations = std::vector<std::unique_ptr<NavDestination>>();
auto destinations = std::vector<NavDestination*>();
auto destinations_str = cur_destinations.trimmed();
if (!destinations_str.isEmpty()) {
@@ -160,7 +160,7 @@ void MapSettings::refresh() {
}
for (auto el : doc.array()) {
auto destination = std::make_unique<NavDestination>(el.toObject());
auto destination = new NavDestination(el.toObject());
// add home and work later if they are missing
if (destination->isFavorite()) {
@@ -170,7 +170,7 @@ void MapSettings::refresh() {
// skip current destination
if (current_destination && *destination == *current_destination) continue;
destinations.push_back(std::move(destination));
destinations.push_back(destination);
}
}
@@ -178,7 +178,7 @@ void MapSettings::refresh() {
clearLayout(destinations_layout);
// Sort: HOME, WORK, and then descending-alphabetical FAVORITES, RECENTS
std::sort(destinations.begin(), destinations.end(), [](const auto &a, const auto &b) {
std::sort(destinations.begin(), destinations.end(), [](const NavDestination *a, const NavDestination *b) {
if (a->isFavorite() && b->isFavorite()) {
if (a->label() == NAV_FAVORITE_LABEL_HOME) return true;
else if (b->label() == NAV_FAVORITE_LABEL_HOME) return false;
@@ -191,11 +191,11 @@ void MapSettings::refresh() {
return a->name() < b->name();
});
for (auto &destination : destinations) {
for (auto destination : destinations) {
auto widget = new DestinationWidget(this);
widget->set(destination.get(), false);
widget->set(destination, false);
QObject::connect(widget, &QPushButton::clicked, [&]() {
QObject::connect(widget, &QPushButton::clicked, [=]() {
navigateTo(destination->toJson());
emit closeSettings();
});

4
selfdrive/ui/qt/maps/map_settings.h
View File

@@ -1,7 +1,5 @@
#pragma once
#include<memory>
#include <QFrame>
#include <QJsonArray>
#include <QJsonDocument>
@@ -39,7 +37,7 @@ private:
Params params;
QString cur_destinations;
QVBoxLayout *destinations_layout;
std::unique_ptr<NavDestination> current_destination;
NavDestination *current_destination;
DestinationWidget *current_widget;
QPixmap close_icon;