Activate more plugin

src/CMakeLists.txt

@@ -56,9 +56,9 @@ set(libimportwizard_autodetect_SRCS
     autodetect/pmail/pmailimportdata.cpp
     autodetect/pmail/pmailsettings.cpp
     autodetect/thebat/thebatimportdata.cpp
-    autodetect/balsa/balsaimportdata.cpp
-    autodetect/balsa/balsasettings.cpp
-    autodetect/balsa/balsaaddressbook.cpp
+#    autodetect/balsa/balsaimportdata.cpp
+#    autodetect/balsa/balsasettings.cpp
+#    autodetect/balsa/balsaaddressbook.cpp
     autodetect/claws-mail/clawsmailimportdata.cpp
     autodetect/claws-mail/clawsmailsettings.cpp
     autodetect/claws-mail/clawsmailaddressbook.cpp

src/autodetect/CMakeLists.txt

@@ -3,3 +3,4 @@ add_subdirectory(trojita)
 add_subdirectory(opera)
 add_subdirectory(mailapp)
 add_subdirectory(pmail)
+add_subdirectory(balsa)

src/autodetect/balsa/CMakeLists.txt

+set(balsaimporter_SRCS
+   balsaaddressbook.cpp  
+   balsaimportdata.cpp  
+   balsasettings.cpp
+)
+
+kcoreaddons_add_plugin(balsaimporterplugin JSON balsaimporter.json SOURCES
+    ${balsaimporter_SRCS} INSTALL_NAMESPACE importwizard)
+
+
+target_link_libraries(balsaimporterplugin
+  libimportwizard
+  KF5::XmlGui
+  KF5::I18n
+  KF5::Contacts
+  KF5::MailImporterAkonadi
+  KF5::MailTransport
+  KF5::MailCommon
+  KF5::IdentityManagement
+  KF5::MessageViewer
+)

src/autodetect/balsa/balsaaddressbook.cpp

@@ -79,7 +79,7 @@ void BalsaAddressBook::readAddressBook(const KConfigGroup &grp)
         ImportWizardUtil::mergeLdap(ldap);
         addAddressBookImportInfo(i18n("Ldap created"));
     } else if (type == QLatin1String("LibBalsaAddressBookGpe")) {
-        qCDebug(IMPORTWIZARD_LOG) << " Import it !";
+        //FIXME qCDebug(IMPORTWIZARD_LOG) << " Import it !";
     } else if (type == QLatin1String("LibBalsaAddressBookLdif")) {
         const QString path = grp.readEntry(QStringLiteral("Path"));
         if (!path.isEmpty()) {
@@ -110,6 +110,6 @@ void BalsaAddressBook::readAddressBook(const KConfigGroup &grp)
             addAddressBookImportInfo(i18n("New addressbook created: %1", createResource(QStringLiteral("akonadi_vcard_resource"), name, settings)));
         }
     } else {
-        qCDebug(IMPORTWIZARD_LOG) << " unknown addressbook type :" << type;
+        //FIXME qCDebug(IMPORTWIZARD_LOG) << " unknown addressbook type :" << type;
     }
 }

src/autodetect/balsa/balsaimportdata.cpp

@@ -30,7 +30,7 @@
 #include <kpluginfactory.h>
 #include <QDir>
 
-//K_PLUGIN_FACTORY_WITH_JSON(BalsaImporterFactory, "balsaimporter.json", registerPlugin<BalsaImportData>();)
+K_PLUGIN_FACTORY_WITH_JSON(BalsaImporterFactory, "balsaimporter.json", registerPlugin<BalsaImportData>();)
 
 BalsaImportData::BalsaImportData(QObject *parent, const QList<QVariant> &)
     : AbstractImporter(parent)

src/autodetect/balsa/balsasettings.cpp

@@ -96,7 +96,7 @@ void BalsaSettings::readAccount(const KConfigGroup &grp, bool autoCheck, int aut
         addCheckMailOnStartup(agentIdentifyName, autoCheck);
         addToManualCheck(agentIdentifyName, check);
     } else {
-        qCDebug(IMPORTWIZARD_LOG) << " unknown account type :" << type;
+        //FIXME qCDebug(IMPORTWIZARD_LOG) << " unknown account type :" << type;
     }
 }
 
@@ -164,7 +164,7 @@ void BalsaSettings::readTransport(const KConfigGroup &grp)
     } else if (ssl == QLatin1String("false")) {
         mt->setEncryption(MailTransport::Transport::EnumEncryption::None);
     } else {
-        qCDebug(IMPORTWIZARD_LOG) << " unknown ssl value :" << ssl;
+        //FIXME qCDebug(IMPORTWIZARD_LOG) << " unknown ssl value :" << ssl;
     }
 
     //TODO const QString anonymous = grp.readEntry(QStringLiteral("Anonymous"));

src/autodetect/importwizardutil.h

@@ -23,6 +23,7 @@
 #include <QList>
 #include <QColor>
 #include <QString>
+#include "libimportwizard_export.h"
 
 struct ldapStruct {
     ldapStruct()
@@ -64,7 +65,7 @@ enum ResourceType {
     Ldap
 };
 
-void mergeLdap(const ldapStruct &ldap);
+LIBIMPORTWIZARD_EXPORT void mergeLdap(const ldapStruct &ldap);
 void addAkonadiTag(const QVector<tagStruct> &tagList);
 void storeInKWallet(const QString &name, ImportWizardUtil::ResourceType type, const QString &password);
 }

src/importwizard.cpp

@@ -35,7 +35,7 @@
 #include "autodetect/icedove/icedoveimportdata.h"
 #include "autodetect/oe/oeimportdata.h"
 #include "autodetect/thebat/thebatimportdata.h"
-#include "autodetect/balsa/balsaimportdata.h"
+//#include "autodetect/balsa/balsaimportdata.h"
 #include "autodetect/claws-mail/clawsmailimportdata.h"
 
 #include "manual/manualimportmailpage.h"
@@ -262,9 +262,9 @@ void ImportWizard::initializeImportModule()
     addImportModule(importer);
 #endif
 
-    importer = new BalsaImportData(this);
-    importer->setImportWizard(this);
-    addImportModule(importer);
+//    importer = new BalsaImportData(this);
+//    importer->setImportWizard(this);
+//    addImportModule(importer);
 
     importer = new ClawsMailImportData(this);
     importer->setImportWizard(this);