Fix includes

src/autodetect/importfilterinfogui.h

@@ -6,7 +6,7 @@
 
 #pragma once
 
-#include "filterinfogui.h"
+#include <mailimporter/filterinfogui.h>
 class ImportMailPage;
 
 class ImportFilterInfoGui : public MailImporter::FilterInfoGui

src/libimportwizard/CMakeLists.txt

@@ -80,6 +80,7 @@ target_link_libraries(KPimImportWizard
     KF5::PimCommon
     KF5::MailCommon
     KF5::MailImporter
+    KF5::MailImporterAkonadi
     KF5::I18n
     )
 if (QT_MAJOR_VERSION STREQUAL "6")

src/manual/importwizardfilterinfogui.h

@@ -5,8 +5,8 @@
 */
 #pragma once
 
-#include "filterinfogui.h"
 #include "manualimportmailpage.h"
+#include <mailimporter/filterinfogui.h>
 
 class ImportWizardFilterInfoGui : public MailImporter::FilterInfoGui
 {

src/manual/manualselectfilterpage.cpp

@@ -8,26 +8,26 @@
 #include "manualselectfilterpage.h"
 
 // Filter includes
-#include <filterevolution.h>
-#include <filterevolution_v2.h>
-#include <filtericedove.h>
-#include <filterkmail_maildir.h>
-#include <filterkmailarchive.h>
-#include <filterlnotes.h>
-#include <filtermailapp.h>
-#include <filtermailmangzip.h>
-#include <filtermbox.h>
-#include <filteroe.h>
-#include <filteropera.h>
-#include <filterplain.h>
-#include <filterpmail.h>
-#include <filtersylpheed.h>
-#include <filterthebat.h>
-#include <filterthunderbird.h>
-
-#include <filters.h>
-
-#include <filterevolution_v3.h>
+#include <mailimporter/filterevolution.h>
+#include <mailimporter/filterevolution_v2.h>
+#include <mailimporter/filtericedove.h>
+#include <mailimporter/filterkmail_maildir.h>
+#include <mailimporter/filterkmailarchive.h>
+#include <mailimporter/filterlnotes.h>
+#include <mailimporter/filtermailapp.h>
+#include <mailimporter/filtermailmangzip.h>
+#include <mailimporter/filtermbox.h>
+#include <mailimporter/filteroe.h>
+#include <mailimporter/filteropera.h>
+#include <mailimporter/filterplain.h>
+#include <mailimporter/filterpmail.h>
+#include <mailimporter/filtersylpheed.h>
+#include <mailimporter/filterthebat.h>
+#include <mailimporter/filterthunderbird.h>
+
+#include <mailimporter/filters.h>
+
+#include <mailimporter/filterevolution_v3.h>
 
 // KDE includes
 

src/ui/autodetect/importmailpage.ui

@@ -69,7 +69,7 @@
   <customwidget>
    <class>MailImporter::ImportMailsWidget</class>
    <extends>QWidget</extends>
-   <header>importmailswidget.h</header>
+   <header>mailimporter/importmailswidget.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>

src/ui/manual/manualimportmailpage.ui

@@ -108,7 +108,7 @@
   <customwidget>
    <class>MailImporter::ImportMailsWidget</class>
    <extends>QWidget</extends>
-   <header>importmailswidget.h</header>
+   <header>mailimporter/importmailswidget.h</header>
    <container>1</container>
   </customwidget>
  </customwidgets>