Remove dep against wallet

CMakeLists.txt

@@ -29,10 +29,8 @@ set(KLDAP_LIB_VERSION ${PIM_VERSION})
 find_package(KF5KIO ${KF5_MIN_VERSION} CONFIG REQUIRED)
 find_package(KF5I18n ${KF5_MIN_VERSION} CONFIG REQUIRED)
 find_package(KF5DocTools ${KF5_MIN_VERSION} CONFIG)
-find_package(KF5Wallet ${KF5_MIN_VERSION} CONFIG REQUIRED)
 find_package(KF5KIO ${KF5_MIN_VERSION} CONFIG REQUIRED)
 
-#it will replace kwallet support
 find_package(Qt5Keychain CONFIG)
 set_package_properties(Qt5Keychain PROPERTIES
                                    DESCRIPTION "Provides support for secure credentials storage"

src/CMakeLists.txt

@@ -88,7 +88,6 @@ PRIVATE
   KF5::I18n
   KF5::WidgetsAddons
   KF5::ConfigCore
-  KF5::Wallet
   KF5::CoreAddons
   KF5::KIOCore
   ${kldap_EXTRA_LIBS}

src/widgets/ldapclientsearchconfig.cpp

@@ -12,7 +12,6 @@
 #include <KConfigGroup>
 #include <KMessageBox>
 #include <KLocalizedString>
-#include <kwallet.h>
 #include <qt5keychain/keychain.h>
 using namespace QKeychain;
 using namespace KLDAP;
@@ -26,15 +25,7 @@ public:
 
     ~Private()
     {
-        if (useWallet) {
-            wallet->deleteLater();
-            wallet = nullptr;
-        }
     }
-
-    KWallet::Wallet *wallet = nullptr;
-    bool useWallet = false;
-    bool askWallet = true;
 };
 
 Q_GLOBAL_STATIC_WITH_ARGS(KConfig, s_config, (QLatin1String("kabldaprc"), KConfig::NoGlobals))
@@ -54,7 +45,7 @@ LdapClientSearchConfig::~LdapClientSearchConfig()
 {
     delete d;
 }
-
+#if 0 //Port it
 void LdapClientSearchConfig::clearWalletPassword()
 {
     if (!d->wallet) {
@@ -70,14 +61,4 @@ void LdapClientSearchConfig::clearWalletPassword()
         }
     }
 }
-
-void LdapClientSearchConfig::slotWalletClosed()
-{
-    delete d->wallet;
-    d->wallet = nullptr;
-}
-
-void LdapClientSearchConfig::askForWallet(bool askForWallet)
-{
-    d->askWallet = askForWallet;
-}
+#endif

src/widgets/ldapclientsearchconfig.h

@@ -33,14 +33,6 @@ public:
      */
     static KConfig *config();
 
-    /**
-     * Should LdapClientSearchConfig ask, if it should use the Wallet to store passwords
-     */
-    void askForWallet(bool askForWallet);
-
-    void clearWalletPassword();
-private Q_SLOTS:
-    void slotWalletClosed();
 
 private:
     //@cond PRIVATE

src/widgets/ldapconfigurewidget.cpp

@@ -218,7 +218,7 @@ void LdapConfigureWidget::load()
 
 void LdapConfigureWidget::save()
 {
-    mClientSearchConfig->clearWalletPassword();
+    //mClientSearchConfig->clearWalletPassword();
     KConfig *config = KLDAP::LdapClientSearchConfig::config();
     config->deleteGroup("LDAP");