From 2c289237c6f360e696c0bb9cdb96b9b67bcb926b Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Mon, 3 Dec 2018 19:58:20 +0900 Subject: Adapted to new KPasswordEdit::password() signature. This relates to bug 2961.git Signed-off-by: Michele Calgaro --- .../tdenetman-connection_setting_wireless_security_widget.cpp | 2 +- tdenetworkmanager/vpn-plugins/openvpn/src/tdenetman-openvpn.cpp | 2 +- tdenetworkmanager/vpn-plugins/pptp/src/tdenetman-pptp.cpp | 2 +- tdenetworkmanager/vpn-plugins/strongswan/src/tdenetman-strongswan.cpp | 2 +- tdenetworkmanager/vpn-plugins/vpnc/src/tdenetman-vpnc.cpp | 4 ++-- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/tdenetworkmanager/src/configwidgets/tdenetman-connection_setting_wireless_security_widget.cpp b/tdenetworkmanager/src/configwidgets/tdenetman-connection_setting_wireless_security_widget.cpp index 17d1dd8..e1c8fac 100644 --- a/tdenetworkmanager/src/configwidgets/tdenetman-connection_setting_wireless_security_widget.cpp +++ b/tdenetworkmanager/src/configwidgets/tdenetman-connection_setting_wireless_security_widget.cpp @@ -660,7 +660,7 @@ void WirelessSecurityEAPImpl::slotAnonIdentityChanged(const TQString& identity) void WirelessSecurityEAPImpl::slotPasswordChanged(const TQString& pwd) { - _security_setting->eapConfig.password = TQString(txtPassword->password()); + _security_setting->eapConfig.password = txtPassword->password(); _security_setting->eapConfig.secretsValid = true; if (_parentdialog) _parentdialog->slotEnableButtons(); // Update lockouts diff --git a/tdenetworkmanager/vpn-plugins/openvpn/src/tdenetman-openvpn.cpp b/tdenetworkmanager/vpn-plugins/openvpn/src/tdenetman-openvpn.cpp index 845d179..4f153c9 100644 --- a/tdenetworkmanager/vpn-plugins/openvpn/src/tdenetman-openvpn.cpp +++ b/tdenetworkmanager/vpn-plugins/openvpn/src/tdenetman-openvpn.cpp @@ -588,7 +588,7 @@ TDENetworkSettingsMap OpenVPNAuthentication::getPasswords() { TQMap pwds; if ((_connectionType == OpenVPNConnectionType::PASSWORD) || (_connectionType == OpenVPNConnectionType::X509USERPASS)) - pwds.insert("password", TQString(_openvpnAuth->editUserPassword->password())); + pwds.insert("password", _openvpnAuth->editUserPassword->password()); else pwds.insert("no-secret", TQString("true")); diff --git a/tdenetworkmanager/vpn-plugins/pptp/src/tdenetman-pptp.cpp b/tdenetworkmanager/vpn-plugins/pptp/src/tdenetman-pptp.cpp index d3fca42..9231d86 100644 --- a/tdenetworkmanager/vpn-plugins/pptp/src/tdenetman-pptp.cpp +++ b/tdenetworkmanager/vpn-plugins/pptp/src/tdenetman-pptp.cpp @@ -239,7 +239,7 @@ TDENetworkSettingsMap PPTPAuthentication::getPasswords() TDENetworkSettingsMap pwds; //pwds.insert("CHAP", "CHAP"); pwds.insert("user", TQString(_pptpAuth->username->text())); - pwds.insert("password", TQString(_pptpAuth->password->password())); + pwds.insert("password", _pptpAuth->password->password()); pwds.insert("domain", TQString(_pptpAuth->domain->text())); return pwds; } diff --git a/tdenetworkmanager/vpn-plugins/strongswan/src/tdenetman-strongswan.cpp b/tdenetworkmanager/vpn-plugins/strongswan/src/tdenetman-strongswan.cpp index b818987..a8d7ea5 100644 --- a/tdenetworkmanager/vpn-plugins/strongswan/src/tdenetman-strongswan.cpp +++ b/tdenetworkmanager/vpn-plugins/strongswan/src/tdenetman-strongswan.cpp @@ -246,7 +246,7 @@ TDENetworkSettingsMap StrongswanAuthentication::getPasswords() { TQMap pwds; pwds.insert("user", TQString(_strongswanAuth->username->text())); - pwds.insert("password", TQString(_strongswanAuth->password->password())); + pwds.insert("password", _strongswanAuth->password->password()); return pwds; } diff --git a/tdenetworkmanager/vpn-plugins/vpnc/src/tdenetman-vpnc.cpp b/tdenetworkmanager/vpn-plugins/vpnc/src/tdenetman-vpnc.cpp index 506dabd..783d7f5 100644 --- a/tdenetworkmanager/vpn-plugins/vpnc/src/tdenetman-vpnc.cpp +++ b/tdenetworkmanager/vpn-plugins/vpnc/src/tdenetman-vpnc.cpp @@ -390,7 +390,7 @@ VPNCAuthentication::~VPNCAuthentication() TDENetworkSettingsMap VPNCAuthentication::getPasswords() { TDENetworkSettingsMap pwds; - pwds.insert("Xauth password", TQString(_vpncAuth->editUserPassword->password())); + pwds.insert("Xauth password", _vpncAuth->editUserPassword->password()); if (_vpncAuth->chkObfusticated->isChecked()) { // Decrypt the obfusticated password with /usr/lib/vpnc/cisco-decrypt string decryptcommand="/usr/lib/vpnc/cisco-decrypt "; @@ -420,7 +420,7 @@ TDENetworkSettingsMap VPNCAuthentication::getPasswords() } } else { - pwds.insert("IPSec secret", TQString(_vpncAuth->editGroupPassword->password())); + pwds.insert("IPSec secret", _vpncAuth->editGroupPassword->password()); } return pwds; } -- cgit v1.2.3