Fix includes

kmail/grammarplugins/grammalecte/tests/grammalectewidget.h

@@ -7,7 +7,7 @@
 #pragma once
 
 #include "grammalectegenerateconfigoptionjob.h"
-#include <PluginEditorGrammarCustomToolsViewInterface>
+#include <MessageComposer/PluginEditorGrammarCustomToolsViewInterface>
 #include <QWidget>
 class GrammalecteResultWidget;
 class QTextEdit;

kmail/grammarplugins/languagetool/tests/languagetoolwidget.h

@@ -6,7 +6,7 @@
 
 #pragma once
 
-#include <PluginEditorGrammarCustomToolsViewInterface>
+#include <MessageComposer/PluginEditorGrammarCustomToolsViewInterface>
 #include <QWidget>
 class QNetworkAccessManager;
 class LanguageToolResultWidget;

plugins/messageviewerheaderplugins/autotests/headerstylepluginmanagertest.cpp

@@ -5,9 +5,9 @@
 */
 
 #include "headerstylepluginmanagertest.h"
-#include "headerstylemenumanager.h"
 #include <KActionCollection>
 #include <QTest>
+#include <messageviewer/headerstylemenumanager.h>
 
 HeaderStylePluginManagerTest::HeaderStylePluginManagerTest(QObject *parent)
     : QObject(parent)

plugins/messageviewerheaderplugins/briefheaderstyleplugin/briefheaderstyle.h

@@ -10,8 +10,8 @@
 
 #pragma once
 
-#include "headerstyle_util.h"
 #include <MessageViewer/HeaderStyle>
+#include <messageviewer/headerstyle_util.h>
 namespace MessageViewer
 {
 class BriefHeaderStyle : public HeaderStyle

plugins/messageviewerheaderplugins/enterpriseheaderstyleplugin/enterpriseheaderstyle.h

@@ -7,7 +7,7 @@
 
 #include <MessageViewer/HeaderStyle>
 
-#include <headerstyle_util.h>
+#include <messageviewer/headerstyle_util.h>
 namespace MessageViewer
 {
 class EnterpriseHeaderStyle : public HeaderStyle

plugins/messageviewerheaderplugins/fancyheaderstyleplugin/fancyheaderstyle.cpp

@@ -5,7 +5,6 @@
 */
 
 #include "fancyheaderstyle.h"
-#include "messageviewer_debug.h"
 #include <MessageViewer/HeaderStyle_Util>
 
 #include <KTextToHTML>

plugins/messageviewerheaderplugins/fancyheaderstyleplugin/fancyheaderstyle.h

@@ -8,7 +8,7 @@
 
 #include <MessageViewer/HeaderStyle>
 
-#include <headerstyle_util.h>
+#include <messageviewer/headerstyle_util.h>
 namespace MessageViewer
 {
 class HeaderStyleUtil;

plugins/messageviewerplugins/autotests/eventedittest.cpp

@@ -7,7 +7,7 @@
 #include "eventedittest.h"
 #include "../createeventplugin/eventdatetimewidget.h"
 #include "../createeventplugin/eventedit.h"
-#include "globalsettings_messageviewer.h"
+#include <messageviewer/globalsettings_messageviewer.h>
 
 #include <Akonadi/Collection>
 #include <Akonadi/CollectionComboBox>

plugins/messageviewerplugins/autotests/noteedittest.cpp

@@ -6,11 +6,11 @@
 
 #include "noteedittest.h"
 #include "../createnoteplugin/noteedit.h"
-#include "globalsettings_messageviewer.h"
 #include <Akonadi/Collection>
 #include <Akonadi/CollectionComboBox>
 #include <Akonadi/EntityTreeModel>
 #include <KMime/KMimeMessage>
+#include <messageviewer/globalsettings_messageviewer.h>
 
 #include <QLineEdit>
 #include <QPushButton>

plugins/messageviewerplugins/autotests/todoedittest.cpp

@@ -6,7 +6,6 @@
 
 #include "todoedittest.h"
 #include "../createtodoplugin/todoedit.h"
-#include "globalsettings_messageviewer.h"
 #include <Akonadi/Collection>
 #include <Akonadi/CollectionComboBox>
 #include <Akonadi/EntityTreeModel>
@@ -14,6 +13,7 @@
 #include <QPushButton>
 #include <QStandardItemModel>
 #include <QTest>
+#include <messageviewer/globalsettings_messageviewer.h>
 #include <qtestkeyboard.h>
 #include <qtestmouse.h>
 

plugins/messageviewerplugins/createeventplugin/eventedit.cpp

@@ -7,9 +7,9 @@
 #include "eventedit.h"
 #include "createeventplugin_debug.h"
 #include "eventdatetimewidget.h"
-#include "globalsettings_messageviewer.h"
 #include <CalendarSupport/KCalPrefs>
 #include <CalendarSupport/Utils>
+#include <messageviewer/globalsettings_messageviewer.h>
 
 #include <KLocalizedString>
 #include <QDateTime>

plugins/messageviewerplugins/createnoteplugin/noteedit.cpp

@@ -6,9 +6,9 @@
 
 #include "noteedit.h"
 #include "createnoteplugin_debug.h"
-#include "globalsettings_messageviewer.h"
 #include <IncidenceEditor/IncidenceDialog>
 #include <IncidenceEditor/IncidenceDialogFactory>
+#include <messageviewer/globalsettings_messageviewer.h>
 
 #include <Akonadi/CollectionComboBox>
 

plugins/messageviewerplugins/createtodoplugin/todoedit.cpp

@@ -6,9 +6,9 @@
 
 #include "todoedit.h"
 #include "createtodoplugin_debug.h"
-#include "globalsettings_messageviewer.h"
 #include <CalendarSupport/KCalPrefs>
 #include <CalendarSupport/Utils>
+#include <messageviewer/globalsettings_messageviewer.h>
 
 #include <KLocalizedString>
 #include <QIcon>