Updated through tag hostap_2_5 from git://w1.fi/hostap.git

[mech_eap.git] / libeap / wpa_supplicant / wpa_gui-qt4 / networkconfig.cpp

diff --git a/libeap/wpa_supplicant/wpa_gui-qt4/networkconfig.cpp b/libeap/wpa_supplicant/wpa_gui-qt4/networkconfig.cpp
index fe50a8d..2727318 100644 (file)
--- a/libeap/wpa_supplicant/wpa_gui-qt4/networkconfig.cpp
+++ b/libeap/wpa_supplicant/wpa_gui-qt4/networkconfig.cpp
@@ -2,14 +2,8 @@
  * wpa_gui - NetworkConfig class
  * Copyright (c) 2005-2006, Jouni Malinen <j@w1.fi>
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- *
- * Alternatively, this software may be distributed under the terms of BSD
- * license.
- *
- * See README and COPYING for more details.
+ * This software may be distributed under the terms of the BSD license.
+ * See README for more details.
  */
 
 #include <cstdio>
@@ -32,7 +26,8 @@ enum {
 #define WPA_GUI_KEY_DATA "[key is configured]"
 
 
-NetworkConfig::NetworkConfig(QWidget *parent, const char *, bool, Qt::WFlags)
+NetworkConfig::NetworkConfig(QWidget *parent, const char *, bool,
+                            Qt::WindowFlags)
        : QDialog(parent)
 {
        setupUi(this);
@@ -243,7 +238,7 @@ void NetworkConfig::addNetwork()
        } else
                id = edit_network_id;
 
-       setNetworkParam(id, "ssid", ssidEdit->text().toAscii().constData(),
+       setNetworkParam(id, "ssid", ssidEdit->text().toLocal8Bit().constData(),
                        true);
 
        const char *key_mgmt = NULL, *proto = NULL, *pairwise = NULL;
@@ -297,14 +292,14 @@ void NetworkConfig::addNetwork()
                setNetworkParam(id, "group", "TKIP CCMP WEP104 WEP40", false);
        }
        if (pskEdit->isEnabled() &&
-           strcmp(pskEdit->text().toAscii().constData(),
+           strcmp(pskEdit->text().toLocal8Bit().constData(),
                   WPA_GUI_KEY_DATA) != 0)
                setNetworkParam(id, "psk",
-                               pskEdit->text().toAscii().constData(),
+                               pskEdit->text().toLocal8Bit().constData(),
                                psklen != 64);
        if (eapSelect->isEnabled()) {
                const char *eap =
-                       eapSelect->currentText().toAscii().constData();
+                       eapSelect->currentText().toLocal8Bit().constData();
                setNetworkParam(id, "eap", eap, false);
                if (strcmp(eap, "SIM") == 0 || strcmp(eap, "AKA") == 0)
                        setNetworkParam(id, "pcsc", "", true);
@@ -320,21 +315,21 @@ void NetworkConfig::addNetwork()
                        if (inner.startsWith("EAP-"))
                                snprintf(phase2, sizeof(phase2), "auth=%s",
                                         inner.right(inner.size() - 4).
-                                        toAscii().constData());
+                                        toLocal8Bit().constData());
                } else if (eap.compare("TTLS") == 0) {
                        if (inner.startsWith("EAP-"))
                                snprintf(phase2, sizeof(phase2), "autheap=%s",
                                         inner.right(inner.size() - 4).
-                                        toAscii().constData());
+                                        toLocal8Bit().constData());
                        else
                                snprintf(phase2, sizeof(phase2), "auth=%s",
-                                        inner.toAscii().constData());
+                                        inner.toLocal8Bit().constData());
                } else if (eap.compare("FAST") == 0) {
                        const char *provisioning = NULL;
                        if (inner.startsWith("EAP-")) {
                                snprintf(phase2, sizeof(phase2), "auth=%s",
                                         inner.right(inner.size() - 4).
-                                        toAscii().constData());
+                                        toLocal8Bit().constData());
                                provisioning = "fast_provisioning=2";
                        } else if (inner.compare("GTC(auth) + MSCHAPv2(prov)")
                                   == 0) {
@@ -360,21 +355,21 @@ void NetworkConfig::addNetwork()
                setNetworkParam(id, "phase2", "NULL", false);
        if (identityEdit->isEnabled() && identityEdit->text().length() > 0)
                setNetworkParam(id, "identity",
-                               identityEdit->text().toAscii().constData(),
+                               identityEdit->text().toLocal8Bit().constData(),
                                true);
        else
                setNetworkParam(id, "identity", "NULL", false);
        if (passwordEdit->isEnabled() && passwordEdit->text().length() > 0 &&
-           strcmp(passwordEdit->text().toAscii().constData(),
+           strcmp(passwordEdit->text().toLocal8Bit().constData(),
                   WPA_GUI_KEY_DATA) != 0)
                setNetworkParam(id, "password",
-                               passwordEdit->text().toAscii().constData(),
+                               passwordEdit->text().toLocal8Bit().constData(),
                                true);
        else if (passwordEdit->text().length() == 0)
                setNetworkParam(id, "password", "NULL", false);
        if (cacertEdit->isEnabled() && cacertEdit->text().length() > 0)
                setNetworkParam(id, "ca_cert",
-                               cacertEdit->text().toAscii().constData(),
+                               cacertEdit->text().toLocal8Bit().constData(),
                                true);
        else
                setNetworkParam(id, "ca_cert", "NULL", false);
@@ -394,7 +389,7 @@ void NetworkConfig::addNetwork()
 
        if (idstrEdit->isEnabled() && idstrEdit->text().length() > 0)
                setNetworkParam(id, "id_str",
-                               idstrEdit->text().toAscii().constData(),
+                               idstrEdit->text().toLocal8Bit().constData(),
                                true);
        else
                setNetworkParam(id, "id_str", "NULL", false);
@@ -402,7 +397,7 @@ void NetworkConfig::addNetwork()
        if (prioritySpinBox->isEnabled()) {
                QString prio;
                prio = prio.setNum(prioritySpinBox->value());
-               setNetworkParam(id, "priority", prio.toAscii().constData(),
+               setNetworkParam(id, "priority", prio.toLocal8Bit().constData(),
                                false);
        }
 
@@ -474,7 +469,7 @@ void NetworkConfig::writeWepKey(int network_id, QLineEdit *edit, int id)
         * Assume hex key if only hex characters are present and length matches
         * with 40, 104, or 128-bit key
         */
-       txt = edit->text().toAscii().constData();
+       txt = edit->text().toLocal8Bit().constData();
        if (strcmp(txt, WPA_GUI_KEY_DATA) == 0)
                return;
        len = strlen(txt);