From patchwork Wed Sep 18 17:05:17 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: mid-kid X-Patchwork-Id: 1988447 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; secure) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=bombadil.20210309 header.b=QWODvjLw; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20230601 header.b=XlQXVU4I; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.infradead.org (client-ip=2607:7c80:54:3::133; helo=bombadil.infradead.org; envelope-from=hostap-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org; receiver=patchwork.ozlabs.org) Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:3::133]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4XBxwC1KxMz1xsN for ; Mon, 23 Sep 2024 19:07:39 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-ID:Date:Subject:Cc :To:From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=RkG3W6bJw51Vw37w02baaoS8Xadtm3ScNX6Zfn9A5aY=; b=QWODvjLwyHwbiw rjecw81DHSTF8VbYcJAMuvloxr+CKvatDmtQUUDD6dpLcU1k/b19SyFRbPl4bbNxs2K0DXU66dA3G FLMeCsD/CWgFdVP3+pCN/oOWGQ4mkY8chZYeiKY52f54JXkNeVBY+2YWR8egxmEzqpveRMetx0vqq +DxfN5ZtjnGbYhB9GbUPxX1FhMWqGEaua/QNFqKK9BUD/FLgG40ieb1p2QWFcYXT4PdlrnfNY+ZEG T6CqDsO8JLcfTCf8ne7zn7t1BLstU/SaUzGuyAXtDlgVbe4kURJ3RYyEU1GKv0cMM2j12Vgk8EfiW NO+YpaG9QwI/MR3PV3jw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1ssf23-0000000GlJy-1MrN; Mon, 23 Sep 2024 09:06:59 +0000 Received: from mail-pl1-x62d.google.com ([2607:f8b0:4864:20::62d]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1sqy7Y-00000008hE3-0sln for hostap@lists.infradead.org; Wed, 18 Sep 2024 17:05:41 +0000 Received: by mail-pl1-x62d.google.com with SMTP id d9443c01a7336-20536dcc6e9so44298575ad.2 for ; Wed, 18 Sep 2024 10:05:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1726679138; x=1727283938; darn=lists.infradead.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=UzXwQ6vYvf4pFad0pPXWOsnfPMtJWWAmq233YyZA0BM=; b=XlQXVU4IAikKQZpvs8SyvDhKM+fjHdSzfqfJp6k9HitARjsHx8A08q/ss+Sry3JpBL r8b5Q0Hgk0MLoGUc3Egs17AqLRvl0XaxQVX5al4A7UNnw3pDapP+fTPxgDxgbnMgc3Le qNDTVgXPNkGTOv88yUCrldJ1xkKJ68qlEQScFfqJndsLiosk2mjFzp1u4Jd+SFjpHMTK zT4Q3pORz8DwqO1u4E5wnhNSs0cKRbCN2DZ9NrzPLIhkPABVtfm87V/FmbY+QbZqHzJv Bw0aQzRDEHuflrkFr7gb+uSHZ8RxsfiuVa5WlkKRsLwgP8hdei5GBtvFFQHcik+ofNZD mvnw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1726679138; x=1727283938; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=UzXwQ6vYvf4pFad0pPXWOsnfPMtJWWAmq233YyZA0BM=; b=IiZtABtHyaEtHOwCc0GMlj31lHUzm9giBGs/RL8kxlV6ZT+yqIiHE6WO/bvlS190lH LsBqTNMsWzqgJ00vAhRZ2AMfnmcyWgNq3TklVzs8eN0ZmKH65MdeRQ0SAPIrmHg4zSFQ JsOovbfkBwQRRr2qDN3inp4ZPRGiHv1eYwrI+4u2U/rEKImNN2zSd/QIrffVXelUcR8W dXfue9ymheng6i5YUwMBEkph96poojSQiOuDVZ07OsfYfTHZ5nyvOmP5HrZz45gjsriQ 3/yDWcAJ7bfQR5e7iDbhg0lRkU6Z6fTRPKzU2EEEj6FXpRKPQ4WwqryFdWpjdPyO5+8g Z6Sw== X-Gm-Message-State: AOJu0YzlPEhJ54af079QkNzpSF2Tsy7mzPgxku/zsiMkie3SCTDB8qo1 998X+Iih19aLaIvdmmZVzGkIBfVXPjZ5okZKQo6DGF7WNmsRN0Qvr9xxwFdx X-Google-Smtp-Source: AGHT+IFaruRMv8kYnuFgMV1pAL5BtCRTKQmm6oenE39yCcNXVhQQajPv/d/X0HBXMNK49wTmRiYM6Q== X-Received: by 2002:a17:902:ce8a:b0:205:8b84:d60c with SMTP id d9443c01a7336-20782b642a8mr331026875ad.35.1726679137784; Wed, 18 Sep 2024 10:05:37 -0700 (PDT) Received: from localhost.localdomain ([2001:470:7894:cafe:4282:7978:11d1:c9fe]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-20794601384sm67276125ad.94.2024.09.18.10.05.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Sep 2024 10:05:36 -0700 (PDT) From: mid-kid To: hostap@lists.infradead.org Cc: mid-kid Subject: [PATCH] wpa_gui: Support Qt6 and patch some warnings Date: Wed, 18 Sep 2024 19:05:17 +0200 Message-ID: <20240918170524.28281-1-esteve.varela@gmail.com> X-Mailer: git-send-email 2.44.2 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240918_100540_279939_D7FEF2BD X-CRM114-Status: GOOD ( 16.10 ) X-Spam-Score: -2.1 (--) X-Spam-Report: Spam detection software, running on the system "bombadil.infradead.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: Using core5compat in order to somewhat preserve Qt5 and Qt4 support. --- wpa_supplicant/wpa_gui-qt4/eventhistory.h | 2 +- wpa_supplicant/wpa_gui-qt4/main.cpp | 4 ++-- wpa_supplicant/wpa_gui-qt4/networ [...] Content analysis details: (-2.1 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2607:f8b0:4864:20:0:0:0:62d listed in] [list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider [esteve.varela(at)gmail.com] X-Mailman-Approved-At: Mon, 23 Sep 2024 02:06:57 -0700 X-BeenThere: hostap@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "Hostap" Errors-To: hostap-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org Using core5compat in order to somewhat preserve Qt5 and Qt4 support. --- wpa_supplicant/wpa_gui-qt4/eventhistory.h | 2 +- wpa_supplicant/wpa_gui-qt4/main.cpp | 4 ++-- wpa_supplicant/wpa_gui-qt4/networkconfig.cpp | 1 + wpa_supplicant/wpa_gui-qt4/networkconfig.h | 2 +- wpa_supplicant/wpa_gui-qt4/peers.cpp | 11 ++++++----- wpa_supplicant/wpa_gui-qt4/peers.h | 2 +- wpa_supplicant/wpa_gui-qt4/scanresults.cpp | 3 ++- wpa_supplicant/wpa_gui-qt4/scanresults.h | 2 +- wpa_supplicant/wpa_gui-qt4/userdatarequest.h | 2 +- wpa_supplicant/wpa_gui-qt4/wpa_gui.pro | 1 + wpa_supplicant/wpa_gui-qt4/wpagui.cpp | 13 +++++++------ wpa_supplicant/wpa_gui-qt4/wpagui.h | 2 +- 12 files changed, 25 insertions(+), 20 deletions(-) diff --git a/wpa_supplicant/wpa_gui-qt4/eventhistory.h b/wpa_supplicant/wpa_gui-qt4/eventhistory.h index afd7b6346..2122ab45a 100644 --- a/wpa_supplicant/wpa_gui-qt4/eventhistory.h +++ b/wpa_supplicant/wpa_gui-qt4/eventhistory.h @@ -40,7 +40,7 @@ class EventHistory : public QDialog, public Ui::EventHistory public: EventHistory(QWidget *parent = 0, const char *name = 0, - bool modal = false, Qt::WindowFlags fl = 0); + bool modal = false, Qt::WindowFlags fl = Qt::Widget); ~EventHistory(); public slots: diff --git a/wpa_supplicant/wpa_gui-qt4/main.cpp b/wpa_supplicant/wpa_gui-qt4/main.cpp index bbd45c6e1..0b0f19e4f 100644 --- a/wpa_supplicant/wpa_gui-qt4/main.cpp +++ b/wpa_supplicant/wpa_gui-qt4/main.cpp @@ -40,9 +40,9 @@ int main(int argc, char *argv[]) int ret; locale = QLocale::system().name(); - resourceDir = QLibraryInfo::location(QLibraryInfo::TranslationsPath); + resourceDir = QLibraryInfo::path(QLibraryInfo::TranslationsPath); if (!translator.load("wpa_gui_" + locale, resourceDir)) - translator.load("wpa_gui_" + locale, "lang"); + (void)translator.load("wpa_gui_" + locale, "lang"); app.installTranslator(&translator); WpaGui w(&app); diff --git a/wpa_supplicant/wpa_gui-qt4/networkconfig.cpp b/wpa_supplicant/wpa_gui-qt4/networkconfig.cpp index 2727318bc..cc5ff81f2 100644 --- a/wpa_supplicant/wpa_gui-qt4/networkconfig.cpp +++ b/wpa_supplicant/wpa_gui-qt4/networkconfig.cpp @@ -8,6 +8,7 @@ #include #include +#include #include "networkconfig.h" #include "wpagui.h" diff --git a/wpa_supplicant/wpa_gui-qt4/networkconfig.h b/wpa_supplicant/wpa_gui-qt4/networkconfig.h index fd09dec54..a3a7d9792 100644 --- a/wpa_supplicant/wpa_gui-qt4/networkconfig.h +++ b/wpa_supplicant/wpa_gui-qt4/networkconfig.h @@ -20,7 +20,7 @@ class NetworkConfig : public QDialog, public Ui::NetworkConfig public: NetworkConfig(QWidget *parent = 0, const char *name = 0, - bool modal = false, Qt::WindowFlags fl = 0); + bool modal = false, Qt::WindowFlags fl = Qt::Widget); ~NetworkConfig(); virtual void paramsFromScanResults(QTreeWidgetItem *sel); diff --git a/wpa_supplicant/wpa_gui-qt4/peers.cpp b/wpa_supplicant/wpa_gui-qt4/peers.cpp index 0a0b3ffcb..fef2c06cb 100644 --- a/wpa_supplicant/wpa_gui-qt4/peers.cpp +++ b/wpa_supplicant/wpa_gui-qt4/peers.cpp @@ -9,6 +9,7 @@ #include #include #include +#include #include "common/wpa_ctrl.h" #include "wpagui.h" @@ -403,7 +404,7 @@ void Peers::ctx_p2p_start_group() void Peers::add_station(QString info) { - QStringList lines = info.split(QRegExp("\\n")); + QStringList lines = QRegExp("\\n").splitString(info); QString name; for (QStringList::Iterator it = lines.begin(); @@ -518,7 +519,7 @@ void Peers::add_p2p_group_client(QStandardItem * /*parent*/, QString params) */ QStringList items = - params.split(QRegExp(" (?=[^']*('[^']*'[^']*)*$)")); + QRegExp(" (?=[^']*('[^']*'[^']*)*$)").splitString(params); QString addr = ""; QString name = ""; int config_methods = 0; @@ -591,7 +592,7 @@ bool Peers::add_bss(const char *cmd) QString ssid, bssid, flags, wps_name, pri_dev_type; int id = -1; - QStringList lines = bss.split(QRegExp("\\n")); + QStringList lines = QRegExp("\\n").splitString(bss); for (QStringList::Iterator it = lines.begin(); it != lines.end(); it++) { int pos = (*it).indexOf('=') + 1; @@ -643,7 +644,7 @@ bool Peers::add_bss(const char *cmd) item->setData(ssid, peer_role_ssid); model.appendRow(item); - lines = bss.split(QRegExp("\\n")); + lines = QRegExp("\\n").splitString(bss); for (QStringList::Iterator it = lines.begin(); it != lines.end(); it++) { if ((*it).startsWith("p2p_group_client:")) @@ -903,7 +904,7 @@ void Peers::event_notify(WpaMsg msg) * group_capab=0x0 */ QStringList items = - text.split(QRegExp(" (?=[^']*('[^']*'[^']*)*$)")); + QRegExp(" (?=[^']*('[^']*'[^']*)*$)").splitString(text); QString addr = items[1]; QString name = ""; QString pri_dev_type; diff --git a/wpa_supplicant/wpa_gui-qt4/peers.h b/wpa_supplicant/wpa_gui-qt4/peers.h index bb7373749..c44bba99a 100644 --- a/wpa_supplicant/wpa_gui-qt4/peers.h +++ b/wpa_supplicant/wpa_gui-qt4/peers.h @@ -22,7 +22,7 @@ class Peers : public QDialog, public Ui::Peers public: Peers(QWidget *parent = 0, const char *name = 0, - bool modal = false, Qt::WindowFlags fl = 0); + bool modal = false, Qt::WindowFlags fl = Qt::Widget); ~Peers(); void setWpaGui(WpaGui *_wpagui); void event_notify(WpaMsg msg); diff --git a/wpa_supplicant/wpa_gui-qt4/scanresults.cpp b/wpa_supplicant/wpa_gui-qt4/scanresults.cpp index a2e3072fb..de0299a66 100644 --- a/wpa_supplicant/wpa_gui-qt4/scanresults.cpp +++ b/wpa_supplicant/wpa_gui-qt4/scanresults.cpp @@ -7,6 +7,7 @@ */ #include +#include #include "scanresults.h" #include "signalbar.h" @@ -77,7 +78,7 @@ void ScanResults::updateResults() QString ssid, bssid, freq, signal, flags; - QStringList lines = bss.split(QRegExp("\\n")); + QStringList lines = QRegExp("\\n").splitString(bss); for (QStringList::Iterator it = lines.begin(); it != lines.end(); it++) { int pos = (*it).indexOf('=') + 1; diff --git a/wpa_supplicant/wpa_gui-qt4/scanresults.h b/wpa_supplicant/wpa_gui-qt4/scanresults.h index 2cddd133f..39bba90ce 100644 --- a/wpa_supplicant/wpa_gui-qt4/scanresults.h +++ b/wpa_supplicant/wpa_gui-qt4/scanresults.h @@ -20,7 +20,7 @@ class ScanResults : public QDialog, public Ui::ScanResults public: ScanResults(QWidget *parent = 0, const char *name = 0, - bool modal = false, Qt::WindowFlags fl = 0); + bool modal = false, Qt::WindowFlags fl = Qt::Widget); ~ScanResults(); public slots: diff --git a/wpa_supplicant/wpa_gui-qt4/userdatarequest.h b/wpa_supplicant/wpa_gui-qt4/userdatarequest.h index b6d1ad2f4..3f7dccb28 100644 --- a/wpa_supplicant/wpa_gui-qt4/userdatarequest.h +++ b/wpa_supplicant/wpa_gui-qt4/userdatarequest.h @@ -20,7 +20,7 @@ class UserDataRequest : public QDialog, public Ui::UserDataRequest public: UserDataRequest(QWidget *parent = 0, const char *name = 0, - bool modal = false, Qt::WindowFlags fl = 0); + bool modal = false, Qt::WindowFlags fl = Qt::Widget); ~UserDataRequest(); int setParams(WpaGui *_wpagui, const char *reqMsg); diff --git a/wpa_supplicant/wpa_gui-qt4/wpa_gui.pro b/wpa_supplicant/wpa_gui-qt4/wpa_gui.pro index 3fa734b57..bcb3aad71 100644 --- a/wpa_supplicant/wpa_gui-qt4/wpa_gui.pro +++ b/wpa_supplicant/wpa_gui-qt4/wpa_gui.pro @@ -2,6 +2,7 @@ TEMPLATE = app LANGUAGE = C++ TRANSLATIONS = lang/wpa_gui_de.ts greaterThan(QT_MAJOR_VERSION, 4): QT += widgets +greaterThan(QT_MAJOR_VERSION, 5): QT += core5compat CONFIG += qt warn_on release diff --git a/wpa_supplicant/wpa_gui-qt4/wpagui.cpp b/wpa_supplicant/wpa_gui-qt4/wpagui.cpp index 9404ab424..11c056bf0 100644 --- a/wpa_supplicant/wpa_gui-qt4/wpagui.cpp +++ b/wpa_supplicant/wpa_gui-qt4/wpagui.cpp @@ -18,6 +18,7 @@ #include #include #include +#include #include "wpagui.h" #include "dirent.h" @@ -1078,7 +1079,7 @@ void WpaGui::selectNetwork( const QString &sel ) char reply[10]; size_t reply_len = sizeof(reply); - if (cmd.contains(QRegExp("^\\d+:"))) + if (QRegExp("^\\d+:").indexIn(cmd)) cmd.truncate(cmd.indexOf(':')); else cmd = "any"; @@ -1095,7 +1096,7 @@ void WpaGui::enableNetwork(const QString &sel) char reply[10]; size_t reply_len = sizeof(reply); - if (cmd.contains(QRegExp("^\\d+:"))) + if (QRegExp("^\\d+:").indexIn(cmd)) cmd.truncate(cmd.indexOf(':')); else if (!cmd.startsWith("all")) { debug("Invalid editNetwork '%s'", @@ -1114,7 +1115,7 @@ void WpaGui::disableNetwork(const QString &sel) char reply[10]; size_t reply_len = sizeof(reply); - if (cmd.contains(QRegExp("^\\d+:"))) + if (QRegExp("^\\d+:").indexIn(cmd)) cmd.truncate(cmd.indexOf(':')); else if (!cmd.startsWith("all")) { debug("Invalid editNetwork '%s'", @@ -1132,7 +1133,7 @@ void WpaGui::editNetwork(const QString &sel) QString cmd(sel); int id = -1; - if (cmd.contains(QRegExp("^\\d+:"))) { + if (QRegExp("^\\d+:").indexIn(cmd)) { cmd.truncate(cmd.indexOf(':')); id = cmd.toInt(); } @@ -1204,7 +1205,7 @@ void WpaGui::removeNetwork(const QString &sel) char reply[10]; size_t reply_len = sizeof(reply); - if (cmd.contains(QRegExp("^\\d+:"))) + if (QRegExp("^\\d+:").indexIn(cmd)) cmd.truncate(cmd.indexOf(':')); else if (!cmd.startsWith("all")) { debug("Invalid editNetwork '%s'", @@ -1476,7 +1477,7 @@ void WpaGui::showTrayStatus() QString msg, status(buf); - QStringList lines = status.split(QRegExp("\\n")); + QStringList lines = QRegExp("\\n").splitString(status); for (QStringList::Iterator it = lines.begin(); it != lines.end(); it++) { int pos = (*it).indexOf('=') + 1; diff --git a/wpa_supplicant/wpa_gui-qt4/wpagui.h b/wpa_supplicant/wpa_gui-qt4/wpagui.h index f0a34c97e..898722bd9 100644 --- a/wpa_supplicant/wpa_gui-qt4/wpagui.h +++ b/wpa_supplicant/wpa_gui-qt4/wpagui.h @@ -49,7 +49,7 @@ public: }; WpaGui(QApplication *app, QWidget *parent = 0, const char *name = 0, - Qt::WindowFlags fl = 0); + Qt::WindowFlags fl = Qt::Widget); ~WpaGui(); virtual int ctrlRequest(const char *cmd, char *buf, size_t *buflen);