Moved cpp code into src directory

120 files changed, 73 insertions, 82 deletions

diff --git a/accounts/CMakeLists.txt b/accounts/CMakeLists.txt
index 613f9792..ca72f050 100644
--- a/accounts/CMakeLists.txt
+++ b/accounts/CMakeLists.txt
@@ -1,3 +1,5 @@
+include_directories(../framework/src/)
+
 add_subdirectory(maildir)
 add_subdirectory(imap)
 add_subdirectory(kolabnow)
diff --git a/accounts/gmail/CMakeLists.txt b/accounts/gmail/CMakeLists.txt
index ca9bcae7..4348d2bd 100644
--- a/accounts/gmail/CMakeLists.txt
+++ b/accounts/gmail/CMakeLists.txt
@@ -27,8 +27,6 @@ find_package(KAsync CONFIG REQUIRED)
 find_package(KF5 REQUIRED COMPONENTS Package Mime)
 
 include_directories(SYSTEM ${KDE_INSTALL_FULL_INCLUDEDIR}/KF5/)
-#FIXME
-include_directories(../../framework/)
 
 set(SRCS
     gmailsettings.cpp
diff --git a/accounts/imap/CMakeLists.txt b/accounts/imap/CMakeLists.txt
index ecaae493..24a03f39 100644
--- a/accounts/imap/CMakeLists.txt
+++ b/accounts/imap/CMakeLists.txt
@@ -27,8 +27,6 @@ find_package(KAsync CONFIG REQUIRED)
 find_package(KF5 REQUIRED COMPONENTS Package Mime)
 
 include_directories(SYSTEM ${KDE_INSTALL_FULL_INCLUDEDIR}/KF5/)
-#FIXME
-include_directories(../../framework/)
 
 set(SRCS
     imapsettings.cpp
diff --git a/accounts/kolabnow/CMakeLists.txt b/accounts/kolabnow/CMakeLists.txt
index 6dd264ce..0ba7491b 100644
--- a/accounts/kolabnow/CMakeLists.txt
+++ b/accounts/kolabnow/CMakeLists.txt
@@ -27,8 +27,6 @@ find_package(KAsync CONFIG REQUIRED)
 find_package(KF5 REQUIRED COMPONENTS Package Mime)
 
 include_directories(SYSTEM ${KDE_INSTALL_FULL_INCLUDEDIR}/KF5/)
-#FIXME
-include_directories(../../framework/)
 
 set(SRCS
     kolabnowsettings.cpp
diff --git a/accounts/maildir/CMakeLists.txt b/accounts/maildir/CMakeLists.txt
index cb93551d..d06e613e 100644
--- a/accounts/maildir/CMakeLists.txt
+++ b/accounts/maildir/CMakeLists.txt
@@ -27,8 +27,6 @@ find_package(KAsync CONFIG REQUIRED)
 find_package(KF5 REQUIRED COMPONENTS Package Mime)
 
 include_directories(SYSTEM ${KDE_INSTALL_FULL_INCLUDEDIR}/KF5/)
-#FIXME
-include_directories(../../framework/)
 
 set(SRCS
     maildirsettings.cpp
diff --git a/framework/CMakeLists.txt b/framework/CMakeLists.txt
index fda9b0a2..1fbd6994 100644
--- a/framework/CMakeLists.txt
+++ b/framework/CMakeLists.txt
@@ -16,85 +16,15 @@ include(KDEInstallDirs)
 
 find_package(Qt5 COMPONENTS REQUIRED Core Qml)
 
-find_package(KF5MimeTreeParser "5.1.46" CONFIG REQUIRED)
-find_package(KF5Mime "4.87.0" CONFIG REQUIRED)
-find_package(Sink CONFIG REQUIRED)
-find_package(KAsync CONFIG REQUIRED)
-find_package(QGpgme CONFIG REQUIRED)
-find_package(KF5Codecs CONFIG REQUIRED)
-find_package(KF5Package CONFIG REQUIRED)
-
 set(CMAKE_AUTOMOC ON)
-add_definitions("-Wall -std=c++0x -g")
-include_directories(.)
-include_directories(SYSTEM ${KDE_INSTALL_FULL_INCLUDEDIR}/KF5/)
-include_directories(SYSTEM ${KDE_INSTALL_FULL_INCLUDEDIR}/KF5/KMime)
 
 enable_testing()
 
-set(SINK_RESOURCE_PLUGINS_PATH ${QT_PLUGIN_INSTALL_DIR}/sink/resources)
 set(FRAMEWORK_INSTALL_DIR ${QML_INSTALL_DIR}/org/kube/framework)
 
 install(DIRECTORY qml/ DESTINATION ${FRAMEWORK_INSTALL_DIR})
 install(FILES qmldir DESTINATION ${FRAMEWORK_INSTALL_DIR})
 
-set(SRCS
-    frameworkplugin.cpp
-    actions/action.cpp
-    actions/actionhandler.cpp
-    actions/actionbroker.cpp
-    actions/actionresult.cpp
-    actions/context.cpp
-    settings/settings.cpp
-    domain/attachmentmodel.cpp
-    domain/maillistmodel.cpp
-    domain/folderlistmodel.cpp
-    domain/actions/sinkactions.cpp
-    domain/objecttreesource.cpp
-    domain/stringhtmlwriter.cpp
-    domain/composercontroller.cpp
-    domain/messageparser.cpp
-    domain/messageparser_new.cpp
-    domain/messageparser_old.cpp
-    domain/mailtemplates.cpp
-    domain/modeltest.cpp
-    domain/retriever.cpp
-    domain/outboxmodel.cpp
-    domain/identitiesmodel.cpp
-    domain/recepientautocompletionmodel.cpp
-    domain/settings/accountsettings.cpp
-    domain/selector.cpp
-    domain/completer.cpp
-    domain/controller.cpp
-    domain/outboxcontroller.cpp
-    domain/mailcontroller.cpp
-    domain/foldercontroller.cpp
-    domain/mouseproxy.cpp
-    domain/contactcontroller.cpp
-    domain/peoplemodel.cpp
-    accounts/accountfactory.cpp
-    accounts/accountsmodel.cpp
-    notifications/notificationhandler.cpp
-)
-
-add_library(frameworkplugin SHARED ${SRCS})
-
-qt5_use_modules(frameworkplugin Core Quick Qml WebKitWidgets Test)
-target_link_libraries(frameworkplugin sink mimetreeparser KF5::MimeTreeParser KF5::Codecs KF5::Package KAsync)
-
-install(TARGETS frameworkplugin DESTINATION ${FRAMEWORK_INSTALL_DIR})
-
-# The actions framework
-#add_subdirectory(actions)
-# The settings framework
-#add_subdirectory(settings)
-# Domain specific domain logic
-#add_subdirectory(domain)
-# The accounts framework
-#add_subdirectory(accounts)
-# The notifications framework
-#add_subdirectory(notifications)
-add_subdirectory(domain/actions/tests)
-add_subdirectory(domain/mimetreeparser)
+add_subdirectory(src)
 
 feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES)
diff --git a/framework/src/CMakeLists.txt b/framework/src/CMakeLists.txt
new file mode 100644
index 00000000..371be4a6
--- /dev/null
+++ b/framework/src/CMakeLists.txt
@@ -0,0 +1,66 @@
+
+find_package(Qt5 COMPONENTS REQUIRED Core Qml)
+find_package(KF5MimeTreeParser "5.1.46" CONFIG REQUIRED)
+find_package(KF5Mime "4.87.0" CONFIG REQUIRED)
+find_package(Sink CONFIG REQUIRED)
+find_package(KAsync CONFIG REQUIRED)
+find_package(QGpgme CONFIG REQUIRED)
+find_package(KF5Codecs CONFIG REQUIRED)
+find_package(KF5Package CONFIG REQUIRED)
+
+add_definitions("-Wall -std=c++0x -g")
+
+include_directories(.)
+#include_directories(SYSTEM ${KDE_INSTALL_FULL_INCLUDEDIR}/KF5/)
+#include_directories(SYSTEM ${KDE_INSTALL_FULL_INCLUDEDIR}/KF5/KMime)
+
+enable_testing()
+
+set(SRCS
+    frameworkplugin.cpp
+    actions/action.cpp
+    actions/actionhandler.cpp
+    actions/actionbroker.cpp
+    actions/actionresult.cpp
+    actions/context.cpp
+    settings/settings.cpp
+    domain/attachmentmodel.cpp
+    domain/maillistmodel.cpp
+    domain/folderlistmodel.cpp
+    domain/actions/sinkactions.cpp
+    domain/objecttreesource.cpp
+    domain/stringhtmlwriter.cpp
+    domain/composercontroller.cpp
+    domain/messageparser.cpp
+    domain/messageparser_new.cpp
+    domain/messageparser_old.cpp
+    domain/mailtemplates.cpp
+    domain/modeltest.cpp
+    domain/retriever.cpp
+    domain/outboxmodel.cpp
+    domain/identitiesmodel.cpp
+    domain/recepientautocompletionmodel.cpp
+    domain/settings/accountsettings.cpp
+    domain/selector.cpp
+    domain/completer.cpp
+    domain/controller.cpp
+    domain/outboxcontroller.cpp
+    domain/mailcontroller.cpp
+    domain/foldercontroller.cpp
+    domain/mouseproxy.cpp
+    domain/contactcontroller.cpp
+    domain/peoplemodel.cpp
+    accounts/accountfactory.cpp
+    accounts/accountsmodel.cpp
+    notifications/notificationhandler.cpp
+)
+
+add_library(frameworkplugin SHARED ${SRCS})
+qt5_use_modules(frameworkplugin Core Quick Qml WebKitWidgets Test)
+target_link_libraries(frameworkplugin sink mimetreeparser KF5::MimeTreeParser KF5::Codecs KF5::Package KAsync)
+install(TARGETS frameworkplugin DESTINATION ${FRAMEWORK_INSTALL_DIR})
+
+add_subdirectory(domain/actions/tests)
+add_subdirectory(domain/mimetreeparser)
+
+feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES)
diff --git a/framework/accounts/accountfactory.cpp b/framework/src/accounts/accountfactory.cpp
index 9dbb402b..9dbb402b 100644
--- a/framework/accounts/accountfactory.cpp
+++ b/framework/src/accounts/accountfactory.cpp
diff --git a/framework/accounts/accountfactory.h b/framework/src/accounts/accountfactory.h
index b57854e5..b57854e5 100644
--- a/framework/accounts/accountfactory.h
+++ b/framework/src/accounts/accountfactory.h
diff --git a/framework/accounts/accountsmodel.cpp b/framework/src/accounts/accountsmodel.cpp
index f98e8ca3..f98e8ca3 100644
--- a/framework/accounts/accountsmodel.cpp
+++ b/framework/src/accounts/accountsmodel.cpp
diff --git a/framework/accounts/accountsmodel.h b/framework/src/accounts/accountsmodel.h
index 2c82a8b9..2c82a8b9 100644
--- a/framework/accounts/accountsmodel.h
+++ b/framework/src/accounts/accountsmodel.h
diff --git a/framework/accounts/gmailcontroller.cpp b/framework/src/accounts/gmailcontroller.cpp
index fda24b26..fda24b26 100644
--- a/framework/accounts/gmailcontroller.cpp
+++ b/framework/src/accounts/gmailcontroller.cpp
diff --git a/framework/accounts/gmailcontroller.h b/framework/src/accounts/gmailcontroller.h
index 2a5ead65..2a5ead65 100644
--- a/framework/accounts/gmailcontroller.h
+++ b/framework/src/accounts/gmailcontroller.h
diff --git a/framework/actions/action.cpp b/framework/src/actions/action.cpp
index 1344d112..1344d112 100644
--- a/framework/actions/action.cpp
+++ b/framework/src/actions/action.cpp
diff --git a/framework/actions/action.h b/framework/src/actions/action.h
index dda8c987..dda8c987 100644
--- a/framework/actions/action.h
+++ b/framework/src/actions/action.h
diff --git a/framework/actions/actionbroker.cpp b/framework/src/actions/actionbroker.cpp
index f6bfdd8e..f6bfdd8e 100644
--- a/framework/actions/actionbroker.cpp
+++ b/framework/src/actions/actionbroker.cpp
diff --git a/framework/actions/actionbroker.h b/framework/src/actions/actionbroker.h
index d893a3e7..d893a3e7 100644
--- a/framework/actions/actionbroker.h
+++ b/framework/src/actions/actionbroker.h
diff --git a/framework/actions/actionhandler.cpp b/framework/src/actions/actionhandler.cpp
index 99fdf66a..99fdf66a 100644
--- a/framework/actions/actionhandler.cpp
+++ b/framework/src/actions/actionhandler.cpp
diff --git a/framework/actions/actionhandler.h b/framework/src/actions/actionhandler.h
index fbaedad1..fbaedad1 100644
--- a/framework/actions/actionhandler.h
+++ b/framework/src/actions/actionhandler.h
diff --git a/framework/actions/actionresult.cpp b/framework/src/actions/actionresult.cpp
index 631c61c4..631c61c4 100644
--- a/framework/actions/actionresult.cpp
+++ b/framework/src/actions/actionresult.cpp
diff --git a/framework/actions/actionresult.h b/framework/src/actions/actionresult.h
index dcf1a9ec..dcf1a9ec 100644
--- a/framework/actions/actionresult.h
+++ b/framework/src/actions/actionresult.h
diff --git a/framework/actions/context.cpp b/framework/src/actions/context.cpp
index 45b660a9..45b660a9 100644
--- a/framework/actions/context.cpp
+++ b/framework/src/actions/context.cpp
diff --git a/framework/actions/context.h b/framework/src/actions/context.h
index 52fbdbc1..52fbdbc1 100644
--- a/framework/actions/context.h
+++ b/framework/src/actions/context.h
diff --git a/framework/actions/tests/CMakeLists.txt b/framework/src/actions/tests/CMakeLists.txt
index af872a3b..af872a3b 100644
--- a/framework/actions/tests/CMakeLists.txt
+++ b/framework/src/actions/tests/CMakeLists.txt
diff --git a/framework/actions/tests/actiontest.cpp b/framework/src/actions/tests/actiontest.cpp
index a4ec4432..a4ec4432 100644
--- a/framework/actions/tests/actiontest.cpp
+++ b/framework/src/actions/tests/actiontest.cpp
diff --git a/framework/domain/actions/sinkactions.cpp b/framework/src/domain/actions/sinkactions.cpp
index 460cb6a1..460cb6a1 100644
--- a/framework/domain/actions/sinkactions.cpp
+++ b/framework/src/domain/actions/sinkactions.cpp
diff --git a/framework/domain/actions/tests/CMakeLists.txt b/framework/src/domain/actions/tests/CMakeLists.txt
index 2c34d628..2c34d628 100644
--- a/framework/domain/actions/tests/CMakeLists.txt
+++ b/framework/src/domain/actions/tests/CMakeLists.txt
diff --git a/framework/domain/actions/tests/sinkactiontest.cpp b/framework/src/domain/actions/tests/sinkactiontest.cpp
index 79375503..79375503 100644
--- a/framework/domain/actions/tests/sinkactiontest.cpp
+++ b/framework/src/domain/actions/tests/sinkactiontest.cpp
diff --git a/framework/domain/attachmentmodel.cpp b/framework/src/domain/attachmentmodel.cpp
index e98c6fc0..e98c6fc0 100644
--- a/framework/domain/attachmentmodel.cpp
+++ b/framework/src/domain/attachmentmodel.cpp
diff --git a/framework/domain/completer.cpp b/framework/src/domain/completer.cpp
index cacb4faa..cacb4faa 100644
--- a/framework/domain/completer.cpp
+++ b/framework/src/domain/completer.cpp
diff --git a/framework/domain/completer.h b/framework/src/domain/completer.h
index a672b809..a672b809 100644
--- a/framework/domain/completer.h
+++ b/framework/src/domain/completer.h
diff --git a/framework/domain/composercontroller.cpp b/framework/src/domain/composercontroller.cpp
index 3328d9eb..3328d9eb 100644
--- a/framework/domain/composercontroller.cpp
+++ b/framework/src/domain/composercontroller.cpp
diff --git a/framework/domain/composercontroller.h b/framework/src/domain/composercontroller.h
index 92467d05..92467d05 100644
--- a/framework/domain/composercontroller.h
+++ b/framework/src/domain/composercontroller.h
diff --git a/framework/domain/contactcontroller.cpp b/framework/src/domain/contactcontroller.cpp
index 49f78b40..49f78b40 100644
--- a/framework/domain/contactcontroller.cpp
+++ b/framework/src/domain/contactcontroller.cpp
diff --git a/framework/domain/contactcontroller.h b/framework/src/domain/contactcontroller.h
index d1973d9c..d1973d9c 100644
--- a/framework/domain/contactcontroller.h
+++ b/framework/src/domain/contactcontroller.h
diff --git a/framework/domain/controller.cpp b/framework/src/domain/controller.cpp
index 52f4cd1f..52f4cd1f 100644
--- a/framework/domain/controller.cpp
+++ b/framework/src/domain/controller.cpp
diff --git a/framework/domain/controller.h b/framework/src/domain/controller.h
index bf2a7ace..bf2a7ace 100644
--- a/framework/domain/controller.h
+++ b/framework/src/domain/controller.h
diff --git a/framework/domain/foldercontroller.cpp b/framework/src/domain/foldercontroller.cpp
index 3c10f773..3c10f773 100644
--- a/framework/domain/foldercontroller.cpp
+++ b/framework/src/domain/foldercontroller.cpp
diff --git a/framework/domain/foldercontroller.h b/framework/src/domain/foldercontroller.h
index c0815546..c0815546 100644
--- a/framework/domain/foldercontroller.h
+++ b/framework/src/domain/foldercontroller.h
diff --git a/framework/domain/folderlistmodel.cpp b/framework/src/domain/folderlistmodel.cpp
index 14405beb..14405beb 100644
--- a/framework/domain/folderlistmodel.cpp
+++ b/framework/src/domain/folderlistmodel.cpp
diff --git a/framework/domain/folderlistmodel.h b/framework/src/domain/folderlistmodel.h
index 17645bb5..17645bb5 100644
--- a/framework/domain/folderlistmodel.h
+++ b/framework/src/domain/folderlistmodel.h
diff --git a/framework/domain/identitiesmodel.cpp b/framework/src/domain/identitiesmodel.cpp
index 0d97fc6a..0d97fc6a 100644
--- a/framework/domain/identitiesmodel.cpp
+++ b/framework/src/domain/identitiesmodel.cpp
diff --git a/framework/domain/identitiesmodel.h b/framework/src/domain/identitiesmodel.h
index 9b172251..9b172251 100644
--- a/framework/domain/identitiesmodel.h
+++ b/framework/src/domain/identitiesmodel.h
diff --git a/framework/domain/mailcontroller.cpp b/framework/src/domain/mailcontroller.cpp
index b912567a..b912567a 100644
--- a/framework/domain/mailcontroller.cpp
+++ b/framework/src/domain/mailcontroller.cpp
diff --git a/framework/domain/mailcontroller.h b/framework/src/domain/mailcontroller.h
index ae0f32d5..ae0f32d5 100644
--- a/framework/domain/mailcontroller.h
+++ b/framework/src/domain/mailcontroller.h
diff --git a/framework/domain/maillistmodel.cpp b/framework/src/domain/maillistmodel.cpp
index 83340f69..83340f69 100644
--- a/framework/domain/maillistmodel.cpp
+++ b/framework/src/domain/maillistmodel.cpp
diff --git a/framework/domain/maillistmodel.h b/framework/src/domain/maillistmodel.h
index 44347661..44347661 100644
--- a/framework/domain/maillistmodel.h
+++ b/framework/src/domain/maillistmodel.h
diff --git a/framework/domain/mailtemplates.cpp b/framework/src/domain/mailtemplates.cpp
index 6af381d2..6af381d2 100644
--- a/framework/domain/mailtemplates.cpp
+++ b/framework/src/domain/mailtemplates.cpp
diff --git a/framework/domain/mailtemplates.h b/framework/src/domain/mailtemplates.h
index 6519122a..6519122a 100644
--- a/framework/domain/mailtemplates.h
+++ b/framework/src/domain/mailtemplates.h
diff --git a/framework/domain/messageparser.cpp b/framework/src/domain/messageparser.cpp
index ea2ecbf1..ea2ecbf1 100644
--- a/framework/domain/messageparser.cpp
+++ b/framework/src/domain/messageparser.cpp
diff --git a/framework/domain/messageparser.h b/framework/src/domain/messageparser.h
index aeeed93c..aeeed93c 100644
--- a/framework/domain/messageparser.h
+++ b/framework/src/domain/messageparser.h
diff --git a/framework/domain/messageparser_new.cpp b/framework/src/domain/messageparser_new.cpp
index cb399523..cb399523 100644
--- a/framework/domain/messageparser_new.cpp
+++ b/framework/src/domain/messageparser_new.cpp
diff --git a/framework/domain/messageparser_old.cpp b/framework/src/domain/messageparser_old.cpp
index a4247d8c..a4247d8c 100644
--- a/framework/domain/messageparser_old.cpp
+++ b/framework/src/domain/messageparser_old.cpp
diff --git a/framework/domain/mimetreeparser/CMakeLists.txt b/framework/src/domain/mimetreeparser/CMakeLists.txt
index 64da2656..64da2656 100644
--- a/framework/domain/mimetreeparser/CMakeLists.txt
+++ b/framework/src/domain/mimetreeparser/CMakeLists.txt
diff --git a/framework/domain/mimetreeparser/interface.cpp b/framework/src/domain/mimetreeparser/interface.cpp
index 663a2013..663a2013 100644
--- a/framework/domain/mimetreeparser/interface.cpp
+++ b/framework/src/domain/mimetreeparser/interface.cpp
diff --git a/framework/domain/mimetreeparser/interface.h b/framework/src/domain/mimetreeparser/interface.h
index 7c3ea28b..7c3ea28b 100644
--- a/framework/domain/mimetreeparser/interface.h
+++ b/framework/src/domain/mimetreeparser/interface.h
diff --git a/framework/domain/mimetreeparser/interface_p.h b/framework/src/domain/mimetreeparser/interface_p.h
index 8fab221a..8fab221a 100644
--- a/framework/domain/mimetreeparser/interface_p.h
+++ b/framework/src/domain/mimetreeparser/interface_p.h
diff --git a/framework/domain/mimetreeparser/objecttreesource.cpp b/framework/src/domain/mimetreeparser/objecttreesource.cpp
index 567f3516..567f3516 100644
--- a/framework/domain/mimetreeparser/objecttreesource.cpp
+++ b/framework/src/domain/mimetreeparser/objecttreesource.cpp
diff --git a/framework/domain/mimetreeparser/objecttreesource.h b/framework/src/domain/mimetreeparser/objecttreesource.h
index 93812dc3..93812dc3 100644
--- a/framework/domain/mimetreeparser/objecttreesource.h
+++ b/framework/src/domain/mimetreeparser/objecttreesource.h
diff --git a/framework/domain/mimetreeparser/stringhtmlwriter.cpp b/framework/src/domain/mimetreeparser/stringhtmlwriter.cpp
index 88034492..88034492 100644
--- a/framework/domain/mimetreeparser/stringhtmlwriter.cpp
+++ b/framework/src/domain/mimetreeparser/stringhtmlwriter.cpp
diff --git a/framework/domain/mimetreeparser/stringhtmlwriter.h b/framework/src/domain/mimetreeparser/stringhtmlwriter.h
index fa5b760e..fa5b760e 100644
--- a/framework/domain/mimetreeparser/stringhtmlwriter.h
+++ b/framework/src/domain/mimetreeparser/stringhtmlwriter.h
diff --git a/framework/domain/mimetreeparser/tests/CMakeLists.txt b/framework/src/domain/mimetreeparser/tests/CMakeLists.txt
index 71afb903..71afb903 100644
--- a/framework/domain/mimetreeparser/tests/CMakeLists.txt
+++ b/framework/src/domain/mimetreeparser/tests/CMakeLists.txt
diff --git a/framework/domain/mimetreeparser/tests/data/alternative.mbox b/framework/src/domain/mimetreeparser/tests/data/alternative.mbox
index 6522c34b..6522c34b 100644
--- a/framework/domain/mimetreeparser/tests/data/alternative.mbox
+++ b/framework/src/domain/mimetreeparser/tests/data/alternative.mbox
diff --git a/framework/domain/mimetreeparser/tests/data/cid-links.mbox b/framework/src/domain/mimetreeparser/tests/data/cid-links.mbox
index 40ff5282..40ff5282 100644
--- a/framework/domain/mimetreeparser/tests/data/cid-links.mbox
+++ b/framework/src/domain/mimetreeparser/tests/data/cid-links.mbox
diff --git a/framework/domain/mimetreeparser/tests/data/html.mbox b/framework/src/domain/mimetreeparser/tests/data/html.mbox
index bf5c685d..bf5c685d 100644
--- a/framework/domain/mimetreeparser/tests/data/html.mbox
+++ b/framework/src/domain/mimetreeparser/tests/data/html.mbox
diff --git a/framework/domain/mimetreeparser/tests/data/openpgp-encrypted-attachment-and-non-encrypted-attachment.mbox b/framework/src/domain/mimetreeparser/tests/data/openpgp-encrypted-attachment-and-non-encrypted-attachment.mbox
index 2d9726ea..2d9726ea 100644
--- a/framework/domain/mimetreeparser/tests/data/openpgp-encrypted-attachment-and-non-encrypted-attachment.mbox
+++ b/framework/src/domain/mimetreeparser/tests/data/openpgp-encrypted-attachment-and-non-encrypted-attachment.mbox
diff --git a/framework/domain/mimetreeparser/tests/data/openpgp-inline-charset-encrypted.mbox b/framework/src/domain/mimetreeparser/tests/data/openpgp-inline-charset-encrypted.mbox
index 8bd06910..8bd06910 100644
--- a/framework/domain/mimetreeparser/tests/data/openpgp-inline-charset-encrypted.mbox
+++ b/framework/src/domain/mimetreeparser/tests/data/openpgp-inline-charset-encrypted.mbox
diff --git a/framework/domain/mimetreeparser/tests/data/openpgp-inline-encrypted+nonenc.mbox b/framework/src/domain/mimetreeparser/tests/data/openpgp-inline-encrypted+nonenc.mbox
index b98dc336..b98dc336 100644
--- a/framework/domain/mimetreeparser/tests/data/openpgp-inline-encrypted+nonenc.mbox
+++ b/framework/src/domain/mimetreeparser/tests/data/openpgp-inline-encrypted+nonenc.mbox
diff --git a/framework/domain/mimetreeparser/tests/data/plaintext.mbox b/framework/src/domain/mimetreeparser/tests/data/plaintext.mbox
index d185b1c1..d185b1c1 100644
--- a/framework/domain/mimetreeparser/tests/data/plaintext.mbox
+++ b/framework/src/domain/mimetreeparser/tests/data/plaintext.mbox
diff --git a/framework/domain/mimetreeparser/tests/data/smime-encrypted.mbox b/framework/src/domain/mimetreeparser/tests/data/smime-encrypted.mbox
index 6b6d6a0d..6b6d6a0d 100644
--- a/framework/domain/mimetreeparser/tests/data/smime-encrypted.mbox
+++ b/framework/src/domain/mimetreeparser/tests/data/smime-encrypted.mbox
diff --git a/framework/domain/mimetreeparser/tests/gnupg_home/CMakeLists.txt b/framework/src/domain/mimetreeparser/tests/gnupg_home/CMakeLists.txt
index 9c64a008..9c64a008 100644
--- a/framework/domain/mimetreeparser/tests/gnupg_home/CMakeLists.txt
+++ b/framework/src/domain/mimetreeparser/tests/gnupg_home/CMakeLists.txt
diff --git a/framework/domain/mimetreeparser/tests/gnupg_home/dirmngr-cache.d/DIR.txt b/framework/src/domain/mimetreeparser/tests/gnupg_home/dirmngr-cache.d/DIR.txt
index 1a45a6b3..1a45a6b3 100644
--- a/framework/domain/mimetreeparser/tests/gnupg_home/dirmngr-cache.d/DIR.txt
+++ b/framework/src/domain/mimetreeparser/tests/gnupg_home/dirmngr-cache.d/DIR.txt
diff --git a/framework/domain/mimetreeparser/tests/gnupg_home/dirmngr-cache.d/crl-4E31CEB57DDD4A7B9991AB05507B1ED4293FF952.db b/framework/src/domain/mimetreeparser/tests/gnupg_home/dirmngr-cache.d/crl-4E31CEB57DDD4A7B9991AB05507B1ED4293FF952.db
index 0b7e2dd4..0b7e2dd4 100644
--- a/framework/domain/mimetreeparser/tests/gnupg_home/dirmngr-cache.d/crl-4E31CEB57DDD4A7B9991AB05507B1ED4293FF952.db
+++ b/framework/src/domain/mimetreeparser/tests/gnupg_home/dirmngr-cache.d/crl-4E31CEB57DDD4A7B9991AB05507B1ED4293FF952.db
diff --git a/framework/domain/mimetreeparser/tests/gnupg_home/dirmngr-cache.d/crl-7F2A402CBB016A9146D613568C89D3596A4111AA.db b/framework/src/domain/mimetreeparser/tests/gnupg_home/dirmngr-cache.d/crl-7F2A402CBB016A9146D613568C89D3596A4111AA.db
index 47474a26..47474a26 100644
--- a/framework/domain/mimetreeparser/tests/gnupg_home/dirmngr-cache.d/crl-7F2A402CBB016A9146D613568C89D3596A4111AA.db
+++ b/framework/src/domain/mimetreeparser/tests/gnupg_home/dirmngr-cache.d/crl-7F2A402CBB016A9146D613568C89D3596A4111AA.db
diff --git a/framework/domain/mimetreeparser/tests/gnupg_home/dirmngr.conf b/framework/src/domain/mimetreeparser/tests/gnupg_home/dirmngr.conf
index a17a0354..a17a0354 100644
--- a/framework/domain/mimetreeparser/tests/gnupg_home/dirmngr.conf
+++ b/framework/src/domain/mimetreeparser/tests/gnupg_home/dirmngr.conf
diff --git a/framework/domain/mimetreeparser/tests/gnupg_home/gpg-agent.conf.in b/framework/src/domain/mimetreeparser/tests/gnupg_home/gpg-agent.conf.in
index ece69255..ece69255 100644
--- a/framework/domain/mimetreeparser/tests/gnupg_home/gpg-agent.conf.in
+++ b/framework/src/domain/mimetreeparser/tests/gnupg_home/gpg-agent.conf.in
diff --git a/framework/domain/mimetreeparser/tests/gnupg_home/gpg.conf b/framework/src/domain/mimetreeparser/tests/gnupg_home/gpg.conf
index f1760823..f1760823 100644
--- a/framework/domain/mimetreeparser/tests/gnupg_home/gpg.conf
+++ b/framework/src/domain/mimetreeparser/tests/gnupg_home/gpg.conf
diff --git a/framework/domain/mimetreeparser/tests/gnupg_home/gpgsm.conf.in b/framework/src/domain/mimetreeparser/tests/gnupg_home/gpgsm.conf.in
index 92b6119d..92b6119d 100644
--- a/framework/domain/mimetreeparser/tests/gnupg_home/gpgsm.conf.in
+++ b/framework/src/domain/mimetreeparser/tests/gnupg_home/gpgsm.conf.in
diff --git a/framework/domain/mimetreeparser/tests/gnupg_home/pinentry-fake.sh b/framework/src/domain/mimetreeparser/tests/gnupg_home/pinentry-fake.sh
index 7135a942..7135a942 100755
--- a/framework/domain/mimetreeparser/tests/gnupg_home/pinentry-fake.sh
+++ b/framework/src/domain/mimetreeparser/tests/gnupg_home/pinentry-fake.sh
diff --git a/framework/domain/mimetreeparser/tests/gnupg_home/private-keys-v1.d/1AA8BA52430E51AE249AF0DA97D59F869E4101A8.key b/framework/src/domain/mimetreeparser/tests/gnupg_home/private-keys-v1.d/1AA8BA52430E51AE249AF0DA97D59F869E4101A8.key
index 39ac307b..39ac307b 100644
--- a/framework/domain/mimetreeparser/tests/gnupg_home/private-keys-v1.d/1AA8BA52430E51AE249AF0DA97D59F869E4101A8.key
+++ b/framework/src/domain/mimetreeparser/tests/gnupg_home/private-keys-v1.d/1AA8BA52430E51AE249AF0DA97D59F869E4101A8.key
diff --git a/framework/domain/mimetreeparser/tests/gnupg_home/pubring.gpg b/framework/src/domain/mimetreeparser/tests/gnupg_home/pubring.gpg
index 2e00fa24..2e00fa24 100644
--- a/framework/domain/mimetreeparser/tests/gnupg_home/pubring.gpg
+++ b/framework/src/domain/mimetreeparser/tests/gnupg_home/pubring.gpg
diff --git a/framework/domain/mimetreeparser/tests/gnupg_home/pubring.kbx b/framework/src/domain/mimetreeparser/tests/gnupg_home/pubring.kbx
index 0230f313..0230f313 100644
--- a/framework/domain/mimetreeparser/tests/gnupg_home/pubring.kbx
+++ b/framework/src/domain/mimetreeparser/tests/gnupg_home/pubring.kbx
diff --git a/framework/domain/mimetreeparser/tests/gnupg_home/scdaemon.conf b/framework/src/domain/mimetreeparser/tests/gnupg_home/scdaemon.conf
index a17a0354..a17a0354 100644
--- a/framework/domain/mimetreeparser/tests/gnupg_home/scdaemon.conf
+++ b/framework/src/domain/mimetreeparser/tests/gnupg_home/scdaemon.conf
diff --git a/framework/domain/mimetreeparser/tests/gnupg_home/secring.gpg b/framework/src/domain/mimetreeparser/tests/gnupg_home/secring.gpg
index cfd3387d..cfd3387d 100644
--- a/framework/domain/mimetreeparser/tests/gnupg_home/secring.gpg
+++ b/framework/src/domain/mimetreeparser/tests/gnupg_home/secring.gpg
diff --git a/framework/domain/mimetreeparser/tests/gnupg_home/trustdb.gpg b/framework/src/domain/mimetreeparser/tests/gnupg_home/trustdb.gpg
index 70089c15..70089c15 100644
--- a/framework/domain/mimetreeparser/tests/gnupg_home/trustdb.gpg
+++ b/framework/src/domain/mimetreeparser/tests/gnupg_home/trustdb.gpg
diff --git a/framework/domain/mimetreeparser/tests/gnupg_home/trustlist.txt b/framework/src/domain/mimetreeparser/tests/gnupg_home/trustlist.txt
index bbb0442d..bbb0442d 100644
--- a/framework/domain/mimetreeparser/tests/gnupg_home/trustlist.txt
+++ b/framework/src/domain/mimetreeparser/tests/gnupg_home/trustlist.txt
diff --git a/framework/domain/mimetreeparser/tests/gpgerrortest.cpp b/framework/src/domain/mimetreeparser/tests/gpgerrortest.cpp
index 4254d972..4254d972 100644
--- a/framework/domain/mimetreeparser/tests/gpgerrortest.cpp
+++ b/framework/src/domain/mimetreeparser/tests/gpgerrortest.cpp
diff --git a/framework/domain/mimetreeparser/tests/interfacetest.cpp b/framework/src/domain/mimetreeparser/tests/interfacetest.cpp
index 3ae32a4a..3ae32a4a 100644
--- a/framework/domain/mimetreeparser/tests/interfacetest.cpp
+++ b/framework/src/domain/mimetreeparser/tests/interfacetest.cpp
diff --git a/framework/domain/mimetreeparser/tests/kdepim_add_gpg_crypto_test.cmake b/framework/src/domain/mimetreeparser/tests/kdepim_add_gpg_crypto_test.cmake
index 281752a7..ea0ab8d2 100644
--- a/framework/domain/mimetreeparser/tests/kdepim_add_gpg_crypto_test.cmake
+++ b/framework/src/domain/mimetreeparser/tests/kdepim_add_gpg_crypto_test.cmake
@@ -3,7 +3,8 @@
 # Redistribution and use is allowed according to the terms of the BSD license.
 # For details see the accompanying COPYING-CMAKE-SCRIPTS file.
 
-set( GNUPGHOME ${CMAKE_BINARY_DIR}/framework/domain/mimetreeparser/tests/gnupg_home )
+set( MIMETREEPARSERRELPATH framework/src/domain/mimetreeparser)
+set( GNUPGHOME ${CMAKE_BINARY_DIR}/${MIMETREEPARSERRELPATH}/tests/gnupg_home )
 add_definitions( -DGNUPGHOME="${GNUPGHOME}" )
 
 macro (ADD_GPG_CRYPTO_TEST _target _testname)
@@ -32,7 +33,7 @@ macro (ADD_GPG_CRYPTO_TEST _target _testname)
         -D_filename=${_executable}.shell -D_library_path_variable=${_library_path_variable}
         -D_ld_library_path="${_ld_library_path}" -D_executable=$<TARGET_FILE:${_target}>
         -D_gnupghome="${GNUPGHOME}"
-        -P ${CMAKE_SOURCE_DIR}/framework/domain/mimetreeparser/tests/kdepim_generate_crypto_test_wrapper.cmake
+        -P ${CMAKE_SOURCE_DIR}/${MIMETREEPARSERRELPATH}/tests/kdepim_generate_crypto_test_wrapper.cmake
       )
 
       set_property(DIRECTORY APPEND PROPERTY ADDITIONAL_MAKE_CLEAN_FILES "${_executable}.shell" )
@@ -50,7 +51,7 @@ macro (ADD_GPG_CRYPTO_TEST _target _testname)
          -D_filename="${_executable}.bat"
          -D_ld_library_path="${_ld_library_path}" -D_executable="${_executable}"
          -D_gnupghome="${GNUPGHOME}"
-         -P ${CMAKE_SOURCE_DIR}/framework/domain/mimetreeparser/tests/kdepim_generate_crypto_test_wrapper.cmake
+         -P ${CMAKE_SOURCE_DIR}/${MIMETREEPARSERRELPATH}/tests/kdepim_generate_crypto_test_wrapper.cmake
          )
 
       add_test(NAME ${_testname} COMMAND ${_executable}.bat)
