From 0573dbda0afe67a81c27cd0adbccc14d90759b7d Mon Sep 17 00:00:00 2001
From: Michele Calgaro <michele.calgaro@yahoo.it>
Date: Sun, 2 Dec 2018 22:40:32 +0900
Subject: Adapted to new KPasswordEdit::password() signature. This relates to
 bug 2961.

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
---
 src/primaryrealmwizard/primaryrealmwizard.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/primaryrealmwizard')

diff --git a/src/primaryrealmwizard/primaryrealmwizard.cpp b/src/primaryrealmwizard/primaryrealmwizard.cpp
index bfd96cd..5d4ce69 100644
--- a/src/primaryrealmwizard/primaryrealmwizard.cpp
+++ b/src/primaryrealmwizard/primaryrealmwizard.cpp
@@ -287,11 +287,11 @@ void PrimaryRealmWizard::closeEvent(TQCloseEvent* e){
 /** maybe call a dialog that the wizard has finished. */
 void PrimaryRealmWizard::accept() {
 	// Validate entries
-	if (TQString(finishpage->ldapAdminPassword->password()) != TQString(finishpage->ldapConfirmAdminPassword->password())) {
+	if (finishpage->ldapAdminPassword->password() != finishpage->ldapConfirmAdminPassword->password()) {
 		KMessageBox::error(this, i18n("<qt><b>Passwords do not match!</b><p>Please re-enter the new administration account password</qt>"), i18n("Input Error"));
 		return;
 	}
-	if (TQString(finishpage->ldapAdminPassword->password()) == "") {
+	if (finishpage->ldapAdminPassword->password() == "") {
 		KMessageBox::error(this, i18n("<qt><b>Password required!</b><p>Please enter the new administration account password</qt>"), i18n("Input Error"));
 		return;
 	}
@@ -307,7 +307,7 @@ void PrimaryRealmWizard::accept() {
 	cancelButton()->setEnabled(false);
 	finishpage->setEnabled(false);
 
-	if (m_controller->createNewLDAPRealm(this, m_realmconfig, finishpage->ldapAdminUsername->text(), finishpage->ldapAdminGroupname->text(), finishpage->ldapMachineAdminGroupname->text(), finishpage->ldapStandardUserGroupname->text(), finishpage->ldapAdminPassword->password(), "admin", finishpage->ldapAdminPassword->password(), finishpage->ldapAdminRealm->text(), m_certconfig, &errorString) == 0) {
+	if (m_controller->createNewLDAPRealm(this, m_realmconfig, finishpage->ldapAdminUsername->text(), finishpage->ldapAdminGroupname->text(), finishpage->ldapMachineAdminGroupname->text(), finishpage->ldapStandardUserGroupname->text(), finishpage->ldapAdminPassword->password().utf8(), "admin", finishpage->ldapAdminPassword->password().utf8(), finishpage->ldapAdminRealm->text(), m_certconfig, &errorString) == 0) {
 		done(0);
 	}
 	else {
-- 
cgit v1.2.1