summaryrefslogtreecommitdiffstats
path: root/src/networksettings/wpasupplicant
diff options
context:
space:
mode:
Diffstat (limited to 'src/networksettings/wpasupplicant')
-rw-r--r--src/networksettings/wpasupplicant/qnetworksettingsmanager_p.cpp2
-rw-r--r--src/networksettings/wpasupplicant/qnetworksettingsuseragent_p.cpp5
-rw-r--r--src/networksettings/wpasupplicant/qnetworksettingsuseragent_p.h3
3 files changed, 4 insertions, 6 deletions
diff --git a/src/networksettings/wpasupplicant/qnetworksettingsmanager_p.cpp b/src/networksettings/wpasupplicant/qnetworksettingsmanager_p.cpp
index 30f3f61..8721257 100644
--- a/src/networksettings/wpasupplicant/qnetworksettingsmanager_p.cpp
+++ b/src/networksettings/wpasupplicant/qnetworksettingsmanager_p.cpp
@@ -142,7 +142,7 @@ void QNetworkSettingsManagerPrivate::userInteractionReady(bool cancel)
if (!service) {
return;
}
- QString psk = m_agent->passPhrase();
+ QString psk = m_agent->passphrase();
// --------------------- configure network ------------------------------
// ref: http://w1.fi/cgit/hostap/plain/wpa_supplicant/wpa_supplicant.conf
diff --git a/src/networksettings/wpasupplicant/qnetworksettingsuseragent_p.cpp b/src/networksettings/wpasupplicant/qnetworksettingsuseragent_p.cpp
index b463606..4d49127 100644
--- a/src/networksettings/wpasupplicant/qnetworksettingsuseragent_p.cpp
+++ b/src/networksettings/wpasupplicant/qnetworksettingsuseragent_p.cpp
@@ -35,11 +35,10 @@ QNetworkSettingsUserAgentPrivate::QNetworkSettingsUserAgentPrivate(QNetworkSetti
}
-void QNetworkSettingsUserAgentPrivate::setUserCredentials(const QString& aUsername, const QString& aPassword)
+void QNetworkSettingsUserAgentPrivate::setPassphrase(const QString &passphrase)
{
Q_Q(QNetworkSettingsUserAgent);
- m_passphrase = aPassword;
- m_username = aUsername;
+ m_passphrase = passphrase;
emit q->ready(false);
}
diff --git a/src/networksettings/wpasupplicant/qnetworksettingsuseragent_p.h b/src/networksettings/wpasupplicant/qnetworksettingsuseragent_p.h
index 6b9fade..f2051c2 100644
--- a/src/networksettings/wpasupplicant/qnetworksettingsuseragent_p.h
+++ b/src/networksettings/wpasupplicant/qnetworksettingsuseragent_p.h
@@ -50,10 +50,9 @@ class QNetworkSettingsUserAgentPrivate : public QObject
public:
explicit QNetworkSettingsUserAgentPrivate(QNetworkSettingsUserAgent* parent);
virtual ~QNetworkSettingsUserAgentPrivate() {}
- void setUserCredentials(const QString& aUsername, const QString& aPassword);
+ void setPassphrase(const QString &passphrase);
void cancel();
QString m_passphrase;
- QString m_username;
QNetworkSettingsUserAgent *q_ptr;
};