Fix includes

agents/sendlateragent/autotests/sendlaterutiltest.cpp

@@ -14,7 +14,6 @@
 #include <QDateTime>
 #include <QStandardPaths>
 #include <QTest>
-#include <sendlaterinfo.h>
 
 SendLaterUtilTest::SendLaterUtilTest(QObject *parent)
     : QObject(parent)

agents/sendlateragent/sendlateragent.cpp

@@ -9,7 +9,6 @@
 #include "sendlateragentadaptor.h"
 #include "sendlateragentsettings.h"
 #include "sendlaterconfiguredialog.h"
-#include "sendlaterinfo.h"
 #include "sendlatermanager.h"
 #include "sendlaterremovemessagejob.h"
 #include "sendlaterutil.h"
@@ -23,6 +22,7 @@
 #include <Akonadi/ServerManager>
 #include <Akonadi/Session>
 #include <KMime/Message>
+#include <MessageComposer/SendLaterInfo>
 #include <QDBusConnection>
 
 #include <KWindowSystem>

agents/sendlateragent/sendlateragent.h

@@ -8,9 +8,7 @@
 
 #include <Akonadi/AgentBase>
 
-#include "sendlaterdialog.h"
 #include <MessageComposer/SendLaterInfo>
-#include <sendlaterinfo.h>
 
 class SendLaterManager;
 

agents/sendlateragent/sendlaterconfigurewidget.cpp

@@ -5,7 +5,6 @@
 */
 
 #include "sendlaterconfigurewidget.h"
-#include "sendlaterdialog.h"
 #include "sendlaterutil.h"
 
 #include <MessageComposer/SendLaterDialog>

agents/sendlateragent/tests/sendlaterinfo_gui.cpp

@@ -8,7 +8,6 @@
 #include <QCommandLineParser>
 #include <QStandardPaths>
 
-#include "sendlaterdialog.h"
 #include <MessageComposer/SendLaterDialog>
 
 int main(int argc, char **argv)

src/autotests/kmcomposerwintest.cpp

@@ -5,8 +5,8 @@
 */
 
 #include "kmcomposerwintest.h"
-#include "composer.h"
 #include "kmkernel.h"
+#include <messagecomposer/composer.h>
 
 #include <KIdentityManagement/Identity>
 #include <KIdentityManagement/IdentityCombo>

src/collectionpage/collectiontemplatespage.cpp

@@ -7,11 +7,11 @@
 #include "collectiontemplatespage.h"
 #include <MailCommon/CollectionTemplatesWidget>
 
-#include "templatesconfiguration_kfg.h"
 #include <Akonadi/Collection>
 #include <MailCommon/FolderSettings>
 #include <MailCommon/MailKernel>
 #include <TemplateParser/TemplatesConfiguration>
+#include <templateparser/templatesconfiguration_kfg.h>
 
 #include <KLocalizedString>
 

src/configuredialog/configureappearancepage.cpp

@@ -9,13 +9,13 @@
 using namespace PimCommon::ConfigureImmutableWidgetUtils;
 #include "configuredialog/colorlistbox.h"
 #include "kmkernel.h"
-#include "messagelistsettings.h"
 #include <Libkdepim/LineEditCatchReturnKey>
 #include <MailCommon/TagWidget>
 #include <MessageList/AggregationComboBox>
 #include <MessageList/AggregationConfigButton>
 #include <MessageList/ThemeComboBox>
 #include <MessageList/ThemeConfigButton>
+#include <messagelist/messagelistsettings.h>
 
 #include "util.h"
 #include <MailCommon/FolderTreeWidget>

src/configuredialog/configurecomposerpage.cpp

@@ -10,10 +10,8 @@ using namespace PimCommon::ConfigureImmutableWidgetUtils;
 #include "kmkernel.h"
 
 #include "configuredialog/configuredialoglistview.h"
-#include "globalsettings_templateparser.h"
 #include "kmmainwidget.h"
 #include "settings/kmailsettings.h"
-#include "templatesconfiguration_kfg.h"
 #include <MessageComposer/ImageScalingWidget>
 #include <MessageComposer/MessageComposerSettings>
 #include <MessageCore/MessageCoreSettings>
@@ -21,6 +19,8 @@ using namespace PimCommon::ConfigureImmutableWidgetUtils;
 #include <PimCommon/SimpleStringListEditor>
 #include <TemplateParser/CustomTemplates>
 #include <TemplateParser/TemplatesConfiguration>
+#include <templateparser/globalsettings_templateparser.h>
+#include <templateparser/templatesconfiguration_kfg.h>
 
 #include <KLDAP/LdapClientSearch>
 #include <PimCommonAkonadi/CompletionOrderEditor>

src/editor/composer.cpp

@@ -4,4 +4,4 @@
 
   SPDX-License-Identifier: GPL-2.0-or-later
 */
-#include "composer.h"
+#include <messagecomposer/composer.h>

src/editor/kmcomposercreatenewcomposerjob.cpp

