Start adding namespace

src/autodetect/abstractimporter.cpp

@@ -31,42 +31,44 @@
 
 #include <QFile>
 
-AbstractImporter::AbstractImporter(QObject *parent)
+using namespace LibImportWizard;
+
+LibImportWizard::AbstractImporter::AbstractImporter(QObject *parent)
     : QObject(parent),
       mImportWizard(nullptr)
 {
 }
 
-AbstractImporter::~AbstractImporter()
+LibImportWizard::AbstractImporter::~AbstractImporter()
 {
 }
 
-bool AbstractImporter::importSettings()
+bool LibImportWizard::AbstractImporter::importSettings()
 {
     return false;
 }
 
-bool AbstractImporter::importMails()
+bool LibImportWizard::AbstractImporter::importMails()
 {
     return false;
 }
 
-bool AbstractImporter::importFilters()
+bool LibImportWizard::AbstractImporter::importFilters()
 {
     return false;
 }
 
-bool AbstractImporter::importAddressBook()
+bool LibImportWizard::AbstractImporter::importAddressBook()
 {
     return false;
 }
 
-bool AbstractImporter::importCalendar()
+bool LibImportWizard::AbstractImporter::importCalendar()
 {
     return false;
 }
 
-void AbstractImporter::initializeFilter(MailImporter::Filter &filter)
+void LibImportWizard::AbstractImporter::initializeFilter(MailImporter::Filter &filter)
 {
     MailImporter::FilterInfo *info = new MailImporter::FilterInfo();
     ImportFilterInfoGui *infoGui = new ImportFilterInfoGui(mImportWizard->importMailPage());
@@ -78,7 +80,7 @@ void AbstractImporter::initializeFilter(MailImporter::Filter &filter)
     filter.setFilterInfo(info);
 }
 
-bool AbstractImporter::addFilters(const QString &filterPath, MailCommon::FilterImporterExporter::FilterType type)
+bool LibImportWizard::AbstractImporter::addFilters(const QString &filterPath, MailCommon::FilterImporterExporter::FilterType type)
 {
     if (QFileInfo::exists(filterPath)) {
         bool canceled = false;
@@ -97,42 +99,42 @@ bool AbstractImporter::addFilters(const QString &filterPath, MailCommon::FilterI
     }
 }
 
-void AbstractImporter::appendFilters(const QList<MailCommon::MailFilter *> &filters)
+void LibImportWizard::AbstractImporter::appendFilters(const QList<MailCommon::MailFilter *> &filters)
 {
     if (!filters.isEmpty()) {
         MailCommon::FilterManager::instance()->appendFilters(filters, false);
     }
 }
 
-void AbstractImporter::addImportFilterInfo(const QString &log) const
+void LibImportWizard::AbstractImporter::addImportFilterInfo(const QString &log) const
 {
     if (mImportWizard) {
         mImportWizard->importFilterPage()->addImportInfo(log);
     }
 }
 
-void AbstractImporter::addImportFilterError(const QString &log) const
+void LibImportWizard::AbstractImporter::addImportFilterError(const QString &log) const
 {
     if (mImportWizard) {
         mImportWizard->importFilterPage()->addImportError(log);
     }
 }
 
-void AbstractImporter::addImportSettingsInfo(const QString &log) const
+void LibImportWizard::AbstractImporter::addImportSettingsInfo(const QString &log) const
 {
     if (mImportWizard) {
         mImportWizard->importSettingPage()->addImportError(log);
     }
 }
 
-void AbstractImporter::addImportCalendarInfo(const QString &log) const
+void LibImportWizard::AbstractImporter::addImportCalendarInfo(const QString &log) const
 {
     if (mImportWizard) {
         mImportWizard->importCalendarPage()->addImportError(log);
     }
 }
 
-void AbstractImporter::setImportWizard(ImportWizard *importWizard)
+void LibImportWizard::AbstractImporter::setImportWizard(ImportWizard *importWizard)
 {
     mImportWizard = importWizard;
 }

src/autodetect/abstractimporter.h

@@ -36,6 +36,7 @@ class MailFilter;
 class FilterImporterExporter;
 }
 
