summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMontel Laurent <[email protected]>2017-04-20 06:49:12 +0200
committerMontel Laurent <[email protected]>2017-04-20 06:49:12 +0200
commit159ccf8613cf9f10d2dac064f5ee7742162d9c9f (patch)
treea9f9ec73937068b9ec5654cceff0489d0cc1b1b6
parent9aa4c26e5e35588f75b8520d1f2280a61acd16f9 (diff)
Clean up includes
-rw-r--r--CMakeLists.txt3
-rw-r--r--src/importwizard.cpp16
-rw-r--r--src/importwizarddisplayinfo.cpp12
-rw-r--r--src/libimportwizard/abstractaddressbook.cpp1
-rw-r--r--src/libimportwizard/abstractcalendar.cpp1
-rw-r--r--src/libimportwizard/abstractsettings.cpp1
6 files changed, 14 insertions, 20 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index fe7e248..81310d8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -79,9 +79,6 @@ include_directories(${importwizard_SOURCE_DIR} ${importwizard_BINARY_DIR})
add_definitions(-DQT_NO_URL_CAST_FROM_STRING)
add_definitions(-DQT_USE_QSTRINGBUILDER)
-include_directories(
- ${AkonadiImportWizard_SOURCE_DIR}/src/autodetect/
- )
if(BUILD_TESTING)
add_definitions(-DBUILD_TESTING)
diff --git a/src/importwizard.cpp b/src/importwizard.cpp
index 1a52937..bffca74 100644
--- a/src/importwizard.cpp
+++ b/src/importwizard.cpp
@@ -18,14 +18,14 @@
*/
#include "importwizard.h"
#include "importwizardkernel.h"
-#include "selectprogrampage.h"
-#include "selectcomponentpage.h"
-#include "importmailpage.h"
-#include "importfilterpage.h"
-#include "importsettingpage.h"
-#include "importaddressbookpage.h"
-#include "importcalendarpage.h"
-#include "importfinishpage.h"
+#include "autodetect/selectprogrampage.h"
+#include "autodetect/selectcomponentpage.h"
+#include "autodetect/importmailpage.h"
+#include "autodetect/importfilterpage.h"
+#include "autodetect/importsettingpage.h"
+#include "autodetect/importaddressbookpage.h"
+#include "autodetect/importcalendarpage.h"
+#include "autodetect/importfinishpage.h"
#include "importmailpluginmanager.h"
#include "importwizarddisplayinfo.h"
diff --git a/src/importwizarddisplayinfo.cpp b/src/importwizarddisplayinfo.cpp
index 4497e97..93f3bb2 100644
--- a/src/importwizarddisplayinfo.cpp
+++ b/src/importwizarddisplayinfo.cpp
@@ -19,15 +19,15 @@
#include "importwizarddisplayinfo.h"
#include "importwizard.h"
-#include "importcalendarpage.h"
-#include "importsettingpage.h"
-#include "importaddressbookpage.h"
-#include "importfilterpage.h"
-#include "importmailpage.h"
+#include "autodetect/importcalendarpage.h"
+#include "autodetect/importsettingpage.h"
+#include "autodetect/importaddressbookpage.h"
+#include "autodetect/importfilterpage.h"
+#include "autodetect/importmailpage.h"
+#include "autodetect/importfilterinfogui.h"
#include <MailImporter/FilterInfo>
#include <MailImporterAkonadi/FilterImporterAkonadi>
-#include <importfilterinfogui.h>
ImportWizardDisplayInfo::ImportWizardDisplayInfo(ImportWizard *wizard)
: mImportWizard(wizard)
diff --git a/src/libimportwizard/abstractaddressbook.cpp b/src/libimportwizard/abstractaddressbook.cpp
index e3b937c..fe0682c 100644
--- a/src/libimportwizard/abstractaddressbook.cpp
+++ b/src/libimportwizard/abstractaddressbook.cpp
@@ -17,7 +17,6 @@
Boston, MA 02110-1301, USA.
*/
#include "abstractaddressbook.h"
-#include "importaddressbookpage.h"
#include "abstractdisplayinfo.h"
#include <KContacts/Addressee>
diff --git a/src/libimportwizard/abstractcalendar.cpp b/src/libimportwizard/abstractcalendar.cpp
index 73a83c3..6e87b19 100644
--- a/src/libimportwizard/abstractcalendar.cpp
+++ b/src/libimportwizard/abstractcalendar.cpp
@@ -18,7 +18,6 @@
*/
#include "abstractcalendar.h"
-#include "importcalendarpage.h"
#include "abstractdisplayinfo.h"
#include <KSharedConfig>
#include <KConfigGroup>
diff --git a/src/libimportwizard/abstractsettings.cpp b/src/libimportwizard/abstractsettings.cpp
index f9d9246..4139d66 100644
--- a/src/libimportwizard/abstractsettings.cpp
+++ b/src/libimportwizard/abstractsettings.cpp
@@ -18,7 +18,6 @@
*/
#include "abstractsettings.h"
#include "abstractdisplayinfo.h"
-#include "importsettingpage.h"
#include <KIdentityManagement/kidentitymanagement/identitymanager.h>
#include <KIdentityManagement/kidentitymanagement/identity.h>