Make it installable

CMakeLists.txt

@@ -100,7 +100,7 @@ target_link_libraries(importwizard
   KF5::XmlGui
   KF5::MailImporter
   pimcommon
-  mailcommon
+  KF5::MailCommon
   KF5::Libkdepim
   messagecomposer
   KF5::MessageViewer

autodetect/abstractimporter.cpp

@@ -24,7 +24,7 @@
 #include "importcalendarpage.h"
 
 #include "mailimporter/filterinfo.h"
-#include "mailcommon/filter/filtermanager.h"
+#include "MailCommon/FilterManager"
 
 #include <QFile>
 

autodetect/abstractimporter.h

@@ -17,7 +17,7 @@
 
 #ifndef AbstractImporter_H
 #define AbstractImporter_H
-#include "mailcommon/filter/filterimporterexporter.h"
+#include "MailCommon/FilterImporterExporter"
 
 class ImportWizard;
 

autodetect/balsa/balsaimportdata.cpp

@@ -20,7 +20,7 @@
 #include "balsa/balsaaddressbook.h"
 #include "mailimporter/filterbalsa.h"
 #include "mailimporter/filterinfo.h"
-#include "mailcommon/filter/filterimporter/filterimporterbalsa.h"
+#include "MailCommon/FilterImporterBalsa"
 #include "importfilterinfogui.h"
 #include "importwizard.h"
 

autodetect/balsa/balsasettings.cpp

@@ -18,7 +18,7 @@
 #include "balsasettings.h"
 #include "importwizard_debug.h"
 #include <MailTransport/mailtransport/transportmanager.h>
-#include "mailcommon/util/mailutil.h"
+#include "MailCommon/MailUtil"
 #include "header/kxface.h"
 
 #include <KIdentityManagement/kidentitymanagement/identity.h>

autodetect/claws-mail/clawsmailimportdata.cpp

@@ -19,7 +19,7 @@
 #include "claws-mail/clawsmailsettings.h"
 #include "claws-mail/clawsmailaddressbook.h"
 #include "mailimporter/filterclawsmail.h"
-#include "mailcommon/filter/filterimporter/filterimporterclawsmail.h"
+#include "MailCommon/FilterImporterClawsMail"
 #include "mailimporter/filterinfo.h"
 #include "importfilterinfogui.h"
 #include "importwizard.h"

autodetect/claws-mail/clawsmailsettings.cpp

@@ -19,7 +19,7 @@
 #include "importwizardutil.h"
 
 #include <MailTransport/mailtransport/transportmanager.h>
-#include "mailcommon/util/mailutil.h"
+#include "MailCommon/MailUtil"
 
 #include <KIdentityManagement/kidentitymanagement/identity.h>
 #include <KIdentityManagement/kidentitymanagement/signature.h>

autodetect/evolutionv3/evolutionsettings.cpp

@@ -17,7 +17,7 @@
 
 #include "evolutionsettings.h"
 #include "evolutionutil.h"
-#include "mailcommon/util/mailutil.h"
+#include "MailCommon/MailUtil"
 #include "importwizardutil.h"
 
 #include <KIdentityManagement/kidentitymanagement/identity.h>

autodetect/evolutionv3/evolutionv3importdata.cpp

@@ -22,7 +22,7 @@
 #include "mailimporter/filterevolution_v3.h"
 #include "mailimporter/filterinfo.h"
 #include "importfilterinfogui.h"
-#include "mailcommon/filter/filterimporterexporter.h"
+#include "MailCommon/FilterImporterExporter"
 
 #include "importwizard.h"
 

autodetect/icedove/icedoveimportdata.cpp

@@ -22,7 +22,7 @@
 
 #include "mailimporter/filtericedove.h"
 #include "mailimporter/filterinfo.h"
-#include "mailcommon/filter/filterimporterexporter.h"
+#include "MailCommon/FilterImporterExporter"
 #include "importwizard.h"
 
 #include <KLocalizedString>

autodetect/opera/operasettings.cpp

@@ -20,7 +20,7 @@
 #include "mailimporter/filteropera.h"
 
 #include <MailTransport/mailtransport/transportmanager.h>
-#include "mailcommon/util/mailutil.h"
+#include "MailCommon/MailUtil"
 
 #include <KIdentityManagement/kidentitymanagement/identity.h>
 #include <KIdentityManagement/kidentitymanagement/signature.h>

autodetect/pmail/pmailsettings.cpp

@@ -19,7 +19,7 @@
 #include "importwizardutil.h"
 
 #include <MailTransport/mailtransport/transportmanager.h>
-#include "mailcommon/util/mailutil.h"
+#include "MailCommon/MailUtil"
 
 #include <KIdentityManagement/kidentitymanagement/identity.h>
 #include <KIdentityManagement/kidentitymanagement/signature.h>

autodetect/sylpheed/sylpheedimportdata.cpp

@@ -19,7 +19,7 @@
 #include "mailimporter/filtersylpheed.h"
 #include "mailimporter/filterinfo.h"
 #include "importfilterinfogui.h"
-#include "mailcommon/filter/filterimporterexporter.h"
+#include "MailCommon/FilterImporterExporter"
 #include "importwizard.h"
 #include "sylpheed/sylpheedsettings.h"
 #include "sylpheed/sylpheedaddressbook.h"

autodetect/sylpheed/sylpheedsettings.cpp

@@ -18,7 +18,7 @@
 #include "sylpheedsettings.h"
 #include "sylpheedsettingsutils.h"
 #include <MailTransport/mailtransport/transportmanager.h>
-#include "mailcommon/util/mailutil.h"
+#include "MailCommon/MailUtil"
 
 #include <KIdentityManagement/kidentitymanagement/identity.h>
 #include <KIdentityManagement/kidentitymanagement/signature.h>

autodetect/thunderbird/thunderbirdimportdata.cpp

@@ -22,7 +22,7 @@
 
 #include "mailimporter/filterthunderbird.h"
 #include "mailimporter/filterinfo.h"
-#include "mailcommon/filter/filterimporterexporter.h"
+#include "MailCommon/FilterImporterExporter"
 #include "importwizard.h"
 
 #include <KLocalizedString>

autodetect/thunderbird/thunderbirdsettings.cpp

@@ -17,7 +17,7 @@
 
 #include "thunderbirdsettings.h"
 #include <MailTransport/mailtransport/transportmanager.h>
-#include "mailcommon/util/mailutil.h"
+#include "MailCommon/MailUtil"
 #include "importwizardutil.h"
 
 #include <KIdentityManagement/kidentitymanagement/identity.h>

importwizard.cpp

@@ -54,7 +54,7 @@
 #include <KMessageBox>
 #include <KHelpMenu>
 #include <AkonadiWidgets/controlgui.h>
-#include <mailcommon/kernel/mailkernel.h>
+#include <MailCommon/MailKernel>
 #include <QPushButton>
 
 ImportWizard::ImportWizard(WizardMode mode, QWidget *parent)

importwizardkernel.cpp

@@ -19,7 +19,7 @@
 
 #include <KIdentityManagement/kidentitymanagement/identitymanager.h>
 #include <messagecomposer/sender/akonadisender.h>
-#include <mailcommon/folder/foldercollectionmonitor.h>
+#include <MailCommon/FolderCollectionMonitor>
 #include <AkonadiCore/session.h>
 #include <AkonadiCore/entitytreemodel.h>
 #include <AkonadiCore/entitymimetypefiltermodel.h>

importwizardkernel.h

@@ -17,7 +17,7 @@
 #ifndef IMPORTWIZARDKERNEL_H
 #define IMPORTWIZARDKERNEL_H
 
-#include <mailcommon/interfaces/mailinterfaces.h>
+#include <MailCommon/MailInterfaces>
 
 namespace Akonadi
 {

ui/autodetect/importmailpage.ui

@@ -63,7 +63,7 @@
   <customwidget>
    <class>MailCommon::FolderRequester</class>
    <extends>QWidget</extends>
-   <header location="global">mailcommon/folder/folderrequester.h</header>
+   <header location="global">MailCommon/FolderRequester</header>
    <container>1</container>
   </customwidget>
  </customwidgets>

ui/manual/manualselectfilterpage.ui

@@ -137,7 +137,7 @@ p, li { white-space: pre-wrap; }
   <customwidget>
    <class>MailCommon::FolderRequester</class>
    <extends>QWidget</extends>
-   <header location="global">mailcommon/folder/folderrequester.h</header>
+   <header location="global">MailCommon/FolderRequester</header>
    <container>1</container>
   </customwidget>
   <customwidget>