+namespace LibImportWizard {
 class LIBIMPORTWIZARD_EXPORT AbstractImporter : public QObject
 {
     Q_OBJECT
@@ -90,6 +91,7 @@ protected:
     QString mPath;
     ImportWizard *mImportWizard;
 };
+}
 
 #endif /* AbstractImporter_H */
 

src/autodetect/selectcomponentpage.cpp

@@ -45,40 +45,40 @@ void SelectComponentPage::slotComponentClicked()
 
 void SelectComponentPage::slotEverythingClicked(bool clicked)
 {
-    ui->addressbooks->setEnabled(!clicked && (mOptions & AbstractImporter::AddressBooks));
-    ui->filters->setEnabled(!clicked && (mOptions & AbstractImporter::Filters));
-    ui->mails->setEnabled(!clicked && (mOptions & AbstractImporter::Mails));
-    ui->settings->setEnabled(!clicked && (mOptions & AbstractImporter::Settings));
-    ui->calendars->setEnabled(!clicked && (mOptions & AbstractImporter::Calendars));
+    ui->addressbooks->setEnabled(!clicked && (mOptions & LibImportWizard::AbstractImporter::AddressBooks));
+    ui->filters->setEnabled(!clicked && (mOptions & LibImportWizard::AbstractImporter::Filters));
+    ui->mails->setEnabled(!clicked && (mOptions & LibImportWizard::AbstractImporter::Mails));
+    ui->settings->setEnabled(!clicked && (mOptions & LibImportWizard::AbstractImporter::Settings));
+    ui->calendars->setEnabled(!clicked && (mOptions & LibImportWizard::AbstractImporter::Calendars));
     slotComponentClicked();
 }
 
-void SelectComponentPage::setEnabledComponent(AbstractImporter::TypeSupportedOptions options)
+void SelectComponentPage::setEnabledComponent(LibImportWizard::AbstractImporter::TypeSupportedOptions options)
 {
     mOptions = options;
     slotEverythingClicked(ui->everything->isChecked());
 }
 
