From 36839dad2628178ee9c0a99aeaf209d881fd2e81 Mon Sep 17 00:00:00 2001
From: Elias Steurer <i@kelteseth.net>
Date: Sat, 22 Oct 2022 16:42:12 +0200
Subject: [PATCH] Sort includes

---
 ScreenPlay/inc/public/ScreenPlay/create.h              | 4 +---
 ScreenPlay/inc/public/ScreenPlay/createimportvideo.h   | 3 ++-
 ScreenPlay/inc/public/ScreenPlay/globalvariables.h     | 2 +-
 ScreenPlay/inc/public/ScreenPlay/screenplaymanager.h   | 2 --
 ScreenPlay/inc/public/ScreenPlay/screenplaywallpaper.h | 1 -
 ScreenPlay/inc/public/ScreenPlay/settings.h            | 3 ---
 ScreenPlay/inc/public/ScreenPlay/util.h                | 4 +++-
 ScreenPlay/src/create.cpp                              | 3 +++
 ScreenPlay/src/screenplaywallpaper.cpp                 | 2 ++
 ScreenPlay/src/settings.cpp                            | 5 +++++
 ScreenPlaySDK/inc/public/ScreenPlaySDK/screenplaysdk.h | 1 -
 ScreenPlayUtil/inc/public/ScreenPlayUtil/util.h        | 2 +-
 ScreenPlayWidget/src/widgetwindow.h                    | 2 +-
 13 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/ScreenPlay/inc/public/ScreenPlay/create.h b/ScreenPlay/inc/public/ScreenPlay/create.h
index e43560d4..1e1e16b7 100644
--- a/ScreenPlay/inc/public/ScreenPlay/create.h
+++ b/ScreenPlay/inc/public/ScreenPlay/create.h
@@ -56,10 +56,8 @@
 
 #include <memory>
 
-#include "ScreenPlay/createimportvideo.h"
 #include "ScreenPlay/globalvariables.h"
