Line 0
Link Here
|
|
|
1 |
From 0ead8bb4889977af735f4d0b578497830ee6d6f7 Mon Sep 17 00:00:00 2001 |
2 |
From: "Jason A. Donenfeld" <Jason@zx2c4.com> |
3 |
Date: Fri, 10 Jan 2025 03:43:23 +0100 |
4 |
Subject: [PATCH] wpa_gui: Port to Qt6 |
5 |
|
6 |
This appears to be working. Fairly straight forward. Lightly tested. |
7 |
Distros are getting ready to remove Qt5, so this is somewhat important |
8 |
to do. |
9 |
|
10 |
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com> |
11 |
--- |
12 |
wpa_supplicant/wpa_gui-qt4/eventhistory.h | 2 +- |
13 |
wpa_supplicant/wpa_gui-qt4/main.cpp | 8 ++++---- |
14 |
wpa_supplicant/wpa_gui-qt4/networkconfig.cpp | 8 ++++---- |
15 |
wpa_supplicant/wpa_gui-qt4/networkconfig.h | 2 +- |
16 |
wpa_supplicant/wpa_gui-qt4/peers.cpp | 10 +++++----- |
17 |
wpa_supplicant/wpa_gui-qt4/peers.h | 2 +- |
18 |
wpa_supplicant/wpa_gui-qt4/scanresults.cpp | 2 +- |
19 |
wpa_supplicant/wpa_gui-qt4/scanresults.h | 2 +- |
20 |
wpa_supplicant/wpa_gui-qt4/userdatarequest.h | 2 +- |
21 |
wpa_supplicant/wpa_gui-qt4/wpagui.cpp | 16 ++++++++-------- |
22 |
wpa_supplicant/wpa_gui-qt4/wpagui.h | 2 +- |
23 |
wpa_supplicant/wpa_gui-qt4/wpamsg.h | 4 ++-- |
24 |
12 files changed, 30 insertions(+), 30 deletions(-) |
25 |
|
26 |
diff --git a/wpa_supplicant/wpa_gui-qt4/eventhistory.h b/wpa_supplicant/wpa_gui-qt4/eventhistory.h |
27 |
index afd7b6346..2122ab45a 100644 |
28 |
--- a/wpa_supplicant/wpa_gui-qt4/eventhistory.h |
29 |
+++ b/wpa_supplicant/wpa_gui-qt4/eventhistory.h |
30 |
@@ -40,7 +40,7 @@ class EventHistory : public QDialog, public Ui::EventHistory |
31 |
|
32 |
public: |
33 |
EventHistory(QWidget *parent = 0, const char *name = 0, |
34 |
- bool modal = false, Qt::WindowFlags fl = 0); |
35 |
+ bool modal = false, Qt::WindowFlags fl = Qt::Widget); |
36 |
~EventHistory(); |
37 |
|
38 |
public slots: |
39 |
diff --git a/wpa_supplicant/wpa_gui-qt4/main.cpp b/wpa_supplicant/wpa_gui-qt4/main.cpp |
40 |
index bbd45c6e1..d395aa135 100644 |
41 |
--- a/wpa_supplicant/wpa_gui-qt4/main.cpp |
42 |
+++ b/wpa_supplicant/wpa_gui-qt4/main.cpp |
43 |
@@ -40,10 +40,10 @@ int main(int argc, char *argv[]) |
44 |
int ret; |
45 |
|
46 |
locale = QLocale::system().name(); |
47 |
- resourceDir = QLibraryInfo::location(QLibraryInfo::TranslationsPath); |
48 |
- if (!translator.load("wpa_gui_" + locale, resourceDir)) |
49 |
- translator.load("wpa_gui_" + locale, "lang"); |
50 |
- app.installTranslator(&translator); |
51 |
+ resourceDir = QLibraryInfo::path(QLibraryInfo::TranslationsPath); |
52 |
+ if (translator.load("wpa_gui_" + locale, resourceDir) || |
53 |
+ translator.load("wpa_gui_" + locale, "lang")) |
54 |
+ app.installTranslator(&translator); |
55 |
|
56 |
WpaGui w(&app); |
57 |
|
58 |
diff --git a/wpa_supplicant/wpa_gui-qt4/networkconfig.cpp b/wpa_supplicant/wpa_gui-qt4/networkconfig.cpp |
59 |
index 2727318bc..59af84504 100644 |
60 |
--- a/wpa_supplicant/wpa_gui-qt4/networkconfig.cpp |
61 |
+++ b/wpa_supplicant/wpa_gui-qt4/networkconfig.cpp |
62 |
@@ -37,7 +37,7 @@ NetworkConfig::NetworkConfig(QWidget *parent, const char *, bool, |
63 |
SLOT(authChanged(int))); |
64 |
connect(cancelButton, SIGNAL(clicked()), this, SLOT(close())); |
65 |
connect(addButton, SIGNAL(clicked()), this, SLOT(addNetwork())); |
66 |
- connect(encrSelect, SIGNAL(activated(const QString &)), this, |
67 |
+ connect(encrSelect, SIGNAL(textActivated(const QString &)), this, |
68 |
SLOT(encrChanged(const QString &))); |
69 |
connect(removeButton, SIGNAL(clicked()), this, SLOT(removeNetwork())); |
70 |
connect(eapSelect, SIGNAL(activated(int)), this, |
71 |
@@ -204,8 +204,8 @@ void NetworkConfig::addNetwork() |
72 |
} |
73 |
|
74 |
if (idstrEdit->isEnabled() && !idstrEdit->text().isEmpty()) { |
75 |
- QRegExp rx("^(\\w|-)+$"); |
76 |
- if (rx.indexIn(idstrEdit->text()) < 0) { |
77 |
+ QRegularExpression rx("^(\\w|-)+$"); |
78 |
+ if (!rx.match(idstrEdit->text()).hasMatch()) { |
79 |
QMessageBox::warning( |
80 |
this, tr("Network ID Error"), |
81 |
tr("Network ID String contains non-word " |
82 |
@@ -797,7 +797,7 @@ void NetworkConfig::removeNetwork() |
83 |
tr("This will permanently remove the network\n" |
84 |
"from the configuration. Do you really want\n" |
85 |
"to remove this network?"), |
86 |
- tr("Yes"), tr("No")) != 0) |
87 |
+ QMessageBox::Yes, QMessageBox::No) != 0) |
88 |
return; |
89 |
|
90 |
snprintf(cmd, sizeof(cmd), "REMOVE_NETWORK %d", edit_network_id); |
91 |
diff --git a/wpa_supplicant/wpa_gui-qt4/networkconfig.h b/wpa_supplicant/wpa_gui-qt4/networkconfig.h |
92 |
index fd09dec54..a3a7d9792 100644 |
93 |
--- a/wpa_supplicant/wpa_gui-qt4/networkconfig.h |
94 |
+++ b/wpa_supplicant/wpa_gui-qt4/networkconfig.h |
95 |
@@ -20,7 +20,7 @@ class NetworkConfig : public QDialog, public Ui::NetworkConfig |
96 |
|
97 |
public: |
98 |
NetworkConfig(QWidget *parent = 0, const char *name = 0, |
99 |
- bool modal = false, Qt::WindowFlags fl = 0); |
100 |
+ bool modal = false, Qt::WindowFlags fl = Qt::Widget); |
101 |
~NetworkConfig(); |
102 |
|
103 |
virtual void paramsFromScanResults(QTreeWidgetItem *sel); |
104 |
diff --git a/wpa_supplicant/wpa_gui-qt4/peers.cpp b/wpa_supplicant/wpa_gui-qt4/peers.cpp |
105 |
index 0a0b3ffcb..268aba8b3 100644 |
106 |
--- a/wpa_supplicant/wpa_gui-qt4/peers.cpp |
107 |
+++ b/wpa_supplicant/wpa_gui-qt4/peers.cpp |
108 |
@@ -403,7 +403,7 @@ void Peers::ctx_p2p_start_group() |
109 |
|
110 |
void Peers::add_station(QString info) |
111 |
{ |
112 |
- QStringList lines = info.split(QRegExp("\\n")); |
113 |
+ QStringList lines = info.split(QRegularExpression("\\n")); |
114 |
QString name; |
115 |
|
116 |
for (QStringList::Iterator it = lines.begin(); |
117 |
@@ -518,7 +518,7 @@ void Peers::add_p2p_group_client(QStandardItem * /*parent*/, QString params) |
118 |
*/ |
119 |
|
120 |
QStringList items = |
121 |
- params.split(QRegExp(" (?=[^']*('[^']*'[^']*)*$)")); |
122 |
+ params.split(QRegularExpression(" (?=[^']*('[^']*'[^']*)*$)")); |
123 |
QString addr = ""; |
124 |
QString name = ""; |
125 |
int config_methods = 0; |
126 |
@@ -591,7 +591,7 @@ bool Peers::add_bss(const char *cmd) |
127 |
QString ssid, bssid, flags, wps_name, pri_dev_type; |
128 |
int id = -1; |
129 |
|
130 |
- QStringList lines = bss.split(QRegExp("\\n")); |
131 |
+ QStringList lines = bss.split(QRegularExpression("\\n")); |
132 |
for (QStringList::Iterator it = lines.begin(); |
133 |
it != lines.end(); it++) { |
134 |
int pos = (*it).indexOf('=') + 1; |
135 |
@@ -643,7 +643,7 @@ bool Peers::add_bss(const char *cmd) |
136 |
item->setData(ssid, peer_role_ssid); |
137 |
model.appendRow(item); |
138 |
|
139 |
- lines = bss.split(QRegExp("\\n")); |
140 |
+ lines = bss.split(QRegularExpression("\\n")); |
141 |
for (QStringList::Iterator it = lines.begin(); |
142 |
it != lines.end(); it++) { |
143 |
if ((*it).startsWith("p2p_group_client:")) |
144 |
@@ -903,7 +903,7 @@ void Peers::event_notify(WpaMsg msg) |
145 |
* group_capab=0x0 |
146 |
*/ |
147 |
QStringList items = |
148 |
- text.split(QRegExp(" (?=[^']*('[^']*'[^']*)*$)")); |
149 |
+ text.split(QRegularExpression(" (?=[^']*('[^']*'[^']*)*$)")); |
150 |
QString addr = items[1]; |
151 |
QString name = ""; |
152 |
QString pri_dev_type; |
153 |
diff --git a/wpa_supplicant/wpa_gui-qt4/peers.h b/wpa_supplicant/wpa_gui-qt4/peers.h |
154 |
index bb7373749..c44bba99a 100644 |
155 |
--- a/wpa_supplicant/wpa_gui-qt4/peers.h |
156 |
+++ b/wpa_supplicant/wpa_gui-qt4/peers.h |
157 |
@@ -22,7 +22,7 @@ class Peers : public QDialog, public Ui::Peers |
158 |
|
159 |
public: |
160 |
Peers(QWidget *parent = 0, const char *name = 0, |
161 |
- bool modal = false, Qt::WindowFlags fl = 0); |
162 |
+ bool modal = false, Qt::WindowFlags fl = Qt::Widget); |
163 |
~Peers(); |
164 |
void setWpaGui(WpaGui *_wpagui); |
165 |
void event_notify(WpaMsg msg); |
166 |
diff --git a/wpa_supplicant/wpa_gui-qt4/scanresults.cpp b/wpa_supplicant/wpa_gui-qt4/scanresults.cpp |
167 |
index a2e3072fb..ba04b4f38 100644 |
168 |
--- a/wpa_supplicant/wpa_gui-qt4/scanresults.cpp |
169 |
+++ b/wpa_supplicant/wpa_gui-qt4/scanresults.cpp |
170 |
@@ -77,7 +77,7 @@ void ScanResults::updateResults() |
171 |
|
172 |
QString ssid, bssid, freq, signal, flags; |
173 |
|
174 |
- QStringList lines = bss.split(QRegExp("\\n")); |
175 |
+ QStringList lines = bss.split(QRegularExpression("\\n")); |
176 |
for (QStringList::Iterator it = lines.begin(); |
177 |
it != lines.end(); it++) { |
178 |
int pos = (*it).indexOf('=') + 1; |
179 |
diff --git a/wpa_supplicant/wpa_gui-qt4/scanresults.h b/wpa_supplicant/wpa_gui-qt4/scanresults.h |
180 |
index 2cddd133f..39bba90ce 100644 |
181 |
--- a/wpa_supplicant/wpa_gui-qt4/scanresults.h |
182 |
+++ b/wpa_supplicant/wpa_gui-qt4/scanresults.h |
183 |
@@ -20,7 +20,7 @@ class ScanResults : public QDialog, public Ui::ScanResults |
184 |
|
185 |
public: |
186 |
ScanResults(QWidget *parent = 0, const char *name = 0, |
187 |
- bool modal = false, Qt::WindowFlags fl = 0); |
188 |
+ bool modal = false, Qt::WindowFlags fl = Qt::Widget); |
189 |
~ScanResults(); |
190 |
|
191 |
public slots: |
192 |
diff --git a/wpa_supplicant/wpa_gui-qt4/userdatarequest.h b/wpa_supplicant/wpa_gui-qt4/userdatarequest.h |
193 |
index b6d1ad2f4..3f7dccb28 100644 |
194 |
--- a/wpa_supplicant/wpa_gui-qt4/userdatarequest.h |
195 |
+++ b/wpa_supplicant/wpa_gui-qt4/userdatarequest.h |
196 |
@@ -20,7 +20,7 @@ class UserDataRequest : public QDialog, public Ui::UserDataRequest |
197 |
|
198 |
public: |
199 |
UserDataRequest(QWidget *parent = 0, const char *name = 0, |
200 |
- bool modal = false, Qt::WindowFlags fl = 0); |
201 |
+ bool modal = false, Qt::WindowFlags fl = Qt::Widget); |
202 |
~UserDataRequest(); |
203 |
|
204 |
int setParams(WpaGui *_wpagui, const char *reqMsg); |
205 |
diff --git a/wpa_supplicant/wpa_gui-qt4/wpagui.cpp b/wpa_supplicant/wpa_gui-qt4/wpagui.cpp |
206 |
index 9404ab424..0c125d90f 100644 |
207 |
--- a/wpa_supplicant/wpa_gui-qt4/wpagui.cpp |
208 |
+++ b/wpa_supplicant/wpa_gui-qt4/wpagui.cpp |
209 |
@@ -99,9 +99,9 @@ WpaGui::WpaGui(QApplication *_app, QWidget *parent, const char *, |
210 |
connect(disconnectButton, SIGNAL(clicked()), this, SLOT(disconnect())); |
211 |
connect(scanButton, SIGNAL(clicked()), this, SLOT(scan())); |
212 |
connect(connectButton, SIGNAL(clicked()), this, SLOT(connectB())); |
213 |
- connect(adapterSelect, SIGNAL(activated(const QString&)), this, |
214 |
+ connect(adapterSelect, SIGNAL(textActivated(const QString&)), this, |
215 |
SLOT(selectAdapter(const QString&))); |
216 |
- connect(networkSelect, SIGNAL(activated(const QString&)), this, |
217 |
+ connect(networkSelect, SIGNAL(textActivated(const QString&)), this, |
218 |
SLOT(selectNetwork(const QString&))); |
219 |
connect(addNetworkButton, SIGNAL(clicked()), this, SLOT(addNetwork())); |
220 |
connect(editNetworkButton, SIGNAL(clicked()), this, |
221 |
@@ -1078,7 +1078,7 @@ void WpaGui::selectNetwork( const QString &sel ) |
222 |
char reply[10]; |
223 |
size_t reply_len = sizeof(reply); |
224 |
|
225 |
- if (cmd.contains(QRegExp("^\\d+:"))) |
226 |
+ if (cmd.contains(QRegularExpression("^\\d+:"))) |
227 |
cmd.truncate(cmd.indexOf(':')); |
228 |
else |
229 |
cmd = "any"; |
230 |
@@ -1095,7 +1095,7 @@ void WpaGui::enableNetwork(const QString &sel) |
231 |
char reply[10]; |
232 |
size_t reply_len = sizeof(reply); |
233 |
|
234 |
- if (cmd.contains(QRegExp("^\\d+:"))) |
235 |
+ if (cmd.contains(QRegularExpression("^\\d+:"))) |
236 |
cmd.truncate(cmd.indexOf(':')); |
237 |
else if (!cmd.startsWith("all")) { |
238 |
debug("Invalid editNetwork '%s'", |
239 |
@@ -1114,7 +1114,7 @@ void WpaGui::disableNetwork(const QString &sel) |
240 |
char reply[10]; |
241 |
size_t reply_len = sizeof(reply); |
242 |
|
243 |
- if (cmd.contains(QRegExp("^\\d+:"))) |
244 |
+ if (cmd.contains(QRegularExpression("^\\d+:"))) |
245 |
cmd.truncate(cmd.indexOf(':')); |
246 |
else if (!cmd.startsWith("all")) { |
247 |
debug("Invalid editNetwork '%s'", |
248 |
@@ -1132,7 +1132,7 @@ void WpaGui::editNetwork(const QString &sel) |
249 |
QString cmd(sel); |
250 |
int id = -1; |
251 |
|
252 |
- if (cmd.contains(QRegExp("^\\d+:"))) { |
253 |
+ if (cmd.contains(QRegularExpression("^\\d+:"))) { |
254 |
cmd.truncate(cmd.indexOf(':')); |
255 |
id = cmd.toInt(); |
256 |
} |
257 |
@@ -1204,7 +1204,7 @@ void WpaGui::removeNetwork(const QString &sel) |
258 |
char reply[10]; |
259 |
size_t reply_len = sizeof(reply); |
260 |
|
261 |
- if (cmd.contains(QRegExp("^\\d+:"))) |
262 |
+ if (cmd.contains(QRegularExpression("^\\d+:"))) |
263 |
cmd.truncate(cmd.indexOf(':')); |
264 |
else if (!cmd.startsWith("all")) { |
265 |
debug("Invalid editNetwork '%s'", |
266 |
@@ -1476,7 +1476,7 @@ void WpaGui::showTrayStatus() |
267 |
|
268 |
QString msg, status(buf); |
269 |
|
270 |
- QStringList lines = status.split(QRegExp("\\n")); |
271 |
+ QStringList lines = status.split(QRegularExpression("\\n")); |
272 |
for (QStringList::Iterator it = lines.begin(); |
273 |
it != lines.end(); it++) { |
274 |
int pos = (*it).indexOf('=') + 1; |
275 |
diff --git a/wpa_supplicant/wpa_gui-qt4/wpagui.h b/wpa_supplicant/wpa_gui-qt4/wpagui.h |
276 |
index f0a34c97e..898722bd9 100644 |
277 |
--- a/wpa_supplicant/wpa_gui-qt4/wpagui.h |
278 |
+++ b/wpa_supplicant/wpa_gui-qt4/wpagui.h |
279 |
@@ -49,7 +49,7 @@ public: |
280 |
}; |
281 |
|
282 |
WpaGui(QApplication *app, QWidget *parent = 0, const char *name = 0, |
283 |
- Qt::WindowFlags fl = 0); |
284 |
+ Qt::WindowFlags fl = Qt::Widget); |
285 |
~WpaGui(); |
286 |
|
287 |
virtual int ctrlRequest(const char *cmd, char *buf, size_t *buflen); |
288 |
diff --git a/wpa_supplicant/wpa_gui-qt4/wpamsg.h b/wpa_supplicant/wpa_gui-qt4/wpamsg.h |
289 |
index 8f2fcdc41..fe36e2044 100644 |
290 |
--- a/wpa_supplicant/wpa_gui-qt4/wpamsg.h |
291 |
+++ b/wpa_supplicant/wpa_gui-qt4/wpamsg.h |
292 |
@@ -10,7 +10,7 @@ |
293 |
#define WPAMSG_H |
294 |
|
295 |
#include <QDateTime> |
296 |
-#include <QLinkedList> |
297 |
+#include <QList> |
298 |
|
299 |
class WpaMsg { |
300 |
public: |
301 |
@@ -30,6 +30,6 @@ private: |
302 |
QDateTime timestamp; |
303 |
}; |
304 |
|
305 |
-typedef QLinkedList<WpaMsg> WpaMsgList; |
306 |
+typedef QList<WpaMsg> WpaMsgList; |
307 |
|
308 |
#endif /* WPAMSG_H */ |
309 |
-- |
310 |
2.48.0 |
311 |
|