@@ -5,9 +5,9 @@
 */
 
 #include "kmcomposercreatenewcomposerjob.h"
-#include "composer.h"
 #include "editor/kmcomposerwin.h"
 #include "kmkernel.h"
+#include <messagecomposer/composer.h>
 
 #include <MessageComposer/MessageHelper>
 #include <TemplateParser/TemplateParserJob>

src/editor/kmcomposerupdatetemplatejob.cpp

@@ -5,9 +5,9 @@
 */
 
 #include "kmcomposerupdatetemplatejob.h"
-#include "composer.h"
 #include "editor/kmcomposerwin.h"
 #include "kmkernel.h"
+#include <messagecomposer/composer.h>
 
 #include <MessageComposer/MessageHelper>
 #include <TemplateParser/TemplateParserJob>

src/editor/kmcomposerwin.cpp

@@ -41,7 +41,6 @@
 #include "kmmainwin.h"
 #include "mailcomposeradaptor.h" // TODO port all D-Bus stuff...
 #include "settings/kmailsettings.h"
-#include "templatesconfiguration_kfg.h"
 #include "undosend/undosendmanager.h"
 #include "util.h"
 #include "validatesendmailshortcut.h"
@@ -49,6 +48,7 @@
 #include "warningwidgets/externaleditorwarning.h"
 #include "widgets/cryptostateindicatorwidget.h"
 #include "widgets/kactionmenutransport.h"
+#include <templateparser/templatesconfiguration_kfg.h>
 
 #include <Akonadi/ChangeRecorder>
 #include <Akonadi/Contact/ContactGroupExpandJob>

src/identity/identitydialog.cpp

@@ -30,11 +30,11 @@
 #include <MailCommon/MailKernel>
 
 #include "job/addressvalidationjob.h"
-#include "templatesconfiguration_kfg.h"
 #include <MessageComposer/Kleo_Util>
 #include <MessageCore/StringUtil>
 #include <Sonnet/DictionaryComboBox>
 #include <TemplateParser/TemplatesConfiguration>
+#include <templateparser/templatesconfiguration_kfg.h>
 // other kdepim headers:
 #include <KIdentityManagement/Identity>
 #include <KIdentityManagement/SignatureConfigurator>

src/job/composenewmessagejob.cpp

@@ -5,9 +5,9 @@
 */
 
 #include "composenewmessagejob.h"
-#include "composer.h"
 #include "editor/kmcomposerwin.h"
 #include "kmkernel.h"
+#include <messagecomposer/composer.h>
 
 #include <KMime/Message>
 #include <MessageComposer/MessageHelper>

src/job/createforwardmessagejob.cpp

@@ -6,11 +6,11 @@
 
 #include "createforwardmessagejob.h"
 #include "../util.h"
-#include "composer.h"
 #include "editor/kmcomposerwin.h"
 #include "kmkernel.h"
 #include <KEmailAddress>
 #include <MailCommon/MailUtil>
+#include <messagecomposer/composer.h>
 
 CreateForwardMessageJob::CreateForwardMessageJob(QObject *parent)
     : QObject(parent)

src/job/createreplymessagejob.cpp

@@ -7,11 +7,11 @@
 #include "createreplymessagejob.h"
 
 #include "../util.h"
-#include "composer.h"
 #include "editor/kmcomposerwin.h"
 #include "kmkernel.h"
 #include <KEmailAddress>
 #include <MailCommon/MailUtil>
+#include <messagecomposer/composer.h>
 
 CreateReplyMessageJob::CreateReplyMessageJob(QObject *parent)
     : QObject(parent)

src/job/fillcomposerjob.cpp

@@ -5,10 +5,10 @@
 */
 
 #include "fillcomposerjob.h"
-#include "composer.h"
 #include "editor/kmcomposerwin.h"
 #include "kmkernel.h"
 #include <MessageViewer/MessageViewerSettings>
+#include <messagecomposer/composer.h>
 
 #include <MessageComposer/MessageHelper>
 #include <TemplateParser/TemplateParserJob>

src/job/handleclickedurljob.cpp

@@ -5,7 +5,6 @@
 */
 
 #include "handleclickedurljob.h"
-#include "composer.h"
 #include "editor/kmcomposerwin.h"
 #include "kmail_debug.h"
 #include "kmkernel.h"
@@ -13,6 +12,7 @@
 #include <MessageComposer/MessageHelper>
 #include <MessageCore/StringUtil>
 #include <TemplateParser/TemplateParserJob>
+#include <messagecomposer/composer.h>
 
 HandleClickedUrlJob::HandleClickedUrlJob(QObject *parent)
     : QObject(parent)

src/job/newmessagejob.cpp

@@ -5,9 +5,9 @@
 */
 
 #include "newmessagejob.h"
-#include "composer.h"
 #include "editor/kmcomposerwin.h"
 #include "kmkernel.h"
+#include <messagecomposer/composer.h>
 
 #include <KMime/Message>
 #include <MessageComposer/MessageHelper>