Fix header and IWYU

Author: CrSjimo

src/plugins/achievement/internal/AchievementPlugin.cpp

@@ -1,6 +1,7 @@
 #include "AchievementPlugin.h"
 
 #include <QQmlComponent>
+#include <QSettings>
 
 #include <CoreApi/runtimeinterface.h>
 #include <CoreApi/translationmanager.h>

src/plugins/coreplugin/core/CoreInterface.cpp

@@ -19,9 +19,12 @@
 #include <QScreen>
 #include <QStandardPaths>
 #include <QTimer>
+#include <QSettings>
 
 #include <QtQuickTemplates2/private/qquickicon_p.h>
 
+#include <QAKCore/actionregistry.h>
+
 #include <CoreApi/filelocker.h>
 #include <CoreApi/private/coreinterfacebase_p.h>
 #include <CoreApi/recentfilecollection.h>
@@ -75,8 +78,7 @@ namespace Core {
         return static_cast<CoreInterface *>(CoreInterfaceBase::instance());
     }
     QAK::ActionRegistry *CoreInterface::actionRegistry() {
-        if (!instance())
-            return nullptr;
+        Q_ASSERT(instance());
         return instance()->d_func()->actionRegistry;
     }
 

src/plugins/coreplugin/core/CoreInterface.h

@@ -1,19 +1,20 @@
 #ifndef DIFFSCOPE_COREPLUGIN_COREINTERFACE_H
 #define DIFFSCOPE_COREPLUGIN_COREINTERFACE_H
 
-#include <qqmlintegration.h>
-
 #include <QObject>
-#include <QSettings>
+#include <qqmlintegration.h>
 
 #include <CoreApi/coreinterfacebase.h>
 
-#include <QAKCore/actionregistry.h>
-
 #include <coreplugin/coreglobal.h>
 
 class QQmlEngine;
 class QJSEngine;
+class QWindow;
+
+namespace QAK {
+    class ActionRegistry;
+}
 
 namespace Core {
 

src/plugins/coreplugin/internal/CorePlugin.cpp

@@ -34,6 +34,7 @@
 #include <extensionsystem/pluginmanager.h>
 #include <extensionsystem/pluginspec.h>
 
+#include <QAKCore/actionregistry.h>
 #include <QAKQuick/actioniconimageprovider.h>
 
 #include <SVSCraftQuick/Theme.h>

src/plugins/coreplugin/internal/actions/FindActionsModel.cpp

@@ -5,6 +5,9 @@
 
 #include <QKeySequence>
 #include <QPointer>
+#include <QSettings>
+
+#include <QAKCore/actionregistry.h>
 
 #include <SVSCraftCore/SVSCraftNamespace.h>
 

src/plugins/coreplugin/internal/addon/ViewVisibilityAddOn.cpp

@@ -2,6 +2,7 @@
 
 #include <QLoggingCategory>
 #include <QQmlComponent>
+#include <QSettings>
 
 #include <CoreApi/runtimeinterface.h>
 

src/plugins/coreplugin/windows/ActionWindowInterfaceBase.cpp

@@ -8,6 +8,7 @@
 
 #include <CoreApi/runtimeinterface.h>
 
+#include <QAKCore/actionregistry.h>
 #include <QAKQuick/quickactioncontext.h>
 
 #include <coreplugin/CoreInterface.h>

src/plugins/maintenance/internal/MaintenancePlugin.cpp

@@ -8,6 +8,8 @@
 
 #include <extensionsystem/pluginspec.h>
 
+#include <QAKCore/actionregistry.h>
+
 #include <coreplugin/CoreInterface.h>
 #include <coreplugin/HomeWindowInterface.h>
 #include <coreplugin/ProjectWindowInterface.h>

src/plugins/welcomewizard/internal/WelcomeWizardPlugin.cpp

@@ -7,6 +7,8 @@
 
 #include <extensionsystem/pluginspec.h>
 
+#include <QAKCore/actionregistry.h>
+
 #include <coreplugin/CoreInterface.h>
 #include <coreplugin/HomeWindowInterface.h>
 #include <coreplugin/ProjectWindowInterface.h>