diff options
| author | Kari Oikarinen <kari.oikarinen@qt.io> | 2017-04-07 16:23:35 +0300 |
|---|---|---|
| committer | Kari Oikarinen <kari.oikarinen@qt.io> | 2017-04-10 11:48:32 +0000 |
| commit | 314de829065a3fa411b8fed90ff1289b000e229b (patch) | |
| tree | 1f075b1f5b17ee545c5a1cf4dab0b21176b0919f /src/networksettings/connman | |
| parent | c396ac229303aeafa06e741948f68b94c1671e1e (diff) | |
Don't give connman user name as a network name
Don't give the network name as all, since it is not required for visible
networks. Also adjust the API to remove the user name parameter that was
never used (correctly).
Task-number: QTBUG-57249
Change-Id: I0eb75db6eebcaa05661a9404b728ab8af831cf1d
Reviewed-by: Teemu Holappa <teemu.holappa@qt.io>
Diffstat (limited to 'src/networksettings/connman')
| -rw-r--r-- | src/networksettings/connman/qnetworksettingsuseragent_p.cpp | 7 | ||||
| -rw-r--r-- | src/networksettings/connman/qnetworksettingsuseragent_p.h | 3 |
2 files changed, 3 insertions, 7 deletions
diff --git a/src/networksettings/connman/qnetworksettingsuseragent_p.cpp b/src/networksettings/connman/qnetworksettingsuseragent_p.cpp index 4791c6e..4d6e10b 100644 --- a/src/networksettings/connman/qnetworksettingsuseragent_p.cpp +++ b/src/networksettings/connman/qnetworksettingsuseragent_p.cpp @@ -80,13 +80,10 @@ QVariantMap QNetworkSettingsUserAgentPrivate::RequestInput(const QDBusObjectPath return QVariantMap(); } -void QNetworkSettingsUserAgentPrivate::setUserCredentials(const QString& username, - const QString& password) +void QNetworkSettingsUserAgentPrivate::setPassphrase(const QString& passphrase) { - m_username = username; - m_passphrase = password; + m_passphrase = passphrase; QVariantMap response; - response[PropertyName] = m_username; response[PropertyPassphrase] = m_passphrase; m_reply << response; m_pendingReply = false; diff --git a/src/networksettings/connman/qnetworksettingsuseragent_p.h b/src/networksettings/connman/qnetworksettingsuseragent_p.h index 8df9b26..fb96645 100644 --- a/src/networksettings/connman/qnetworksettingsuseragent_p.h +++ b/src/networksettings/connman/qnetworksettingsuseragent_p.h @@ -62,7 +62,7 @@ class QNetworkSettingsUserAgentPrivate : public QDBusAbstractAdaptor Q_DECLARE_PUBLIC(QNetworkSettingsUserAgent) public: QNetworkSettingsUserAgentPrivate(QNetworkSettingsUserAgent *parent = Q_NULLPTR); - void setUserCredentials(const QString& aUsername, const QString& aPassword); + void setPassphrase(const QString &passphrase); void cancel(); void release(); public Q_SLOTS: // Dbus methods @@ -75,7 +75,6 @@ private: QDBusMessage m_reply; bool m_pendingReply; QString m_passphrase; - QString m_username; }; #endif // QNETWORKSETTINGSUSERAGENTPRIVATE_H |