diff --git a/framework/domain/mimetreeparser/tests/kdepim_generate_crypto_test_wrapper.cmake b/framework/src/domain/mimetreeparser/tests/kdepim_generate_crypto_test_wrapper.cmake
index e1412f37..e1412f37 100644
--- a/framework/domain/mimetreeparser/tests/kdepim_generate_crypto_test_wrapper.cmake
+++ b/framework/src/domain/mimetreeparser/tests/kdepim_generate_crypto_test_wrapper.cmake
diff --git a/framework/domain/mimetreeparser/thoughts.txt b/framework/src/domain/mimetreeparser/thoughts.txt
index 3340347a..3340347a 100644
--- a/framework/domain/mimetreeparser/thoughts.txt
+++ b/framework/src/domain/mimetreeparser/thoughts.txt
diff --git a/framework/domain/modeltest.cpp b/framework/src/domain/modeltest.cpp
index 2bd3d27f..2bd3d27f 100644
--- a/framework/domain/modeltest.cpp
+++ b/framework/src/domain/modeltest.cpp
diff --git a/framework/domain/modeltest.h b/framework/src/domain/modeltest.h
index 735a4227..735a4227 100644
--- a/framework/domain/modeltest.h
+++ b/framework/src/domain/modeltest.h
diff --git a/framework/domain/mouseproxy.cpp b/framework/src/domain/mouseproxy.cpp
index 9944acb6..9944acb6 100644
--- a/framework/domain/mouseproxy.cpp
+++ b/framework/src/domain/mouseproxy.cpp
diff --git a/framework/domain/mouseproxy.h b/framework/src/domain/mouseproxy.h
index 67b25d06..67b25d06 100644
--- a/framework/domain/mouseproxy.h
+++ b/framework/src/domain/mouseproxy.h
diff --git a/framework/domain/objecttreesource.cpp b/framework/src/domain/objecttreesource.cpp
index 567f3516..567f3516 100644
--- a/framework/domain/objecttreesource.cpp
+++ b/framework/src/domain/objecttreesource.cpp
diff --git a/framework/domain/objecttreesource.h b/framework/src/domain/objecttreesource.h
index 93812dc3..93812dc3 100644
--- a/framework/domain/objecttreesource.h
+++ b/framework/src/domain/objecttreesource.h
diff --git a/framework/domain/outboxcontroller.cpp b/framework/src/domain/outboxcontroller.cpp
index 590b6c49..590b6c49 100644
--- a/framework/domain/outboxcontroller.cpp
+++ b/framework/src/domain/outboxcontroller.cpp
diff --git a/framework/domain/outboxcontroller.h b/framework/src/domain/outboxcontroller.h
index 4c24ad59..4c24ad59 100644
--- a/framework/domain/outboxcontroller.h
+++ b/framework/src/domain/outboxcontroller.h
diff --git a/framework/domain/outboxmodel.cpp b/framework/src/domain/outboxmodel.cpp
index 237648b1..237648b1 100644
--- a/framework/domain/outboxmodel.cpp
+++ b/framework/src/domain/outboxmodel.cpp
diff --git a/framework/domain/outboxmodel.h b/framework/src/domain/outboxmodel.h
index 4be9c7f8..4be9c7f8 100644
--- a/framework/domain/outboxmodel.h
+++ b/framework/src/domain/outboxmodel.h
diff --git a/framework/domain/peoplemodel.cpp b/framework/src/domain/peoplemodel.cpp
index c9e7248c..c9e7248c 100644
--- a/framework/domain/peoplemodel.cpp
+++ b/framework/src/domain/peoplemodel.cpp
diff --git a/framework/domain/peoplemodel.h b/framework/src/domain/peoplemodel.h
index a59e752c..a59e752c 100644
--- a/framework/domain/peoplemodel.h
+++ b/framework/src/domain/peoplemodel.h
diff --git a/framework/domain/recepientautocompletionmodel.cpp b/framework/src/domain/recepientautocompletionmodel.cpp
index 2f52db07..2f52db07 100644
--- a/framework/domain/recepientautocompletionmodel.cpp
+++ b/framework/src/domain/recepientautocompletionmodel.cpp
diff --git a/framework/domain/recepientautocompletionmodel.h b/framework/src/domain/recepientautocompletionmodel.h
index 22c6f108..22c6f108 100644
--- a/framework/domain/recepientautocompletionmodel.h
+++ b/framework/src/domain/recepientautocompletionmodel.h
diff --git a/framework/domain/retriever.cpp b/framework/src/domain/retriever.cpp
index b8e29523..b8e29523 100644
--- a/framework/domain/retriever.cpp
+++ b/framework/src/domain/retriever.cpp
diff --git a/framework/domain/retriever.h b/framework/src/domain/retriever.h
index e454532d..e454532d 100644
--- a/framework/domain/retriever.h
+++ b/framework/src/domain/retriever.h
diff --git a/framework/domain/selector.cpp b/framework/src/domain/selector.cpp
index d021095b..d021095b 100644
--- a/framework/domain/selector.cpp
+++ b/framework/src/domain/selector.cpp
diff --git a/framework/domain/selector.h b/framework/src/domain/selector.h
index 358eaa9a..358eaa9a 100644
--- a/framework/domain/selector.h
+++ b/framework/src/domain/selector.h
diff --git a/framework/domain/settings/CMakeLists.txt b/framework/src/domain/settings/CMakeLists.txt
index dc9d01b1..dc9d01b1 100644
--- a/framework/domain/settings/CMakeLists.txt
+++ b/framework/src/domain/settings/CMakeLists.txt
diff --git a/framework/domain/settings/accountsettings.cpp b/framework/src/domain/settings/accountsettings.cpp
index d1019e1f..d1019e1f 100644
--- a/framework/domain/settings/accountsettings.cpp
+++ b/framework/src/domain/settings/accountsettings.cpp
diff --git a/framework/domain/settings/accountsettings.h b/framework/src/domain/settings/accountsettings.h
index 077b7784..077b7784 100644
--- a/framework/domain/settings/accountsettings.h
+++ b/framework/src/domain/settings/accountsettings.h
diff --git a/framework/domain/stringhtmlwriter.cpp b/framework/src/domain/stringhtmlwriter.cpp
index 88034492..88034492 100644
--- a/framework/domain/stringhtmlwriter.cpp
+++ b/framework/src/domain/stringhtmlwriter.cpp
diff --git a/framework/domain/stringhtmlwriter.h b/framework/src/domain/stringhtmlwriter.h
index fa5b760e..fa5b760e 100644
--- a/framework/domain/stringhtmlwriter.h
+++ b/framework/src/domain/stringhtmlwriter.h
diff --git a/framework/frameworkplugin.cpp b/framework/src/frameworkplugin.cpp
index f491bae7..f491bae7 100644
--- a/framework/frameworkplugin.cpp
+++ b/framework/src/frameworkplugin.cpp
diff --git a/framework/frameworkplugin.h b/framework/src/frameworkplugin.h
index 519e0ba9..519e0ba9 100644
--- a/framework/frameworkplugin.h
+++ b/framework/src/frameworkplugin.h
diff --git a/framework/notifications/notificationhandler.cpp b/framework/src/notifications/notificationhandler.cpp
index 093d638a..093d638a 100644
--- a/framework/notifications/notificationhandler.cpp
+++ b/framework/src/notifications/notificationhandler.cpp
diff --git a/framework/notifications/notificationhandler.h b/framework/src/notifications/notificationhandler.h
index fa992e87..fa992e87 100644
--- a/framework/notifications/notificationhandler.h
+++ b/framework/src/notifications/notificationhandler.h
diff --git a/framework/settings/settings.cpp b/framework/src/settings/settings.cpp
index 00d1b9c5..00d1b9c5 100644
--- a/framework/settings/settings.cpp
+++ b/framework/src/settings/settings.cpp
diff --git a/framework/settings/settings.h b/framework/src/settings/settings.h
index c5cff76b..c5cff76b 100644
--- a/framework/settings/settings.h
+++ b/framework/src/settings/settings.h