Merge pull request #5512 from vitor-k/untangle-includes

Forward declare some classes and remove some unnecessary includes

src/citra_qt/camera/camera_util.cpp

@@ -3,11 +3,10 @@
 // Refer to the license.txt file included.
 
 #include <algorithm>
+#include <array>
 #include <cstring>
 #include <QImage>
 #include "citra_qt/camera/camera_util.h"
-#include "core/frontend/camera/factory.h"
-#include "core/frontend/camera/interface.h"
 
 namespace CameraUtil {
 

src/citra_qt/camera/qt_camera_base.cpp

@@ -5,6 +5,8 @@
 #include <QMessageBox>
 #include "citra_qt/camera/camera_util.h"
 #include "citra_qt/camera/qt_camera_base.h"
+#include "common/logging/log.h"
+#include "core/hle/service/cam/cam.h"
 
 namespace Camera {
 

src/citra_qt/camera/still_image_camera.cpp

@@ -7,6 +7,7 @@
 #include <QMessageBox>
 #include <QThread>
 #include "citra_qt/camera/still_image_camera.h"
+#include "common/logging/log.h"
 
 namespace Camera {
 

src/citra_qt/configuration/configure_camera.cpp

@@ -2,7 +2,6 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include <memory>
 #include <QCameraInfo>
 #include <QDirIterator>
 #include <QFileDialog>
@@ -12,6 +11,9 @@
 #include "citra_qt/configuration/configure_camera.h"
 #include "citra_qt/uisettings.h"
 #include "core/core.h"
+#include "core/frontend/camera/factory.h"
+#include "core/frontend/camera/interface.h"
+#include "core/hle/service/cam/cam.h"
 #include "core/settings.h"
 #include "ui_configure_camera.h"
 

src/citra_qt/configuration/configure_camera.h

@@ -4,8 +4,13 @@
 
 #pragma once
 
-#include "core/frontend/camera/factory.h"
-#include "core/frontend/camera/interface.h"
+#include <array>
+#include <memory>
+#include <string>
+
+namespace Camera {
+class CameraInterface;
+}
 
 namespace Ui {
 class ConfigureCamera;

src/citra_qt/configuration/configure_motion_touch.cpp

@@ -10,6 +10,7 @@
 #include <QVBoxLayout>
 #include "citra_qt/configuration/configure_motion_touch.h"
 #include "citra_qt/configuration/configure_touch_from_button.h"
+#include "common/logging/log.h"
 #include "input_common/main.h"
 #include "ui_configure_motion_touch.h"
 

src/citra_qt/debugger/profiler.cpp

@@ -7,6 +7,7 @@
 #include <QMouseEvent>
 #include <QPainter>
 #include <QString>
+#include <QTimer>
 #include "citra_qt/debugger/profiler.h"
 #include "citra_qt/util/util.h"
 #include "common/common_types.h"

src/citra_qt/debugger/profiler.h

@@ -4,9 +4,7 @@
 
 #pragma once
 
-#include <QAbstractItemModel>
-#include <QDockWidget>
-#include <QTimer>
+#include <QWidget>
 #include "common/microprofile.h"
 
 class MicroProfileDialog : public QWidget {

src/citra_qt/main.cpp

@@ -9,6 +9,7 @@
 #include <QDesktopWidget>
 #include <QFileDialog>
 #include <QFutureWatcher>
+#include <QLabel>
 #include <QMessageBox>
 #include <QOpenGLFunctions_3_3_Core>
 #include <QSysInfo>

src/citra_qt/main.h

@@ -6,7 +6,6 @@
 
 #include <array>
 #include <memory>
-#include <QLabel>
 #include <QMainWindow>
 #include <QTimer>
 #include <QTranslator>
@@ -40,6 +39,7 @@ class MultiplayerState;
 class ProfilerWidget;
 template <typename>
 class QFutureWatcher;
+class QLabel;
 class QProgressBar;
 class RegistersWidget;
 class Updater;