-AbstractImporter::TypeSupportedOptions SelectComponentPage::selectedComponents() const
+LibImportWizard::AbstractImporter::TypeSupportedOptions SelectComponentPage::selectedComponents() const
 {
     if (ui->everything->isChecked()) {
         return mOptions;
     } else {
-        AbstractImporter::TypeSupportedOptions newOptions;
+        LibImportWizard::AbstractImporter::TypeSupportedOptions newOptions;
         if (ui->addressbooks->isChecked()) {
-            newOptions |= AbstractImporter::AddressBooks;
+            newOptions |= LibImportWizard::AbstractImporter::AddressBooks;
         }
         if (ui->filters->isChecked()) {
-            newOptions |= AbstractImporter::Filters;
+            newOptions |= LibImportWizard::AbstractImporter::Filters;
         }
         if (ui->mails->isChecked()) {
-            newOptions |= AbstractImporter::Mails;
+            newOptions |= LibImportWizard::AbstractImporter::Mails;
         }
         if (ui->settings->isChecked()) {
-            newOptions |= AbstractImporter::Settings;
+            newOptions |= LibImportWizard::AbstractImporter::Settings;
         }
         if (ui->calendars->isChecked()) {
-            newOptions |= AbstractImporter::Calendars;
+            newOptions |= LibImportWizard::AbstractImporter::Calendars;
         }
 
         return newOptions;

src/autodetect/selectcomponentpage.h

@@ -35,8 +35,8 @@ public:
     explicit SelectComponentPage(QWidget *parent = nullptr);
     ~SelectComponentPage();
 
-    void setEnabledComponent(AbstractImporter::TypeSupportedOptions options);
-    AbstractImporter::TypeSupportedOptions selectedComponents() const;
+    void setEnabledComponent(LibImportWizard::AbstractImporter::TypeSupportedOptions options);
+    LibImportWizard::AbstractImporter::TypeSupportedOptions selectedComponents() const;
 
 Q_SIGNALS:
     void atLeastOneComponentSelected(bool componentSelected);
@@ -44,7 +44,7 @@ Q_SIGNALS:
 private:
     void slotEverythingClicked(bool clicked);
     void slotComponentClicked();
-    AbstractImporter::TypeSupportedOptions mOptions;
+    LibImportWizard::AbstractImporter::TypeSupportedOptions mOptions;
     Ui::SelectComponentPage *ui;
 };
 

src/importmailpluginmanager.cpp

@@ -98,14 +98,14 @@ void ImportMailPluginManager::loadPlugin(ImportMailPluginManagerInfo *item)
 {
     KPluginLoader pluginLoader(item->metaDataFileName);
     if (pluginLoader.factory()) {
-        item->plugin = pluginLoader.factory()->create<AbstractImporter>(this, QVariantList() << item->metaDataFileNameBaseName);
+        item->plugin = pluginLoader.factory()->create<LibImportWizard::AbstractImporter>(this, QVariantList() << item->metaDataFileNameBaseName);
         mPluginDataList.append(item->pluginData);
     }
 }
 
-QVector<AbstractImporter *> ImportMailPluginManager::pluginsList() const
+QVector<LibImportWizard::AbstractImporter *> ImportMailPluginManager::pluginsList() const
 {
-    QVector<AbstractImporter *> lst;
+    QVector<LibImportWizard::AbstractImporter *> lst;
     QVector<ImportMailPluginManagerInfo>::ConstIterator end(mPluginList.constEnd());
     for (QVector<ImportMailPluginManagerInfo>::ConstIterator it = mPluginList.constBegin(); it != end; ++it) {
         if ((*it).plugin) {

src/importmailpluginmanager.h

@@ -21,7 +21,9 @@
 
 #include <QObject>
 #include <KPluginMetaData>
+namespace LibImportWizard {
 class AbstractImporter;
+}
 
 class PluginUtilData
 {
@@ -47,7 +49,7 @@ public:
     QString metaDataFileNameBaseName;
     QString metaDataFileName;
     PluginUtilData pluginData;
-    AbstractImporter *plugin;
+    LibImportWizard::AbstractImporter *plugin;
 };
 
 
@@ -61,7 +63,7 @@ public:
     static ImportMailPluginManager *self();
     bool initializePluginList();
 
-    QVector<AbstractImporter *> pluginsList() const;
+    QVector<LibImportWizard::AbstractImporter *> pluginsList() const;
 
 private:
     void loadPlugin(ImportMailPluginManagerInfo *item);

src/importwizard.cpp

@@ -204,8 +204,8 @@ void ImportWizard::createAutomaticModePage()
 
 void ImportWizard::initializeImportModule()
 {
-    const QVector<AbstractImporter *> lstPlugins = ImportMailPluginManager::self()->pluginsList();
-    for (AbstractImporter *abstractPlugin : qAsConst(lstPlugins)) {
+    const QVector<LibImportWizard::AbstractImporter *> lstPlugins = ImportMailPluginManager::self()->pluginsList();
+    for (LibImportWizard::AbstractImporter *abstractPlugin : qAsConst(lstPlugins)) {
         if (abstractPlugin->foundMailer()) {
             abstractPlugin->setImportWizard(this);
             mlistImport.insert(abstractPlugin->name(), abstractPlugin);
@@ -260,7 +260,7 @@ void ImportWizard::slotImportCalendarClicked()
 
 void ImportWizard::slotProgramSelected(const QString &program)
 {
-    AbstractImporter *importer = mlistImport.value(program);
+    LibImportWizard::AbstractImporter *importer = mlistImport.value(program);
     if (importer) {
         mSelectedPim = importer;
         setValid(currentPage(), true);
@@ -272,7 +272,7 @@ void ImportWizard::checkModules()
     mSelectProgramPage->setFoundProgram(mlistImport.keys());
 }
 
-void ImportWizard::addImportModule(AbstractImporter *import)
+void ImportWizard::addImportModule(LibImportWizard::AbstractImporter *import)
 {
     if (import->foundMailer()) {
         mlistImport.insert(import->name(), import);
@@ -286,13 +286,13 @@ void ImportWizard::slotAtLeastOneComponentSelected(bool result)
     setValid(mSelectComponentPageItem, result);
 }
 
-void ImportWizard::setAppropriatePage(AbstractImporter::TypeSupportedOptions options)
+void ImportWizard::setAppropriatePage(LibImportWizard::AbstractImporter::TypeSupportedOptions options)
 {
-    setAppropriate(mImportMailPageItem, (options & AbstractImporter::Mails));
-    setAppropriate(mImportFilterPageItem, (options & AbstractImporter::Filters));
-    setAppropriate(mImportSettingPageItem, (options & AbstractImporter::Settings));
-    setAppropriate(mImportAddressbookPageItem, (options & AbstractImporter::AddressBooks));
-    setAppropriate(mImportCalendarPageItem, (options & AbstractImporter::Calendars));
+    setAppropriate(mImportMailPageItem, (options & LibImportWizard::AbstractImporter::Mails));
+    setAppropriate(mImportFilterPageItem, (options & LibImportWizard::AbstractImporter::Filters));
+    setAppropriate(mImportSettingPageItem, (options & LibImportWizard::AbstractImporter::Settings));
+    setAppropriate(mImportAddressbookPageItem, (options & LibImportWizard::AbstractImporter::AddressBooks));
+    setAppropriate(mImportCalendarPageItem, (options & LibImportWizard::AbstractImporter::Calendars));
 }
 
 void ImportWizard::next()

src/importwizard.h

@@ -84,17 +84,17 @@ private:
     void writeConfig();
     void initializeImportModule();
     void createAutomaticModePage();
-    void addImportModule(AbstractImporter *);
+    void addImportModule(LibImportWizard::AbstractImporter *);
     void checkModules();
-    void setAppropriatePage(AbstractImporter::TypeSupportedOptions options);
+    void setAppropriatePage(LibImportWizard::AbstractImporter::TypeSupportedOptions options);
     void enableAllImportButton();
     void createManualModePage();
     void updatePagesFromMode();
 
-    QMap<QString, AbstractImporter *> mlistImport;
+    QMap<QString, LibImportWizard::AbstractImporter *> mlistImport;
 
     WizardMode mMode;
-    AbstractImporter *mSelectedPim;
+    LibImportWizard::AbstractImporter *mSelectedPim;
 
     KPageWidgetItem *mSelectProgramPageItem;
     KPageWidgetItem *mSelectComponentPageItem;

src/plugins/balsa/balsaimportdata.cpp

@@ -33,7 +33,7 @@
 K_PLUGIN_FACTORY_WITH_JSON(BalsaImporterFactory, "balsaimporter.json", registerPlugin<BalsaImportData>();)
 
 BalsaImportData::BalsaImportData(QObject *parent, const QList<QVariant> &)
-    : AbstractImporter(parent)
+    : LibImportWizard::AbstractImporter(parent)
 {
     mPath = MailImporter::FilterBalsa::defaultSettingsPath();
 }
@@ -93,13 +93,13 @@ bool BalsaImportData::importFilters()
     return addFilters(filterPath, MailCommon::FilterImporterExporter::BalsaFilter);
 }
 
-AbstractImporter::TypeSupportedOptions BalsaImportData::supportedOption()
+LibImportWizard::AbstractImporter::TypeSupportedOptions BalsaImportData::supportedOption()
 {
     TypeSupportedOptions options;
-    options |= AbstractImporter::Mails;
-    options |= AbstractImporter::AddressBooks;
-    options |= AbstractImporter::Settings;
-    options |= AbstractImporter::Filters;
+    options |= LibImportWizard::AbstractImporter::Mails;
+    options |= LibImportWizard::AbstractImporter::AddressBooks;
+    options |= LibImportWizard::AbstractImporter::Settings;
+    options |= LibImportWizard::AbstractImporter::Filters;
     return options;
 }
 

src/plugins/balsa/balsaimportdata.h

@@ -22,7 +22,7 @@
 #include "abstractimporter.h"
 class ImportWizard;
 
-class BalsaImportData : public AbstractImporter
+class BalsaImportData : public LibImportWizard::AbstractImporter
 {
 public:
     explicit BalsaImportData(QObject *parent, const QList<QVariant> & = QList<QVariant>());

src/plugins/claws-mail/clawsmailimportdata.cpp

@@ -34,7 +34,7 @@
 K_PLUGIN_FACTORY_WITH_JSON(ClawsMailImporterFactory, "clawsmailimporter.json", registerPlugin<ClawsMailImportData>();)
 
 ClawsMailImportData::ClawsMailImportData(QObject *parent, const QList<QVariant> &)
-    : AbstractImporter(parent)
+    : LibImportWizard::AbstractImporter(parent)
 {
     mPath = MailImporter::FilterClawsMail::defaultSettingsPath();
 }
@@ -99,13 +99,13 @@ bool ClawsMailImportData::importFilters()
     return addFilters(filterPath, MailCommon::FilterImporterExporter::ClawsMailFilter);
 }
 
-AbstractImporter::TypeSupportedOptions ClawsMailImportData::supportedOption()
+LibImportWizard::AbstractImporter::TypeSupportedOptions ClawsMailImportData::supportedOption()
 {
     TypeSupportedOptions options;
-    options |= AbstractImporter::Mails;
-    options |= AbstractImporter::AddressBooks;
-    options |= AbstractImporter::Settings;
-    options |= AbstractImporter::Filters;
+    options |= LibImportWizard::AbstractImporter::Mails;
+    options |= LibImportWizard::AbstractImporter::AddressBooks;
+    options |= LibImportWizard::AbstractImporter::Settings;
+    options |= LibImportWizard::AbstractImporter::Filters;
     return options;
 }
 

src/plugins/claws-mail/clawsmailimportdata.h

@@ -22,7 +22,7 @@
 #include "abstractimporter.h"
 class ImportWizard;
 
-class ClawsMailImportData : public AbstractImporter
+class ClawsMailImportData : public LibImportWizard::AbstractImporter
 {
 public:
     explicit ClawsMailImportData(QObject *parent, const QList<QVariant> & = QList<QVariant>());

src/plugins/evolutionv1/evolutionv1importdata.cpp

@@ -31,7 +31,7 @@ K_PLUGIN_FACTORY_WITH_JSON(Evolutionv1ImporterFactory, "evolutionv1importer.json
 
 
 Evolutionv1ImportData::Evolutionv1ImportData(QObject *parent, const QList<QVariant> &)
-    : AbstractImporter(parent)
+    : LibImportWizard::AbstractImporter(parent)
 {
     mPath = MailImporter::FilterEvolution::defaultSettingsPath();
 }
@@ -70,10 +70,10 @@ bool Evolutionv1ImportData::importMails()
     return true;
 }
 
-AbstractImporter::TypeSupportedOptions Evolutionv1ImportData::supportedOption()
+LibImportWizard::AbstractImporter::TypeSupportedOptions Evolutionv1ImportData::supportedOption()
 {
     TypeSupportedOptions options;
-    options |= AbstractImporter::Mails;
+    options |= LibImportWizard::AbstractImporter::Mails;
     return options;
 }
 

src/plugins/evolutionv1/evolutionv1importdata.h

@@ -22,7 +22,7 @@
 #include "abstractimporter.h"
 class ImportWizard;
 
-class Evolutionv1ImportData : public AbstractImporter
+class Evolutionv1ImportData : public LibImportWizard::AbstractImporter
 {
 public:
     explicit Evolutionv1ImportData(QObject *parent, const QList<QVariant> & = QList<QVariant>());

src/plugins/evolutionv2/evolutionv2importdata.cpp

@@ -31,7 +31,7 @@ K_PLUGIN_FACTORY_WITH_JSON(Evolutionv2ImporterFactory, "evolutionv2importer.json
 
 
 Evolutionv2ImportData::Evolutionv2ImportData(QObject *parent, const QList<QVariant> &)
-    : AbstractImporter(parent)
+    : LibImportWizard::AbstractImporter(parent)
 {
     mPath = MailImporter::FilterEvolution_v2::defaultSettingsPath();
 }
@@ -70,10 +70,10 @@ bool Evolutionv2ImportData::importMails()
     return true;
 }
 
-AbstractImporter::TypeSupportedOptions Evolutionv2ImportData::supportedOption()
+LibImportWizard::AbstractImporter::TypeSupportedOptions Evolutionv2ImportData::supportedOption()
 {
     TypeSupportedOptions options;
-    options |= AbstractImporter::Mails;
+    options |= LibImportWizard::AbstractImporter::Mails;
     return options;
 }
 

src/plugins/evolutionv2/evolutionv2importdata.h

@@ -22,7 +22,7 @@
 #include "abstractimporter.h"
 class ImportWizard;
 
-class Evolutionv2ImportData : public AbstractImporter
+class Evolutionv2ImportData : public LibImportWizard::AbstractImporter
 {
 public:
     explicit Evolutionv2ImportData(QObject *parent, const QList<QVariant> & = QList<QVariant>());

src/plugins/evolutionv3/evolutionv3importdata.cpp

@@ -36,7 +36,7 @@ K_PLUGIN_FACTORY_WITH_JSON(Evolutionv3ImporterFactory, "evolutionv3importer.json
 
 
 Evolutionv3ImportData::Evolutionv3ImportData(QObject *parent, const QList<QVariant> &)
-    : AbstractImporter(parent)
+    : LibImportWizard::AbstractImporter(parent)
 {
     mPath = MailImporter::FilterEvolution_v3::defaultSettingsPath();
 }
@@ -116,14 +116,14 @@ bool Evolutionv3ImportData::importCalendar()
     return true;
 }
 
-AbstractImporter::TypeSupportedOptions Evolutionv3ImportData::supportedOption()
+LibImportWizard::AbstractImporter::TypeSupportedOptions Evolutionv3ImportData::supportedOption()
 {
     TypeSupportedOptions options;
-    options |= AbstractImporter::Mails;
-    options |= AbstractImporter::Filters;
-    options |= AbstractImporter::Settings;
-    options |= AbstractImporter::Calendars;
-    options |= AbstractImporter::AddressBooks;
+    options |= LibImportWizard::AbstractImporter::Mails;
+    options |= LibImportWizard::AbstractImporter::Filters;
+    options |= LibImportWizard::AbstractImporter::Settings;
+    options |= LibImportWizard::AbstractImporter::Calendars;
+    options |= LibImportWizard::AbstractImporter::AddressBooks;
     return options;
 }
 

src/plugins/evolutionv3/evolutionv3importdata.h

@@ -22,7 +22,7 @@
 #include "abstractimporter.h"
 class ImportWizard;
 
-class Evolutionv3ImportData : public AbstractImporter
+class Evolutionv3ImportData : public LibImportWizard::AbstractImporter
 {
 public:
     explicit Evolutionv3ImportData(QObject *parent, const QList<QVariant> & = QList<QVariant>());

src/plugins/geary/gearyimportdata.cpp

@@ -31,7 +31,7 @@
 K_PLUGIN_FACTORY_WITH_JSON(GearyImporterFactory, "gearyimporter.json", registerPlugin<GearyImportData>();)
 
 GearyImportData::GearyImportData(QObject *parent, const QList<QVariant> &)
-    : AbstractImporter(parent)
+    : LibImportWizard::AbstractImporter(parent)
 {
     mPath = MailImporter::OtherMailerUtil::gearyDefaultPath();
 }
@@ -80,12 +80,12 @@ bool GearyImportData::importAddressBook()
     return false;
 }
 
-AbstractImporter::TypeSupportedOptions GearyImportData::supportedOption()
+LibImportWizard::AbstractImporter::TypeSupportedOptions GearyImportData::supportedOption()
 {
     TypeSupportedOptions options;
-    //options |=AbstractImporter::Mails;
-    options |= AbstractImporter::Settings;
-    //options |= AbstractImporter::AddressBooks;
+    //options |=LibImportWizard::AbstractImporter::Mails;
+    options |= LibImportWizard::AbstractImporter::Settings;
+    //options |= LibImportWizard::AbstractImporter::AddressBooks;
     return options;
 }
 

src/plugins/geary/gearyimportdata.h

@@ -22,7 +22,7 @@
 #include "abstractimporter.h"
 class ImportWizard;
 
-class GearyImportData : public AbstractImporter
+class GearyImportData : public LibImportWizard::AbstractImporter
 {
 public:
     explicit GearyImportData(QObject *parent, const QList<QVariant> & = QList<QVariant>());

src/plugins/icedove/icedoveimportdata.cpp

@@ -34,7 +34,7 @@
 #include <QDir>
 
 IcedoveImportData::IcedoveImportData(QObject *parent, const QList<QVariant> &)
-    : AbstractImporter(parent)
+    : LibImportWizard::AbstractImporter(parent)
 {
     mPath = MailImporter::FilterIcedove::defaultSettingsPath();
 }
@@ -134,12 +134,12 @@ bool IcedoveImportData::importFilters()
     return filtersAdded;
 }
 
-AbstractImporter::TypeSupportedOptions IcedoveImportData::supportedOption()
+LibImportWizard::AbstractImporter::TypeSupportedOptions IcedoveImportData::supportedOption()
 {
     TypeSupportedOptions options;
-    options |= AbstractImporter::Mails;
-    options |= AbstractImporter::Filters;
-    options |= AbstractImporter::Settings;
-    options |= AbstractImporter::AddressBooks;
+    options |= LibImportWizard::AbstractImporter::Mails;
+    options |= LibImportWizard::AbstractImporter::Filters;
+    options |= LibImportWizard::AbstractImporter::Settings;
+    options |= LibImportWizard::AbstractImporter::AddressBooks;
     return options;
 }

src/plugins/icedove/icedoveimportdata.h

@@ -22,7 +22,7 @@
 #include "abstractimporter.h"
 class ImportWizard;
 
-class IcedoveImportData : public AbstractImporter
+class IcedoveImportData : public LibImportWizard::AbstractImporter
 {
 public:
     explicit IcedoveImportData(QObject *parent, const QList<QVariant> & = QList<QVariant>());

src/plugins/mailapp/mailappimportdata.cpp

@@ -30,7 +30,7 @@
 K_PLUGIN_FACTORY_WITH_JSON(MailAppImporterFactory, "mailappimporter.json", registerPlugin<MailAppImportData>();)
 
 MailAppImportData::MailAppImportData(QObject *parent, const QList<QVariant> &)
-    : AbstractImporter(parent)
+    : LibImportWizard::AbstractImporter(parent)
 {
     mPath = QDir::homePath();
 }
@@ -71,10 +71,10 @@ bool MailAppImportData::importMails()
     return true;
 }
 
-AbstractImporter::TypeSupportedOptions MailAppImportData::supportedOption()
+LibImportWizard::AbstractImporter::TypeSupportedOptions MailAppImportData::supportedOption()
 {
     TypeSupportedOptions options;
-    options |= AbstractImporter::Mails;
+    options |= LibImportWizard::AbstractImporter::Mails;
     return options;
 }
 

src/plugins/mailapp/mailappimportdata.h

@@ -22,7 +22,7 @@
 #include "abstractimporter.h"
 class ImportWizard;
 
-class MailAppImportData : public AbstractImporter
+class MailAppImportData : public LibImportWizard::AbstractImporter
 {
 public:
     explicit MailAppImportData(QObject *parent, const QList<QVariant> & = QList<QVariant>());

src/plugins/oe/oeimportdata.cpp

@@ -31,7 +31,7 @@
 K_PLUGIN_FACTORY_WITH_JSON(OEImporterFactory, "oeimporter.json", registerPlugin<OeImportData>();)
 
 OeImportData::OeImportData(QObject *parent, const QList<QVariant> &)
-    : AbstractImporter(parent)
+    : LibImportWizard::AbstractImporter(parent)
 {