-#include "ScreenPlay/util.h"
-#include "ScreenPlayUtil/util.h"
+#include "ScreenPlay/createimportvideo.h"
 
 namespace ScreenPlay {
 
diff --git a/ScreenPlay/inc/public/ScreenPlay/createimportvideo.h b/ScreenPlay/inc/public/ScreenPlay/createimportvideo.h
index 667acaa2..4fe0b52d 100644
--- a/ScreenPlay/inc/public/ScreenPlay/createimportvideo.h
+++ b/ScreenPlay/inc/public/ScreenPlay/createimportvideo.h
@@ -48,9 +48,10 @@
 #include <QScopeGuard>
 #include <QString>
 #include <QtMath>
+#include <QQmlEngine>
+#include <QThread>
 
 #include "ScreenPlay/createimportstates.h"
-#include "ScreenPlay/util.h"
 
 namespace ScreenPlay {
 
diff --git a/ScreenPlay/inc/public/ScreenPlay/globalvariables.h b/ScreenPlay/inc/public/ScreenPlay/globalvariables.h
index d9e855a0..92c8300f 100644
--- a/ScreenPlay/inc/public/ScreenPlay/globalvariables.h
+++ b/ScreenPlay/inc/public/ScreenPlay/globalvariables.h
@@ -41,7 +41,7 @@
 #include <QUrl>
 #include <QVersionNumber>
 
-#include "ScreenPlayUtil/contenttypes.h"
+#include <QQmlEngine>
 
 namespace ScreenPlay {
 
diff --git a/ScreenPlay/inc/public/ScreenPlay/screenplaymanager.h b/ScreenPlay/inc/public/ScreenPlay/screenplaymanager.h
index 6e515043..319a622d 100644
--- a/ScreenPlay/inc/public/ScreenPlay/screenplaymanager.h
+++ b/ScreenPlay/inc/public/ScreenPlay/screenplaymanager.h
@@ -49,8 +49,6 @@
 #include "screenplaywallpaper.h"
 #include "screenplaywidget.h"
 #include "settings.h"
-#include "util.h"
-
 #include <memory>
 #include <optional>
 
diff --git a/ScreenPlay/inc/public/ScreenPlay/screenplaywallpaper.h b/ScreenPlay/inc/public/ScreenPlay/screenplaywallpaper.h
index f4647067..d292ec53 100644
--- a/ScreenPlay/inc/public/ScreenPlay/screenplaywallpaper.h
+++ b/ScreenPlay/inc/public/ScreenPlay/screenplaywallpaper.h
@@ -45,7 +45,6 @@
 #include "ScreenPlay/projectsettingslistmodel.h"
 #include "ScreenPlay/sdkconnection.h"
 #include "ScreenPlay/settings.h"
-#include "ScreenPlay/util.h"
 
 namespace ScreenPlay {
 
diff --git a/ScreenPlay/inc/public/ScreenPlay/settings.h b/ScreenPlay/inc/public/ScreenPlay/settings.h
index d64cf0bc..f6eeb4d5 100644
--- a/ScreenPlay/inc/public/ScreenPlay/settings.h
+++ b/ScreenPlay/inc/public/ScreenPlay/settings.h
@@ -67,9 +67,6 @@
 #include <memory>
 #include <optional>
 
-#ifdef Q_OS_WIN
-#include <qt_windows.h>
-#endif
 
 namespace ScreenPlay {
 class ActiveProfile;
diff --git a/ScreenPlay/inc/public/ScreenPlay/util.h b/ScreenPlay/inc/public/ScreenPlay/util.h
index 59850a4e..d87e23a5 100644
--- a/ScreenPlay/inc/public/ScreenPlay/util.h
+++ b/ScreenPlay/inc/public/ScreenPlay/util.h
@@ -34,6 +34,7 @@
 
 #pragma once
 
+#include <QMetaType>
 #include <QApplication>
 #include <QClipboard>
 #include <QCoreApplication>
@@ -51,9 +52,10 @@
 #include <QTextStream>
 #include <QVersionNumber>
 #include <QtConcurrent/QtConcurrent>
-#include <qqml.h>
+#include <QQmlEngine>
 
 #include "ScreenPlay/globalvariables.h"
+#include "ScreenPlayUtil/contenttypes.h"
 #include "ScreenPlayUtil/util.h"
 
 #include "qarchive_enums.hpp"
diff --git a/ScreenPlay/src/create.cpp b/ScreenPlay/src/create.cpp
index d48cef02..bddeb605 100644
--- a/ScreenPlay/src/create.cpp
+++ b/ScreenPlay/src/create.cpp
@@ -1,4 +1,7 @@
 #include "ScreenPlay/create.h"
+#include "ScreenPlay/util.h"
+#include "ScreenPlayUtil/util.h"
+
 
 namespace ScreenPlay {
 
diff --git a/ScreenPlay/src/screenplaywallpaper.cpp b/ScreenPlay/src/screenplaywallpaper.cpp
index fa4879a5..75a58a8a 100644
--- a/ScreenPlay/src/screenplaywallpaper.cpp
+++ b/ScreenPlay/src/screenplaywallpaper.cpp
@@ -1,5 +1,7 @@
 #include "ScreenPlay/screenplaywallpaper.h"
 
+#include "util.h"
+
 namespace ScreenPlay {
 
 /*!
diff --git a/ScreenPlay/src/settings.cpp b/ScreenPlay/src/settings.cpp
index 8b8e8bb1..f07334b1 100644
--- a/ScreenPlay/src/settings.cpp
+++ b/ScreenPlay/src/settings.cpp
@@ -3,6 +3,11 @@
 #include "ScreenPlayUtil/util.h"
 #include <QFileInfo>
 
+
+#ifdef Q_OS_WIN
+#include <qt_windows.h>
+#endif
+
 namespace ScreenPlay {
 
 /*!
diff --git a/ScreenPlaySDK/inc/public/ScreenPlaySDK/screenplaysdk.h b/ScreenPlaySDK/inc/public/ScreenPlaySDK/screenplaysdk.h
index 6a66578b..db72753a 100644
--- a/ScreenPlaySDK/inc/public/ScreenPlaySDK/screenplaysdk.h
+++ b/ScreenPlaySDK/inc/public/ScreenPlaySDK/screenplaysdk.h
@@ -51,7 +51,6 @@
 
 class ScreenPlaySDK : public QObject {
     Q_OBJECT
-    QML_UNCREATABLE("")
 
 public:
     ScreenPlaySDK(const QString& appID, const QString& type);
diff --git a/ScreenPlayUtil/inc/public/ScreenPlayUtil/util.h b/ScreenPlayUtil/inc/public/ScreenPlayUtil/util.h
index 927f939e..8f0458b0 100644
--- a/ScreenPlayUtil/inc/public/ScreenPlayUtil/util.h
+++ b/ScreenPlayUtil/inc/public/ScreenPlayUtil/util.h
@@ -39,7 +39,6 @@
 #if defined(Q_OS_WIN)
 // Must be first!
 #include <qt_windows.h>
-
 #include "WinUser.h"
 #include <ShellScalingApi.h>
 #endif
@@ -48,6 +47,7 @@
 #include <QJsonArray>
 #include <QJsonObject>
 #include <QMetaEnum>
+#include <QMetaType>
 #include <QString>
 #include <QVersionNumber>
 #include <cmath>
diff --git a/ScreenPlayWidget/src/widgetwindow.h b/ScreenPlayWidget/src/widgetwindow.h
index 048a2e7b..6a831a3d 100644
--- a/ScreenPlayWidget/src/widgetwindow.h
+++ b/ScreenPlayWidget/src/widgetwindow.h
@@ -51,9 +51,9 @@
 #include <QWindow>
 #include <QtQuick/QQuickView>
 #include <QtQuick/QQuickWindow>
+#include <QFileSystemWatcher>
 
 #ifdef Q_OS_WIN
-#include <QFileSystemWatcher>
 #include <qt_windows.h>
 #endif