[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kdepim] /: Fix includes
From:       Montel Laurent <montel () kde ! org>
Date:       2015-05-31 21:20:54
Message-ID: E1YzAf8-0002Mc-CV () scm ! kde ! org
[Download RAW message or body]

Git commit 383a4a8770fc4f6adc3cbfde41a07245ff9b9bb3 by Montel Laurent.
Committed on 31/05/2015 at 21:20.
Pushed by mlaurent into branch 'master'.

Fix includes

M  +1    -1    kmail/editor/attachment/attachmentcontroller.cpp
M  +0    -1    messagecomposer/attachment/attachmentcontrollerbase.h
M  +1    -0    messagecomposer/composer/composerviewbase.cpp

http://commits.kde.org/kdepim/383a4a8770fc4f6adc3cbfde41a07245ff9b9bb3

diff --git a/kmail/editor/attachment/attachmentcontroller.cpp b/kmail/edito=
r/attachment/attachmentcontroller.cpp
index 994683c..1106676 100644
--- a/kmail/editor/attachment/attachmentcontroller.cpp
+++ b/kmail/editor/attachment/attachmentcontroller.cpp
@@ -31,7 +31,7 @@
 #include "kmkernel.h"
 #include "kmreadermainwin.h"
 #include "util/mailutil.h"
-
+#include <KIdentityManagement/Identity>
 #include <AkonadiCore/itemfetchjob.h>
 #include <kcontacts/addressee.h>
 #include "kmail_debug.h"
diff --git a/messagecomposer/attachment/attachmentcontrollerbase.h b/messag=
ecomposer/attachment/attachmentcontrollerbase.h
index 71c385a..da96e0b 100644
--- a/messagecomposer/attachment/attachmentcontrollerbase.h
+++ b/messagecomposer/attachment/attachmentcontrollerbase.h
@@ -27,7 +27,6 @@
 =

 #include <QUrl>
 =

-#include <KIdentityManagement/Identity>
 #include <messagecore/attachment/attachmentpart.h>
 #include <AkonadiCore/item.h>
 #include <KJob>
diff --git a/messagecomposer/composer/composerviewbase.cpp b/messagecompose=
r/composer/composerviewbase.cpp
index 50f0f54..5892663 100644
--- a/messagecomposer/composer/composerviewbase.cpp
+++ b/messagecomposer/composer/composerviewbase.cpp
@@ -49,6 +49,7 @@
 #endif
 =

 #include <sonnet/dictionarycombobox.h>
+#include <KIdentityManagement/Identity>
 =

 #include <messagecore/helpers/messagehelpers.h>
 #include <messagecore/utils/stringutil.h>

[prev in list] [next in list] [prev in thread] [next in thread]