From d643c4259f24929a2019264180d353b5b4f8939d Mon Sep 17 00:00:00 2001
From: Manuel Nickschas <sputnick@quassel-irc.org>
Date: Mon, 24 Oct 2016 00:21:05 +0200
Subject: [PATCH] ldap: ConnectionProperties -> AuthProperties

This commit changes the settings key to something making slightly
more sense in the context of authentication.
---
 src/core/core.cpp              | 4 ++--
 src/core/ldapauthenticator.cpp | 6 +++---
 src/core/ldapauthenticator.h   | 2 +-
 src/qtui/coreconfigwizard.cpp  | 4 ++--
 src/qtui/coreconfigwizard.h    | 2 +-
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/core/core.cpp b/src/core/core.cpp
index ec19aaa7..bb13e886 100644
--- a/src/core/core.cpp
+++ b/src/core/core.cpp
@@ -191,7 +191,7 @@ void Core::init()
 
     // Not entirely sure what is 'legacy' about the above, but it seems to be the way things work!
     QVariantMap authSettings = cs.authSettings().toMap();
-    initAuthenticator(authSettings.value("Authenticator").toString(), authSettings.value("ConnectionProperties").toMap());
+    initAuthenticator(authSettings.value("Authenticator").toString(), authSettings.value("AuthProperties").toMap());
 
     if (Quassel::isOptionSet("select-backend") || Quassel::isOptionSet("select-authenticator")) {
         if (Quassel::isOptionSet("select-backend")) {
@@ -1098,7 +1098,7 @@ void Core::saveAuthenticatorSettings(const QString &backend, const QVariantMap &
 {
     QVariantMap dbsettings;
     dbsettings["Authenticator"] = backend;
-    dbsettings["ConnectionProperties"] = settings;
+    dbsettings["AuthProperties"] = settings;
     CoreSettings().setAuthSettings(dbsettings);
 }
 
diff --git a/src/core/ldapauthenticator.cpp b/src/core/ldapauthenticator.cpp
index d79ebf18..b9f99227 100644
--- a/src/core/ldapauthenticator.cpp
+++ b/src/core/ldapauthenticator.cpp
@@ -102,7 +102,7 @@ QVariantMap LdapAuthenticator::setupDefaults() const
 }
 
 
-void LdapAuthenticator::setConnectionProperties(const QVariantMap &properties)
+void LdapAuthenticator::setAuthProperties(const QVariantMap &properties)
 {
     _hostName = properties["Hostname"].toString();
     _port = properties["Port"].toInt();
@@ -142,7 +142,7 @@ UserId LdapAuthenticator::validateUser(const QString &username, const QString &p
 
 bool LdapAuthenticator::setup(const QVariantMap &settings)
 {
-    setConnectionProperties(settings);
+    setAuthProperties(settings);
     bool status = ldapConnect();
     return status;
 }
@@ -150,7 +150,7 @@ bool LdapAuthenticator::setup(const QVariantMap &settings)
 
 Authenticator::State LdapAuthenticator::init(const QVariantMap &settings)
 {
-    setConnectionProperties(settings);
+    setAuthProperties(settings);
 
     bool status = ldapConnect();
     if (!status) {
diff --git a/src/core/ldapauthenticator.h b/src/core/ldapauthenticator.h
index a1498065..59a35b6b 100644
--- a/src/core/ldapauthenticator.h
+++ b/src/core/ldapauthenticator.h
@@ -68,7 +68,7 @@ public slots:
     UserId validateUser(const QString &user, const QString &password);
 
 protected:
-    virtual void setConnectionProperties(const QVariantMap &properties);
+    virtual void setAuthProperties(const QVariantMap &properties);
     bool ldapConnect();
     void ldapDisconnect();
     bool ldapAuth(const QString &username, const QString &password);
diff --git a/src/qtui/coreconfigwizard.cpp b/src/qtui/coreconfigwizard.cpp
index a4cfe166..99fc3540 100644
--- a/src/qtui/coreconfigwizard.cpp
+++ b/src/qtui/coreconfigwizard.cpp
@@ -246,7 +246,7 @@ QString AuthenticationSelectionPage::selectedBackend() const
 }
 
 
-QVariantMap AuthenticationSelectionPage::connectionProperties() const
+QVariantMap AuthenticationSelectionPage::authProperties() const
 {
     QString backend = ui.backendList->itemData(ui.backendList->currentIndex()).toString();
 
@@ -512,7 +512,7 @@ void SyncPage::initializePage()
     // Fill in sync info about the authentication layer.
     AuthenticationSelectionPage *authPage = qobject_cast<AuthenticationSelectionPage *>(wizard()->page(CoreConfigWizard::AuthenticationSelectionPage));
     QString authenticator = authPage->selectedBackend();
-    QVariantMap authProperties = authPage->connectionProperties();
+    QVariantMap authProperties = authPage->authProperties();
     Q_ASSERT(!authenticator.isEmpty());
     ui.authenticator->setText(authenticator);
 
diff --git a/src/qtui/coreconfigwizard.h b/src/qtui/coreconfigwizard.h
index b22fd19c..bcc765fe 100644
--- a/src/qtui/coreconfigwizard.h
+++ b/src/qtui/coreconfigwizard.h
@@ -119,7 +119,7 @@ public:
     AuthenticationSelectionPage(const QHash<QString, QVariant> &backends, QWidget *parent = 0);
     int nextId() const;
     QString selectedBackend() const;
-    QVariantMap connectionProperties() const;
+    QVariantMap authProperties() const;
 
 private slots:
     void on_backendList_currentIndexChanged();
-- 
2.20.1