summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMontel Laurent <[email protected]>2017-04-16 21:20:17 +0200
committerMontel Laurent <[email protected]>2017-04-16 21:20:17 +0200
commit93fb87456167a55fc029cdbda421c05a6cde3428 (patch)
tree2de55070bdfc49d5b6d2201961d8dde843a63d0a
parentc56da2b02e52e768572ad4014e270406b550148b (diff)
Convert to plugins
-rw-r--r--src/CMakeLists.txt14
-rw-r--r--src/autodetect/CMakeLists.txt3
-rw-r--r--src/autodetect/evolutionv1/CMakeLists.txt19
-rw-r--r--src/autodetect/evolutionv2/CMakeLists.txt19
-rw-r--r--src/autodetect/evolutionv3/CMakeLists.txt23
-rw-r--r--src/autodetect/evolutionv3/evolutioncalendar.cpp26
-rw-r--r--src/autodetect/evolutionv3/evolutionsettings.cpp64
-rw-r--r--src/autodetect/evolutionv3/evolutionutil.cpp10
-rw-r--r--src/importwizard.cpp22
9 files changed, 130 insertions, 70 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 88fb536..d869a4f 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -41,13 +41,13 @@ set(libimportwizard_autodetect_SRCS
autodetect/sylpheed/sylpheedsettings.cpp
autodetect/sylpheed/sylpheedaddressbook.cpp
autodetect/sylpheed/sylpheedsettingsutils.cpp
- autodetect/evolutionv3/evolutionv3importdata.cpp
- autodetect/evolutionv3/evolutionsettings.cpp
- autodetect/evolutionv3/evolutioncalendar.cpp
- autodetect/evolutionv3/evolutionaddressbook.cpp
- autodetect/evolutionv3/evolutionutil.cpp
- autodetect/evolutionv2/evolutionv2importdata.cpp
- autodetect/evolutionv1/evolutionv1importdata.cpp
+# autodetect/evolutionv3/evolutionv3importdata.cpp
+# autodetect/evolutionv3/evolutionsettings.cpp
+# autodetect/evolutionv3/evolutioncalendar.cpp
+# autodetect/evolutionv3/evolutionaddressbook.cpp
+# autodetect/evolutionv3/evolutionutil.cpp
+# autodetect/evolutionv2/evolutionv2importdata.cpp
+# autodetect/evolutionv1/evolutionv1importdata.cpp
# autodetect/opera/operaimportdata.cpp
# autodetect/opera/operaaddressbook.cpp
# autodetect/opera/operasettings.cpp
diff --git a/src/autodetect/CMakeLists.txt b/src/autodetect/CMakeLists.txt
index a9b7d24..ca35101 100644
--- a/src/autodetect/CMakeLists.txt
+++ b/src/autodetect/CMakeLists.txt
@@ -4,3 +4,6 @@ add_subdirectory(opera)
add_subdirectory(mailapp)
add_subdirectory(pmail)
add_subdirectory(balsa)
+add_subdirectory(evolutionv1)
+add_subdirectory(evolutionv2)
+add_subdirectory(evolutionv3)
diff --git a/src/autodetect/evolutionv1/CMakeLists.txt b/src/autodetect/evolutionv1/CMakeLists.txt
new file mode 100644
index 0000000..e6acffd
--- /dev/null
+++ b/src/autodetect/evolutionv1/CMakeLists.txt
@@ -0,0 +1,19 @@
+set(evolutionv1importer_SRCS
+ evolutionv1importdata.cpp
+)
+
+kcoreaddons_add_plugin(evolutionv1importerplugin JSON evolutionv1importer.json SOURCES
+ ${evolutionv1importer_SRCS} INSTALL_NAMESPACE importwizard)
+
+
+target_link_libraries(evolutionv1importerplugin
+ libimportwizard
+ KF5::XmlGui
+ KF5::I18n
+ KF5::Contacts
+ KF5::MailImporterAkonadi
+ KF5::MailTransport
+ KF5::MailCommon
+ KF5::IdentityManagement
+ KF5::MessageViewer
+)
diff --git a/src/autodetect/evolutionv2/CMakeLists.txt b/src/autodetect/evolutionv2/CMakeLists.txt
new file mode 100644
index 0000000..f462978
--- /dev/null
+++ b/src/autodetect/evolutionv2/CMakeLists.txt
@@ -0,0 +1,19 @@
+set(evolutionv2importer_SRCS
+ evolutionv2importdata.cpp
+)
+
+kcoreaddons_add_plugin(evolutionv2importerplugin JSON evolutionv2importer.json SOURCES
+ ${evolutionv2importer_SRCS} INSTALL_NAMESPACE importwizard)
+
+
+target_link_libraries(evolutionv2importerplugin
+ libimportwizard
+ KF5::XmlGui
+ KF5::I18n
+ KF5::Contacts
+ KF5::MailImporterAkonadi
+ KF5::MailTransport
+ KF5::MailCommon
+ KF5::IdentityManagement
+ KF5::MessageViewer
+)
diff --git a/src/autodetect/evolutionv3/CMakeLists.txt b/src/autodetect/evolutionv3/CMakeLists.txt
new file mode 100644
index 0000000..3a64e7e
--- /dev/null
+++ b/src/autodetect/evolutionv3/CMakeLists.txt
@@ -0,0 +1,23 @@
+set(evolutionv3importer_SRCS
+ evolutionaddressbook.cpp
+ evolutionv3importdata.cpp
+ evolutionsettings.cpp
+ evolutioncalendar.cpp
+ evolutionutil.cpp
+)
+
+kcoreaddons_add_plugin(evolutionv3importerplugin JSON evolutionv3importer.json SOURCES
+ ${evolutionv3importer_SRCS} INSTALL_NAMESPACE importwizard)
+
+
+target_link_libraries(evolutionv3importerplugin
+ libimportwizard
+ KF5::XmlGui
+ KF5::I18n
+ KF5::Contacts
+ KF5::MailImporterAkonadi
+ KF5::MailTransport
+ KF5::MailCommon
+ KF5::IdentityManagement
+ KF5::MessageViewer
+)
diff --git a/src/autodetect/evolutionv3/evolutioncalendar.cpp b/src/autodetect/evolutionv3/evolutioncalendar.cpp
index 76ecc73..5374a89 100644
--- a/src/autodetect/evolutionv3/evolutioncalendar.cpp
+++ b/src/autodetect/evolutionv3/evolutioncalendar.cpp
@@ -20,7 +20,7 @@
#include "evolutioncalendar.h"
#include "evolutionutil.h"
-#include "importwizard_debug.h"
+//#include "importwizard_debug.h"
#include <QFile>
#include <QDir>
@@ -42,7 +42,7 @@ void EvolutionCalendar::loadCalendar(const QString &filename)
//Read gconf file
QFile file(filename);
if (!file.open(QIODevice::ReadOnly)) {
- qCDebug(IMPORTWIZARD_LOG) << " We can't open file" << filename;
+ //FIXME qCDebug(IMPORTWIZARD_LOG) << " We can't open file" << filename;
return;
}
QDomDocument doc;
@@ -52,7 +52,7 @@ void EvolutionCalendar::loadCalendar(const QString &filename)
QDomElement config = doc.documentElement();
if (config.isNull()) {
- qCDebug(IMPORTWIZARD_LOG) << "No config found";
+ //FIXME qCDebug(IMPORTWIZARD_LOG) << "No config found";
return;
}
mCalendarPath = QDir::homePath() + QLatin1String("/.local/share/evolution/calendar/");
@@ -64,7 +64,7 @@ void EvolutionCalendar::loadCalendar(const QString &filename)
if (attr == QLatin1String("sources")) {
readCalendar(e);
} else {
- qCDebug(IMPORTWIZARD_LOG) << " attr unknown " << attr;
+ //FIXME qCDebug(IMPORTWIZARD_LOG) << " attr unknown " << attr;
}
}
}
@@ -92,7 +92,7 @@ void EvolutionCalendar::extractCalendarInfo(const QString &info)
QDomElement domElement = cal.documentElement();
if (domElement.isNull()) {
- qCDebug(IMPORTWIZARD_LOG) << "Account not found";
+ //FIXME qCDebug(IMPORTWIZARD_LOG) << "Account not found";
return;
}
QString base_uri;
@@ -134,28 +134,28 @@ void EvolutionCalendar::extractCalendarInfo(const QString &info)
}
}
} else if (propertyName == QLatin1String("alarm")) {
- qCDebug(IMPORTWIZARD_LOG) << " need to implement alarm property";
+ //FIXME qCDebug(IMPORTWIZARD_LOG) << " need to implement alarm property";
} else {
- qCDebug(IMPORTWIZARD_LOG) << " property unknown :" << propertyName;
+ //FIXME qCDebug(IMPORTWIZARD_LOG) << " property unknown :" << propertyName;
}
}
} else {
- qCDebug(IMPORTWIZARD_LOG) << " tag unknown :" << propertyTag;
+ //FIXME qCDebug(IMPORTWIZARD_LOG) << " tag unknown :" << propertyTag;
}
}
}
AbstractBase::createResource(QStringLiteral("akonadi_ical_resource"), name, settings);
} else {
- qCDebug(IMPORTWIZARD_LOG) << " tag unknown :" << tag;
+ //FIXME qCDebug(IMPORTWIZARD_LOG) << " tag unknown :" << tag;
}
}
} else if (base_uri == QLatin1String("webcal://")) {
- qCDebug(IMPORTWIZARD_LOG) << " need to implement webcal protocol";
+ //FIXME qCDebug(IMPORTWIZARD_LOG) << " need to implement webcal protocol";
} else if (base_uri == QLatin1String("google://")) {
- qCDebug(IMPORTWIZARD_LOG) << " need to implement google protocol";
+ //FIXME qCDebug(IMPORTWIZARD_LOG) << " need to implement google protocol";
} else if (base_uri == QLatin1String("caldav://")) {
- qCDebug(IMPORTWIZARD_LOG) << " need to implement caldav protocol";
+ //FIXME qCDebug(IMPORTWIZARD_LOG) << " need to implement caldav protocol";
} else {
- qCDebug(IMPORTWIZARD_LOG) << " base_uri unknown" << base_uri;
+ //FIXME qCDebug(IMPORTWIZARD_LOG) << " base_uri unknown" << base_uri;
}
}
diff --git a/src/autodetect/evolutionv3/evolutionsettings.cpp b/src/autodetect/evolutionv3/evolutionsettings.cpp
index 560498e..d8fcb31 100644
--- a/src/autodetect/evolutionv3/evolutionsettings.cpp
+++ b/src/autodetect/evolutionv3/evolutionsettings.cpp
@@ -26,7 +26,7 @@
#include <mailtransport/transportmanager.h>
-#include "importwizard_debug.h"
+//#include "importwizard_debug.h"
#include <QFile>
#include <QDir>
@@ -47,7 +47,7 @@ void EvolutionSettings::loadAccount(const QString &filename)
//Read gconf file
QFile file(filename);
if (!file.open(QIODevice::ReadOnly)) {
- qCDebug(IMPORTWIZARD_LOG) << " We can't open file" << filename;
+ //FIXME qCDebug(IMPORTWIZARD_LOG) << " We can't open file" << filename;
return;
}
QDomDocument doc;
@@ -57,7 +57,7 @@ void EvolutionSettings::loadAccount(const QString &filename)
QDomElement config = doc.documentElement();
if (config.isNull()) {
- qCDebug(IMPORTWIZARD_LOG) << "No config found in filename " << filename;
+ //FIXME qCDebug(IMPORTWIZARD_LOG) << "No config found in filename " << filename;
return;
}
for (QDomElement e = config.firstChildElement(); !e.isNull(); e = e.nextSiblingElement()) {
@@ -74,7 +74,7 @@ void EvolutionSettings::loadAccount(const QString &filename)
} else if (attr == QLatin1String("send_recv_on_start")) {
//TODO: implement it.
} else {
- qCDebug(IMPORTWIZARD_LOG) << " attr unknown " << attr;
+ //FIXME qCDebug(IMPORTWIZARD_LOG) << " attr unknown " << attr;
}
}
}
@@ -85,7 +85,7 @@ void EvolutionSettings::loadLdap(const QString &filename)
{
QFile file(filename);
if (!file.open(QIODevice::ReadOnly)) {
- qCDebug(IMPORTWIZARD_LOG) << " We can't open file" << filename;
+ //FIXME qCDebug(IMPORTWIZARD_LOG) << " We can't open file" << filename;
return;
}
QDomDocument doc;
@@ -108,7 +108,7 @@ void EvolutionSettings::loadLdap(const QString &filename)
void EvolutionSettings::readLdap(const QString &ldapStr)
{
- qCDebug(IMPORTWIZARD_LOG) << " ldap " << ldapStr;
+ //FIXME qCDebug(IMPORTWIZARD_LOG) << " ldap " << ldapStr;
QDomDocument ldap;
if (!EvolutionUtil::loadInDomDocument(ldapStr, ldap)) {
return;
@@ -117,7 +117,7 @@ void EvolutionSettings::readLdap(const QString &ldapStr)
QDomElement domElement = ldap.documentElement();
if (domElement.isNull()) {
- qCDebug(IMPORTWIZARD_LOG) << "ldap not found";
+ //FIXME qCDebug(IMPORTWIZARD_LOG) << "ldap not found";
return;
}
//Ldap server
@@ -131,7 +131,7 @@ void EvolutionSettings::readLdap(const QString &ldapStr)
QUrl url(uri);
ldap.port = url.port();
ldap.ldapUrl = url;
- qCDebug(IMPORTWIZARD_LOG) << " relative_uri" << relative_uri;
+ //FIXME qCDebug(IMPORTWIZARD_LOG) << " relative_uri" << relative_uri;
QDomElement propertiesElement = e.firstChildElement();
if (!propertiesElement.isNull()) {
@@ -149,7 +149,7 @@ void EvolutionSettings::readLdap(const QString &ldapStr)
} else if (value == QLatin1String("whenever_possible")) {
ldap.useTLS = true;
} else {
- qCDebug(IMPORTWIZARD_LOG) << " ssl attribute unknown" << value;
+ //FIXME qCDebug(IMPORTWIZARD_LOG) << " ssl attribute unknown" << value;
}
} else if (propertyName == QLatin1String("limit")) {
ldap.limit = property.attribute(QStringLiteral("value")).toInt();
@@ -164,15 +164,15 @@ void EvolutionSettings::readLdap(const QString &ldapStr)
} else if (value == QLatin1String("ldap/simple-binddn")) {
//TODO:
} else {
- qCDebug(IMPORTWIZARD_LOG) << " Unknown auth value " << value;
+ //FIXME qCDebug(IMPORTWIZARD_LOG) << " Unknown auth value " << value;
}
- qCDebug(IMPORTWIZARD_LOG) << " auth" << value;
+ //FIXME qCDebug(IMPORTWIZARD_LOG) << " auth" << value;
} else {
- qCDebug(IMPORTWIZARD_LOG) << " property unknown :" << propertyName;
+ //FIXME qCDebug(IMPORTWIZARD_LOG) << " property unknown :" << propertyName;
}
}
} else {
- qCDebug(IMPORTWIZARD_LOG) << " tag unknown :" << propertyTag;
+ //FIXME qCDebug(IMPORTWIZARD_LOG) << " tag unknown :" << propertyTag;
}
}
ImportWizardUtil::mergeLdap(ldap);
@@ -193,7 +193,7 @@ void EvolutionSettings::readSignatures(const QDomElement &account)
void EvolutionSettings::extractSignatureInfo(const QString &info)
{
- //qCDebug(IMPORTWIZARD_LOG)<<" signature info "<<info;
+ ////FIXME qCDebug(IMPORTWIZARD_LOG)<<" signature info "<<info;
QDomDocument signature;
if (!EvolutionUtil::loadInDomDocument(info, signature)) {
return;
@@ -202,7 +202,7 @@ void EvolutionSettings::extractSignatureInfo(const QString &info)
QDomElement domElement = signature.documentElement();
if (domElement.isNull()) {
- qCDebug(IMPORTWIZARD_LOG) << "Signature not found";
+ //FIXME qCDebug(IMPORTWIZARD_LOG) << "Signature not found";
return;
}
for (QDomElement e = domElement.firstChildElement(); !e.isNull(); e = e.nextSiblingElement()) {
@@ -234,7 +234,7 @@ void EvolutionSettings::extractSignatureInfo(const QString &info)
}
mMapSignature.insert(uid, signature);
- qCDebug(IMPORTWIZARD_LOG) << " signature tag :" << tag;
+ //FIXME qCDebug(IMPORTWIZARD_LOG) << " signature tag :" << tag;
}
}
@@ -250,7 +250,7 @@ void EvolutionSettings::readAccount(const QDomElement &account)
void EvolutionSettings::extractAccountInfo(const QString &info)
{
- qCDebug(IMPORTWIZARD_LOG) << " info " << info;
+ //FIXME qCDebug(IMPORTWIZARD_LOG) << " info " << info;
//Read QDomElement
QDomDocument account;
if (!EvolutionUtil::loadInDomDocument(info, account)) {
@@ -260,7 +260,7 @@ void EvolutionSettings::extractAccountInfo(const QString &info)
QDomElement domElement = account.documentElement();
if (domElement.isNull()) {
- qCDebug(IMPORTWIZARD_LOG) << "Account not found";
+ //FIXME qCDebug(IMPORTWIZARD_LOG) << "Account not found";
return;
}
@@ -293,7 +293,7 @@ void EvolutionSettings::extractAccountInfo(const QString &info)
} else if (identityTag == QLatin1String("reply-to")) {
newIdentity->setReplyToAddr(identity.text());
} else {
- qCDebug(IMPORTWIZARD_LOG) << " tag identity not found :" << identityTag;
+ //FIXME qCDebug(IMPORTWIZARD_LOG) << " tag identity not found :" << identityTag;
}
}
} else if (tag == QLatin1String("source")) {
@@ -311,14 +311,14 @@ void EvolutionSettings::extractAccountInfo(const QString &info)
for (QDomElement server = e.firstChildElement(); !server.isNull(); server = server.nextSiblingElement()) {
const QString serverTag = server.tagName();
if (serverTag == QLatin1String("url")) {
- qCDebug(IMPORTWIZARD_LOG) << " server.text() :" << server.text();
+ //FIXME qCDebug(IMPORTWIZARD_LOG) << " server.text() :" << server.text();
QUrl serverUrl(server.text());
const QString scheme = serverUrl.scheme();
QMap<QString, QVariant> settings;
const int port = serverUrl.port();
const QString path = serverUrl.path();
- qCDebug(IMPORTWIZARD_LOG) << " path !" << path;
+ //FIXME qCDebug(IMPORTWIZARD_LOG) << " path !" << path;
const QString userName = serverUrl.userInfo();
const QStringList listArgument = path.split(QLatin1Char(';'));
@@ -345,7 +345,7 @@ void EvolutionSettings::extractAccountInfo(const QString &info)
} else if (securityMethod == QLatin1String("ssl-on-alternate-port")) {
settings.insert(QStringLiteral("Safety"), QStringLiteral("SSL"));
} else {
- qCDebug(IMPORTWIZARD_LOG) << " security method unknown : " << path;
+ //FIXME qCDebug(IMPORTWIZARD_LOG) << " security method unknown : " << path;
}
} else {
settings.insert(QStringLiteral("Safety"), QStringLiteral("STARTTLS"));
@@ -368,7 +368,7 @@ void EvolutionSettings::extractAccountInfo(const QString &info)
} else if (securityMethod == QLatin1String("ssl-on-alternate-port")) {
settings.insert(QStringLiteral("UseSSL"), true);
} else {
- qCDebug(IMPORTWIZARD_LOG) << " security method unknown : " << path;
+ //FIXME qCDebug(IMPORTWIZARD_LOG) << " security method unknown : " << path;
}
} else {
settings.insert(QStringLiteral("UseTLS"), true);
@@ -399,12 +399,12 @@ void EvolutionSettings::extractAccountInfo(const QString &info)
AbstractBase::createResource(QStringLiteral("akonadi_maildir_resource"), name, settings);
} else if (scheme == QLatin1String("nntp")) {
//FIXME in the future
- qCDebug(IMPORTWIZARD_LOG) << " For the moment we can't import nntp resource";
+ //FIXME qCDebug(IMPORTWIZARD_LOG) << " For the moment we can't import nntp resource";
} else {
- qCDebug(IMPORTWIZARD_LOG) << " unknown scheme " << scheme;
+ //FIXME qCDebug(IMPORTWIZARD_LOG) << " unknown scheme " << scheme;
}
} else {
- qCDebug(IMPORTWIZARD_LOG) << " server tag unknown :" << serverTag;
+ //FIXME qCDebug(IMPORTWIZARD_LOG) << " server tag unknown :" << serverTag;
}
}
} else if (tag == QLatin1String("transport")) {
@@ -417,7 +417,7 @@ void EvolutionSettings::extractAccountInfo(const QString &info)
for (QDomElement smtp = e.firstChildElement(); !smtp.isNull(); smtp = smtp.nextSiblingElement()) {
const QString smtpTag = smtp.tagName();
if (smtpTag == QLatin1String("url")) {
- qCDebug(IMPORTWIZARD_LOG) << " smtp.text() :" << smtp.text();
+ //FIXME qCDebug(IMPORTWIZARD_LOG) << " smtp.text() :" << smtp.text();
QUrl smtpUrl(smtp.text());
const QString scheme = smtpUrl.scheme();
if (scheme != QLatin1String("sendmail")) {
@@ -450,7 +450,7 @@ void EvolutionSettings::extractAccountInfo(const QString &info)
} else if (authMethod == QLatin1String("POPB4SMTP")) {
transport->setAuthenticationType(MailTransport::Transport::EnumAuthenticationType::APOP); //????
} else {
- qCDebug(IMPORTWIZARD_LOG) << " smtp auth method unknown " << authMethod;
+ //FIXME qCDebug(IMPORTWIZARD_LOG) << " smtp auth method unknown " << authMethod;
}
}
@@ -465,14 +465,14 @@ void EvolutionSettings::extractAccountInfo(const QString &info)
} else if (securityMethod == QLatin1String("ssl-on-alternate-port")) {
transport->setEncryption(MailTransport::Transport::EnumEncryption::SSL);
} else {
- qCDebug(IMPORTWIZARD_LOG) << " security method unknown : " << path;
+ //FIXME qCDebug(IMPORTWIZARD_LOG) << " security method unknown : " << path;
}
} else {
transport->setEncryption(MailTransport::Transport::EnumEncryption::TLS);
}
}
} else {
- qCDebug(IMPORTWIZARD_LOG) << " smtp tag unknown :" << smtpTag;
+ //FIXME qCDebug(IMPORTWIZARD_LOG) << " smtp tag unknown :" << smtpTag;
}
}
storeTransport(transport, true);
@@ -533,7 +533,7 @@ void EvolutionSettings::extractAccountInfo(const QString &info)
}
//TODO
} else {
- qCDebug(IMPORTWIZARD_LOG) << " tag not know :" << tag;
+ //FIXME qCDebug(IMPORTWIZARD_LOG) << " tag not know :" << tag;
}
}
@@ -589,7 +589,7 @@ void EvolutionSettings::addAuth(QMap<QString, QVariant> &settings, const QString
} else if (authMethod == QLatin1String("POPB4SMTP")) {
settings.insert(argument, MailTransport::Transport::EnumAuthenticationType::APOP); //????
} else {
- qCDebug(IMPORTWIZARD_LOG) << " smtp auth method unknown " << authMethod;
+ //FIXME qCDebug(IMPORTWIZARD_LOG) << " smtp auth method unknown " << authMethod;
}
}
}
diff --git a/src/autodetect/evolutionv3/evolutionutil.cpp b/src/autodetect/evolutionv3/evolutionutil.cpp
index 19b89f6..0c9610e 100644
--- a/src/autodetect/evolutionv3/evolutionutil.cpp
+++ b/src/autodetect/evolutionv3/evolutionutil.cpp
@@ -19,7 +19,7 @@
#include "evolutionutil.h"
-#include "importwizard_debug.h"
+//#include "importwizard_debug.h"
#include <QDomDocument>
#include <QFile>
@@ -30,8 +30,8 @@ bool EvolutionUtil::loadInDomDocument(QFile *file, QDomDocument &doc)
int errorRow;
int errorCol;
if (!doc.setContent(file, &errorMsg, &errorRow, &errorCol)) {
- qCDebug(IMPORTWIZARD_LOG) << "Unable to load document.Parse error in line " << errorRow
- << ", col " << errorCol << ": " << errorMsg;
+ //FIXME qCDebug(IMPORTWIZARD_LOG) << "Unable to load document.Parse error in line " << errorRow
+ //<< ", col " << errorCol << ": " << errorMsg;
return false;
}
return true;
@@ -43,8 +43,8 @@ bool EvolutionUtil::loadInDomDocument(const QString &file, QDomDocument &doc)
int errorRow;
int errorCol;
if (!doc.setContent(file, &errorMsg, &errorRow, &errorCol)) {
- qCDebug(IMPORTWIZARD_LOG) << "Unable to load document.Parse error in line " << errorRow
- << ", col " << errorCol << ": " << errorMsg;
+ //FIXME qCDebug(IMPORTWIZARD_LOG) << "Unable to load document.Parse error in line " << errorRow
+ //<< ", col " << errorCol << ": " << errorMsg;
return false;
}
return true;
diff --git a/src/importwizard.cpp b/src/importwizard.cpp
index 55ff033..70a5472 100644
--- a/src/importwizard.cpp
+++ b/src/importwizard.cpp
@@ -29,13 +29,9 @@
#include "autodetect/thunderbird/thunderbirdimportdata.h"
#include "autodetect/sylpheed/sylpheedimportdata.h"
-#include "autodetect/evolutionv3/evolutionv3importdata.h"
-#include "autodetect/evolutionv2/evolutionv2importdata.h"
-#include "autodetect/evolutionv1/evolutionv1importdata.h"
#include "autodetect/icedove/icedoveimportdata.h"
#include "autodetect/oe/oeimportdata.h"
#include "autodetect/thebat/thebatimportdata.h"
-//#include "autodetect/balsa/balsaimportdata.h"
#include "autodetect/claws-mail/clawsmailimportdata.h"
#include "manual/manualimportmailpage.h"
@@ -226,17 +222,17 @@ void ImportWizard::initializeImportModule()
importer->setImportWizard(this);
addImportModule(importer);
- importer = new Evolutionv3ImportData(this);
- importer->setImportWizard(this);
- addImportModule(importer);
+// importer = new Evolutionv3ImportData(this);
+// importer->setImportWizard(this);
+// addImportModule(importer);
- importer = new Evolutionv2ImportData(this);
- importer->setImportWizard(this);
- addImportModule(importer);
+// importer = new Evolutionv2ImportData(this);
+// importer->setImportWizard(this);
+// addImportModule(importer);
- importer = new Evolutionv1ImportData(this);
- importer->setImportWizard(this);
- addImportModule(importer);
+// importer = new Evolutionv1ImportData(this);
+// importer->setImportWizard(this);
+// addImportModule(importer);
// importer = new OperaImportData(this);
// importer->setImportWizard(this);