3 files changed, 3 insertions, 3 deletions
diff --git a/framework/src/domain/composercontroller.cpp b/framework/src/domain/composercontroller.cpp
index 670cca0b..332101ac 100644
--- a/framework/src/domain/composercontroller.cpp
+++ b/framework/src/domain/composercontroller.cpp
@@ -33,7 +33,7 @@
 #include "identitiesmodel.h"
 #include "recepientautocompletionmodel.h"
-#include "mailtemplates.h"
+#include "mime/mailtemplates.h"
 class IdentitySelector : public Selector {
 public:
diff --git a/framework/src/domain/mime/mimetreeparser/otp/autotests/kdepim_add_gpg_crypto_test.cmake b/framework/src/domain/mime/mimetreeparser/otp/autotests/kdepim_add_gpg_crypto_test.cmake
index ea0ab8d2..841cf6ff 100644
--- a/framework/src/domain/mime/mimetreeparser/otp/autotests/kdepim_add_gpg_crypto_test.cmake
+++ b/framework/src/domain/mime/mimetreeparser/otp/autotests/kdepim_add_gpg_crypto_test.cmake
@@ -3,7 +3,7 @@
 # Redistribution and use is allowed according to the terms of the BSD license.
 # For details see the accompanying COPYING-CMAKE-SCRIPTS file.
-set( MIMETREEPARSERRELPATH framework/src/domain/mimetreeparser)
+set( MIMETREEPARSERRELPATH framework/src/domain/mime/mimetreeparser)
 set( GNUPGHOME ${CMAKE_BINARY_DIR}/${MIMETREEPARSERRELPATH}/tests/gnupg_home )
 add_definitions( -DGNUPGHOME="${GNUPGHOME}" )
diff --git a/framework/src/domain/mime/mimetreeparser/tests/kdepim_add_gpg_crypto_test.cmake b/framework/src/domain/mime/mimetreeparser/tests/kdepim_add_gpg_crypto_test.cmake
index ea0ab8d2..841cf6ff 100644
--- a/framework/src/domain/mime/mimetreeparser/tests/kdepim_add_gpg_crypto_test.cmake
+++ b/framework/src/domain/mime/mimetreeparser/tests/kdepim_add_gpg_crypto_test.cmake
@@ -3,7 +3,7 @@
 # Redistribution and use is allowed according to the terms of the BSD license.
 # For details see the accompanying COPYING-CMAKE-SCRIPTS file.
-set( MIMETREEPARSERRELPATH framework/src/domain/mimetreeparser)
+set( MIMETREEPARSERRELPATH framework/src/domain/mime/mimetreeparser)
 set( GNUPGHOME ${CMAKE_BINARY_DIR}/${MIMETREEPARSERRELPATH}/tests/gnupg_home )
 add_definitions( -DGNUPGHOME="${GNUPGHOME}" )

diff --git a/framework/src/domain/composercontroller.cpp b/framework/src/domain/composercontroller.cpp index 670cca0b..332101ac 100644 --- a/framework/src/domain/composercontroller.cpp +++ b/framework/src/domain/composercontroller.cpp
@@ -33,7 +33,7 @@
33		33
34	#include "identitiesmodel.h"	34	#include "identitiesmodel.h"
35	#include "recepientautocompletionmodel.h"	35	#include "recepientautocompletionmodel.h"
36	#include "mailtemplates.h"	36	#include "mime/mailtemplates.h"
37		37
38	class IdentitySelector : public Selector {	38	class IdentitySelector : public Selector {
39	public:	39	public:


diff --git a/framework/src/domain/mime/mimetreeparser/otp/autotests/kdepim_add_gpg_crypto_test.cmake b/framework/src/domain/mime/mimetreeparser/otp/autotests/kdepim_add_gpg_crypto_test.cmake index ea0ab8d2..841cf6ff 100644 --- a/framework/src/domain/mime/mimetreeparser/otp/autotests/kdepim_add_gpg_crypto_test.cmake +++ b/framework/src/domain/mime/mimetreeparser/otp/autotests/kdepim_add_gpg_crypto_test.cmake
@@ -3,7 +3,7 @@
3	# Redistribution and use is allowed according to the terms of the BSD license.	3	# Redistribution and use is allowed according to the terms of the BSD license.
4	# For details see the accompanying COPYING-CMAKE-SCRIPTS file.	4	# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
5		5
6	set( MIMETREEPARSERRELPATH framework/src/domain/mimetreeparser)	6	set( MIMETREEPARSERRELPATH framework/src/domain/mime/mimetreeparser)
7	set( GNUPGHOME ${CMAKE_BINARY_DIR}/${MIMETREEPARSERRELPATH}/tests/gnupg_home )	7	set( GNUPGHOME ${CMAKE_BINARY_DIR}/${MIMETREEPARSERRELPATH}/tests/gnupg_home )
8	add_definitions( -DGNUPGHOME="${GNUPGHOME}" )	8	add_definitions( -DGNUPGHOME="${GNUPGHOME}" )
9		9


diff --git a/framework/src/domain/mime/mimetreeparser/tests/kdepim_add_gpg_crypto_test.cmake b/framework/src/domain/mime/mimetreeparser/tests/kdepim_add_gpg_crypto_test.cmake index ea0ab8d2..841cf6ff 100644 --- a/framework/src/domain/mime/mimetreeparser/tests/kdepim_add_gpg_crypto_test.cmake +++ b/framework/src/domain/mime/mimetreeparser/tests/kdepim_add_gpg_crypto_test.cmake
@@ -3,7 +3,7 @@
3	# Redistribution and use is allowed according to the terms of the BSD license.	3	# Redistribution and use is allowed according to the terms of the BSD license.
4	# For details see the accompanying COPYING-CMAKE-SCRIPTS file.	4	# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
5		5
6	set( MIMETREEPARSERRELPATH framework/src/domain/mimetreeparser)	6	set( MIMETREEPARSERRELPATH framework/src/domain/mime/mimetreeparser)
7	set( GNUPGHOME ${CMAKE_BINARY_DIR}/${MIMETREEPARSERRELPATH}/tests/gnupg_home )	7	set( GNUPGHOME ${CMAKE_BINARY_DIR}/${MIMETREEPARSERRELPATH}/tests/gnupg_home )
8	add_definitions( -DGNUPGHOME="${GNUPGHOME}" )	8	add_definitions( -DGNUPGHOME="${GNUPGHOME}" )
9		9