aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMontel Laurent <montel@kde.org>2016-09-02 05:08:49 (GMT)
committerMontel Laurent <montel@kde.org>2016-09-02 05:08:49 (GMT)
commitd52e3cf7431958978fbac018853b96a8dce79728 (patch)
treeaed4c2e3218fb29eeca7c69254f99d22e56ecda3
parent61879db7c77de1eea10119e70a513eac5c621eb1 (diff)
Move in own directory
-rw-r--r--src/CMakeLists.txt27
-rw-r--r--src/contactgroupviewer.cpp2
-rw-r--r--src/job/contactgroupexpandjob.cpp (renamed from src/contactgroupexpandjob.cpp)2
-rw-r--r--src/job/contactgroupexpandjob.h (renamed from src/contactgroupexpandjob.h)0
-rw-r--r--src/job/contactgroupsearchjob.cpp (renamed from src/contactgroupsearchjob.cpp)0
-rw-r--r--src/job/contactgroupsearchjob.h (renamed from src/contactgroupsearchjob.h)0
-rw-r--r--src/job/contactsearchjob.cpp (renamed from src/contactsearchjob.cpp)0
-rw-r--r--src/job/contactsearchjob.h (renamed from src/contactsearchjob.h)0
-rw-r--r--src/standardcontactgroupformatter.cpp2
9 files changed, 24 insertions, 9 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 5f3fe20..6bb6925 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -121,12 +121,19 @@ set(akonadicontact_attributes_SRCS
attributes/attributeregistrar.cpp
)
+set(akonadicontact_job_SRCS
+ job/contactgroupexpandjob.cpp
+ job/contactgroupsearchjob.cpp
+ job/contactsearchjob.cpp
+)
+
set(akonadicontact_LIB_SRC
${akonadicontact_addresslocation_editor_SRCS}
${akonadicontact_editor_widgets_SRCS}
${akonadicontact_editor_generalinfo_SRCS}
${akonadicontact_customfieldseditor_SRCS}
${akonadicontact_attributes_SRCS}
+ ${akonadicontact_job_SRCS}
abstractcontactformatter.cpp
abstractcontactgroupformatter.cpp
collectionfiltermodel.cpp
@@ -138,14 +145,11 @@ set(akonadicontact_LIB_SRC
contactgroupeditordelegate.cpp
contactgroupeditordialog.cpp
contactgrouplineedit.cpp
- contactgroupexpandjob.cpp
contactgroupmodel.cpp
- contactgroupsearchjob.cpp
contactgroupviewer.cpp
contactgroupviewerdialog.cpp
contactmetadata.cpp
contactparts.cpp
- contactsearchjob.cpp
contactsfilterproxymodel.cpp
contactstreemodel.cpp
contactviewer.cpp
@@ -245,6 +249,18 @@ ecm_generate_pri_file(BASE_NAME AkonadiContact
install(FILES ${PRI_FILENAME} DESTINATION ${ECM_MKSPECS_INSTALL_DIR})
+ecm_generate_headers(AkonadiContactJob_CamelCase_HEADERS
+ HEADER_NAMES
+ ContactGroupExpandJob
+ ContactGroupSearchJob
+ ContactSearchJob
+ REQUIRED_HEADERS AkonadiContactJob_HEADERS
+ PREFIX Akonadi/Contact
+ RELATIVE job
+ )
+
+
+
ecm_generate_headers(AkonadiContact_CamelCase_HEADERS
HEADER_NAMES
AbstractContactFormatter
@@ -254,11 +270,8 @@ ecm_generate_headers(AkonadiContact_CamelCase_HEADERS
ContactEditorDialog
ContactGroupEditor
ContactGroupEditorDialog
- ContactGroupExpandJob
- ContactGroupSearchJob
ContactGroupViewer
ContactGroupViewerDialog
- ContactSearchJob
ContactsFilterProxyModel
ContactsTreeModel
ContactEditorPagePlugin
@@ -280,11 +293,13 @@ ecm_generate_headers(AkonadiContact_CamelCase_HEADERS
install( FILES
${AkonadiContact_CamelCase_HEADERS}
+ ${AkonadiContactJob_CamelCase_HEADERS}
DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF5}/Akonadi/Contact COMPONENT Devel
)
install( FILES
${AkonadiContact_HEADERS}
+ ${AkonadiContactJob_HEADERS}
${CMAKE_CURRENT_BINARY_DIR}/akonadi-contact_export.h
editor/im/improtocols.h
DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF5}/akonadi/contact COMPONENT Devel
diff --git a/src/contactgroupviewer.cpp b/src/contactgroupviewer.cpp
index 65eaf27..ff1eda4 100644
--- a/src/contactgroupviewer.cpp
+++ b/src/contactgroupviewer.cpp
@@ -21,7 +21,7 @@
#include "contactgroupviewer.h"
-#include "contactgroupexpandjob.h"
+#include "job/contactgroupexpandjob.h"
#include "standardcontactgroupformatter.h"
#include "textbrowser_p.h"
diff --git a/src/contactgroupexpandjob.cpp b/src/job/contactgroupexpandjob.cpp
index dee7078..aa0fe99 100644
--- a/src/contactgroupexpandjob.cpp
+++ b/src/job/contactgroupexpandjob.cpp
@@ -21,7 +21,7 @@
#include "contactgroupexpandjob.h"
#include "akonadi_contact_debug.h"
-#include <contactgroupsearchjob.h>
+#include "job/contactgroupsearchjob.h"
#include <itemfetchjob.h>
#include <itemfetchscope.h>
#include <itemsearchjob.h>
diff --git a/src/contactgroupexpandjob.h b/src/job/contactgroupexpandjob.h
index 0d8de2f..0d8de2f 100644
--- a/src/contactgroupexpandjob.h
+++ b/src/job/contactgroupexpandjob.h
diff --git a/src/contactgroupsearchjob.cpp b/src/job/contactgroupsearchjob.cpp
index aa64113..aa64113 100644
--- a/src/contactgroupsearchjob.cpp
+++ b/src/job/contactgroupsearchjob.cpp
diff --git a/src/contactgroupsearchjob.h b/src/job/contactgroupsearchjob.h
index b8d5b05..b8d5b05 100644
--- a/src/contactgroupsearchjob.h
+++ b/src/job/contactgroupsearchjob.h
diff --git a/src/contactsearchjob.cpp b/src/job/contactsearchjob.cpp
index a8aa184..a8aa184 100644
--- a/src/contactsearchjob.cpp
+++ b/src/job/contactsearchjob.cpp
diff --git a/src/contactsearchjob.h b/src/job/contactsearchjob.h
index a27d89e..a27d89e 100644
--- a/src/contactsearchjob.h
+++ b/src/job/contactsearchjob.h
diff --git a/src/standardcontactgroupformatter.cpp b/src/standardcontactgroupformatter.cpp
index b453d6a..99125a9 100644
--- a/src/standardcontactgroupformatter.cpp
+++ b/src/standardcontactgroupformatter.cpp
@@ -21,7 +21,7 @@
#include "standardcontactgroupformatter.h"
-#include <contactgroupexpandjob.h>
+#include "job/contactgroupexpandjob.h"
#include <item.h>
#include <kcontacts/addressee.h>
#include <kcolorscheme.h>