wpa_gui: Port to Qt6

This appears to be working. Fairly straight forward. Lightly tested.
Distros are getting ready to remove Qt5, so this is somewhat important
to do.

Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>

diff --git a/wpa_supplicant/wpa_gui-qt4/eventhistory.h b/wpa_supplicant/wpa_gui-qt4/eventhistory.h
index afd7b63469a203de7c5d4ee893c46dba965c209a..2122ab45a877fb81cf19ae6a6424e18c12ee14dd 100644 (file)
--- 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 bbd45c6e1d28dc9e4848875694b3bf3b63ee5398..d395aa13573e6a51a895a984181b1568b39dfd12 100644 (file)
--- a/wpa_supplicant/wpa_gui-qt4/main.cpp
+++ b/wpa_supplicant/wpa_gui-qt4/main.cpp
@@ -40,10 +40,10 @@ int main(int argc, char *argv[])
        int ret;
 
        locale = QLocale::system().name();
-       resourceDir = QLibraryInfo::location(QLibraryInfo::TranslationsPath);
-       if (!translator.load("wpa_gui_" + locale, resourceDir))
-               translator.load("wpa_gui_" + locale, "lang");
-       app.installTranslator(&translator);
+       resourceDir = QLibraryInfo::path(QLibraryInfo::TranslationsPath);
+       if (translator.load("wpa_gui_" + locale, resourceDir) ||
+           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 2727318bcd5c01355deb1a662eb4583e7a510c5e..59af84504891ebbcb899c5e61ad8276bca723e3b 100644 (file)
--- a/wpa_supplicant/wpa_gui-qt4/networkconfig.cpp
+++ b/wpa_supplicant/wpa_gui-qt4/networkconfig.cpp
@@ -37,7 +37,7 @@ NetworkConfig::NetworkConfig(QWidget *parent, const char *, bool,
                SLOT(authChanged(int)));
        connect(cancelButton, SIGNAL(clicked()), this, SLOT(close()));
        connect(addButton, SIGNAL(clicked()), this, SLOT(addNetwork()));
-       connect(encrSelect, SIGNAL(activated(const QString &)), this,
+       connect(encrSelect, SIGNAL(textActivated(const QString &)), this,
                SLOT(encrChanged(const QString &)));
        connect(removeButton, SIGNAL(clicked()), this, SLOT(removeNetwork()));
        connect(eapSelect, SIGNAL(activated(int)), this,
@@ -204,8 +204,8 @@ void NetworkConfig::addNetwork()
        }
 
        if (idstrEdit->isEnabled() && !idstrEdit->text().isEmpty()) {
-               QRegExp rx("^(\\w|-)+$");
-               if (rx.indexIn(idstrEdit->text()) < 0) {
+               QRegularExpression rx("^(\\w|-)+$");
+               if (!rx.match(idstrEdit->text()).hasMatch()) {
                        QMessageBox::warning(
                                this, tr("Network ID Error"),
                                tr("Network ID String contains non-word "
@@ -797,7 +797,7 @@ void NetworkConfig::removeNetwork()
                    tr("This will permanently remove the network\n"
                       "from the configuration. Do you really want\n"
                       "to remove this network?"),
-                   tr("Yes"), tr("No")) != 0)
+                   QMessageBox::Yes, QMessageBox::No) != 0)
                return;
 
        snprintf(cmd, sizeof(cmd), "REMOVE_NETWORK %d", edit_network_id);

diff --git a/wpa_supplicant/wpa_gui-qt4/networkconfig.h b/wpa_supplicant/wpa_gui-qt4/networkconfig.h
index fd09dec54318fd8f1f8f6e0542790e543aee92d5..a3a7d9792f60c119e7d6eae646fb8cf1d86491c3 100644 (file)
--- 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 0a0b3ffcb51b6dd10c68578d60f25e370ba9d81c..268aba8b3873d583fcbe2cc59ed0c50dce4a0ca6 100644 (file)
--- a/wpa_supplicant/wpa_gui-qt4/peers.cpp
+++ b/wpa_supplicant/wpa_gui-qt4/peers.cpp
@@ -403,7 +403,7 @@ void Peers::ctx_p2p_start_group()
 
 void Peers::add_station(QString info)
 {
-       QStringList lines = info.split(QRegExp("\\n"));
+       QStringList lines = info.split(QRegularExpression("\\n"));
        QString name;
 
        for (QStringList::Iterator it = lines.begin();
@@ -518,7 +518,7 @@ void Peers::add_p2p_group_client(QStandardItem * /*parent*/, QString params)
         */
 
        QStringList items =
-               params.split(QRegExp(" (?=[^']*('[^']*'[^']*)*$)"));
+               params.split(QRegularExpression(" (?=[^']*('[^']*'[^']*)*$)"));
        QString addr = "";
        QString name = "";
        int config_methods = 0;
@@ -591,7 +591,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 = bss.split(QRegularExpression("\\n"));
        for (QStringList::Iterator it = lines.begin();
             it != lines.end(); it++) {
                int pos = (*it).indexOf('=') + 1;
@@ -643,7 +643,7 @@ bool Peers::add_bss(const char *cmd)
                        item->setData(ssid, peer_role_ssid);
                model.appendRow(item);
 
-               lines = bss.split(QRegExp("\\n"));
+               lines = bss.split(QRegularExpression("\\n"));
                for (QStringList::Iterator it = lines.begin();
                     it != lines.end(); it++) {
                        if ((*it).startsWith("p2p_group_client:"))
@@ -903,7 +903,7 @@ void Peers::event_notify(WpaMsg msg)
                 * group_capab=0x0
                 */
                QStringList items =
-                       text.split(QRegExp(" (?=[^']*('[^']*'[^']*)*$)"));
+                       text.split(QRegularExpression(" (?=[^']*('[^']*'[^']*)*$)"));
                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 bb7373749c2fc7cd3959b734adfeb17c57b20282..c44bba99a830da6a8aef732f6db8ad7e3df87ae9 100644 (file)
--- 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 a2e3072fb6e1e339b6e3e39abb15dbf8354d429b..ba04b4f38b31951a0c6b16c048a641c08018478f 100644 (file)
--- a/wpa_supplicant/wpa_gui-qt4/scanresults.cpp
+++ b/wpa_supplicant/wpa_gui-qt4/scanresults.cpp
@@ -77,7 +77,7 @@ void ScanResults::updateResults()
 
                QString ssid, bssid, freq, signal, flags;
 
-               QStringList lines = bss.split(QRegExp("\\n"));
+               QStringList lines = bss.split(QRegularExpression("\\n"));
                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 2cddd133fe2b7f987f08490b81d5ea2edcd9036d..39bba90ce902c4f2b880673b0619e74a362afb21 100644 (file)
--- 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 b6d1ad2f4f1ebce3d0750f8b548d0c0f10813a9b..3f7dccb2862d5041637fad89d1f781383cd6facb 100644 (file)
--- 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/wpagui.cpp b/wpa_supplicant/wpa_gui-qt4/wpagui.cpp
index 9404ab4249b786c921841e29aaa897c11fe5edb0..0c125d90fc0645dcf2efced065fadd5d50d6b348 100644 (file)
--- a/wpa_supplicant/wpa_gui-qt4/wpagui.cpp
+++ b/wpa_supplicant/wpa_gui-qt4/wpagui.cpp
@@ -99,9 +99,9 @@ WpaGui::WpaGui(QApplication *_app, QWidget *parent, const char *,
        connect(disconnectButton, SIGNAL(clicked()), this, SLOT(disconnect()));
        connect(scanButton, SIGNAL(clicked()), this, SLOT(scan()));
        connect(connectButton, SIGNAL(clicked()), this, SLOT(connectB()));
-       connect(adapterSelect, SIGNAL(activated(const QString&)), this,
+       connect(adapterSelect, SIGNAL(textActivated(const QString&)), this,
                SLOT(selectAdapter(const QString&)));
-       connect(networkSelect, SIGNAL(activated(const QString&)), this,
+       connect(networkSelect, SIGNAL(textActivated(const QString&)), this,
                SLOT(selectNetwork(const QString&)));
        connect(addNetworkButton, SIGNAL(clicked()), this, SLOT(addNetwork()));
        connect(editNetworkButton, SIGNAL(clicked()), this,
@@ -1078,7 +1078,7 @@ void WpaGui::selectNetwork( const QString &sel )
        char reply[10];
        size_t reply_len = sizeof(reply);
 
-       if (cmd.contains(QRegExp("^\\d+:")))
+       if (cmd.contains(QRegularExpression("^\\d+:")))
                cmd.truncate(cmd.indexOf(':'));
        else
                cmd = "any";
@@ -1095,7 +1095,7 @@ void WpaGui::enableNetwork(const QString &sel)
        char reply[10];
        size_t reply_len = sizeof(reply);
 
-       if (cmd.contains(QRegExp("^\\d+:")))
+       if (cmd.contains(QRegularExpression("^\\d+:")))
                cmd.truncate(cmd.indexOf(':'));
        else if (!cmd.startsWith("all")) {
                debug("Invalid editNetwork '%s'",
@@ -1114,7 +1114,7 @@ void WpaGui::disableNetwork(const QString &sel)
        char reply[10];
        size_t reply_len = sizeof(reply);
 
-       if (cmd.contains(QRegExp("^\\d+:")))
+       if (cmd.contains(QRegularExpression("^\\d+:")))
                cmd.truncate(cmd.indexOf(':'));
        else if (!cmd.startsWith("all")) {
                debug("Invalid editNetwork '%s'",
@@ -1132,7 +1132,7 @@ void WpaGui::editNetwork(const QString &sel)
        QString cmd(sel);
        int id = -1;
 
-       if (cmd.contains(QRegExp("^\\d+:"))) {
+       if (cmd.contains(QRegularExpression("^\\d+:"))) {
                cmd.truncate(cmd.indexOf(':'));
                id = cmd.toInt();
        }
@@ -1204,7 +1204,7 @@ void WpaGui::removeNetwork(const QString &sel)
        char reply[10];
        size_t reply_len = sizeof(reply);
 
-       if (cmd.contains(QRegExp("^\\d+:")))
+       if (cmd.contains(QRegularExpression("^\\d+:")))
                cmd.truncate(cmd.indexOf(':'));
        else if (!cmd.startsWith("all")) {
                debug("Invalid editNetwork '%s'",
@@ -1476,7 +1476,7 @@ void WpaGui::showTrayStatus()
 
        QString msg, status(buf);
 
-       QStringList lines = status.split(QRegExp("\\n"));
+       QStringList lines = status.split(QRegularExpression("\\n"));
        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 f0a34c97ebe8ec7a6d5bea670424a80d668f8de0..898722bd907e1e8d9d813ca6ebd807ce85d147c5 100644 (file)
--- 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);

diff --git a/wpa_supplicant/wpa_gui-qt4/wpamsg.h b/wpa_supplicant/wpa_gui-qt4/wpamsg.h
index 8f2fcdc419886b60d6bb879c0d11c8a83919cf58..fe36e2044f34d2eaa3bcd89be5bd48e809f844dc 100644 (file)
--- a/wpa_supplicant/wpa_gui-qt4/wpamsg.h
+++ b/wpa_supplicant/wpa_gui-qt4/wpamsg.h
@@ -10,7 +10,7 @@
 #define WPAMSG_H
 
 #include <QDateTime>
-#include <QLinkedList>
+#include <QList>
 
 class WpaMsg {
 public:
@@ -30,6 +30,6 @@ private:
        QDateTime timestamp;
 };
 
-typedef QLinkedList<WpaMsg> WpaMsgList;
+typedef QList<WpaMsg> WpaMsgList;
 
 #endif /* WPAMSG_H */