mawei/MoreTore
1
0
Fork 0
mirror of https://github.com/MoreTore/openpilot.git synced 2026-08-05 16:26:14 +08:00
Code Issues Packages Projects Releases Wiki Activity

ui/networking: pass network by value (#29448)

Browse Source
This commit is contained in:
Dean Lee
2023-08-18 02:37:42 +08:00
committed by GitHub
parent 59abb469ea
commit 1887d9197a
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
selfdrive/ui/qt/offroad/networking.cc
+2 -2
View File
@@ -77,7 +77,7 @@ void Networking::refresh() {
an->refresh();
}
void Networking::connectToNetwork(const Network &n) {
void Networking::connectToNetwork(const Network n) {
if (wifi->isKnownConnection(n.ssid)) {
wifi->activateWifiConnection(n.ssid);
wifiWidget->refresh();
@@ -310,7 +310,7 @@ WifiItem *WifiUI::getItem(int n) {
auto item = n < wifi_items.size() ? wifi_items[n] : wifi_items.emplace_back(new WifiItem(tr("CONNECTING..."), tr("FORGET")));
if (!item->parentWidget()) {
QObject::connect(item, &WifiItem::connectToNetwork, this, &WifiUI::connectToNetwork);
QObject::connect(item, &WifiItem::forgotNetwork, [this](const Network &n) {
QObject::connect(item, &WifiItem::forgotNetwork, [this](const Network n) {
if (ConfirmationDialog::confirm(tr("Forget Wi-Fi Network \"%1\"?").arg(QString::fromUtf8(n.ssid)), tr("Forget"), this))
wifi->forgetConnection(n.ssid);
});
selfdrive/ui/qt/offroad/networking.h
+5 -4
View File
@@ -12,8 +12,9 @@ public:
void setItem(const Network& n, const QPixmap &icon, bool show_forget_btn, const QPixmap &strength);
signals:
void connectToNetwork(const Network &n);
void forgotNetwork(const Network &n);
// Cannot pass Network by reference. it may change after the signal is sent.
void connectToNetwork(const Network n);
void forgotNetwork(const Network n);
protected:
ElidedLabel* ssidLabel;
@@ -43,7 +44,7 @@ private:
std::vector<WifiItem*> wifi_items;
signals:
void connectToNetwork(const Network &n);
void connectToNetwork(const Network n);
public slots:
void refresh();
@@ -91,6 +92,6 @@ public slots:
void refresh();
private slots:
void connectToNetwork(const Network &n);
void connectToNetwork(const Network n);
void wrongPassword(const QString &ssid);
};