From e1ed6a4e35b03aded27f8c505aa2f6ee9f94098b Mon Sep 17 00:00:00 2001 From: Sami Nurmenniemi Date: Tue, 7 Nov 2017 15:16:21 +0200 Subject: More user friendly handling of WiFi passphrase Task-number: QTBUG-64230 Change-Id: I9de0f5668b419e322a3b0466f2e30a6f957e617e Reviewed-by: Kari Oikarinen Reviewed-by: Teemu Holappa --- src/networksettings/connman/qnetworksettingsmanager_p.cpp | 7 ++----- src/networksettings/qnetworksettingsservice.h | 1 - 2 files changed, 2 insertions(+), 6 deletions(-) (limited to 'src/networksettings') diff --git a/src/networksettings/connman/qnetworksettingsmanager_p.cpp b/src/networksettings/connman/qnetworksettingsmanager_p.cpp index e3f6d0b..d666b10 100644 --- a/src/networksettings/connman/qnetworksettingsmanager_p.cpp +++ b/src/networksettings/connman/qnetworksettingsmanager_p.cpp @@ -79,12 +79,9 @@ QNetworkSettingsManagerPrivate::QNetworkSettingsManagerPrivate(QNetworkSettingsM void QNetworkSettingsManagerPrivate::requestInput(const QString& service, const QString& type) { + Q_UNUSED(service); Q_UNUSED(type); - foreach (QNetworkSettingsService* servicePtr, m_serviceModel->getModel()) { - if (servicePtr->id() == service) - emit servicePtr->showCrendentialInput(); - } - m_agent->showUserCredentialsInput(); + emit m_agent->showUserCredentialsInput(); } void QNetworkSettingsManagerPrivate::getServicesFinished(QDBusPendingCallWatcher *watcher) diff --git a/src/networksettings/qnetworksettingsservice.h b/src/networksettings/qnetworksettingsservice.h index 3019b2d..be24a5c 100644 --- a/src/networksettings/qnetworksettingsservice.h +++ b/src/networksettings/qnetworksettingsservice.h @@ -85,7 +85,6 @@ Q_SIGNALS: void domainsChanged(); void nameserversChanged(); void wirelessChanged(); - void showCrendentialInput(); protected: QNetworkSettingsServicePrivate *d_ptr; -- cgit v1.2.3