From b10a817f7ec3e8e50a600679b8a1f435f39eefb6 Mon Sep 17 00:00:00 2001
From: psi29a <psi29a@gmail.com>
Date: Tue, 4 May 2021 21:07:59 +0000
Subject: [PATCH] Merge branch 'useuless_launcher' into 'master'

Remove some useless includes from the launcher

See merge request OpenMW/openmw!775

(cherry picked from commit a84bd643b334eb6ac715681c497184ac22212ced)

d3fff8cf Remove some useless includes from the launcher
---
 apps/launcher/advancedpage.cpp           | 2 --
 apps/launcher/advancedpage.hpp           | 1 -
 apps/launcher/datafilespage.cpp          | 2 --
 apps/launcher/datafilespage.hpp          | 1 -
 apps/launcher/graphicspage.hpp           | 2 --
 apps/launcher/main.cpp                   | 2 --
 apps/launcher/maindialog.cpp             | 3 ---
 apps/launcher/maindialog.hpp             | 2 --
 apps/launcher/playpage.hpp               | 2 --
 apps/launcher/sdlinit.cpp                | 1 -
 apps/launcher/settingspage.cpp           | 1 -
 apps/launcher/settingspage.hpp           | 3 ---
 apps/launcher/utils/cellnameloader.hpp   | 1 -
 apps/launcher/utils/lineedit.hpp         | 1 -
 apps/launcher/utils/profilescombobox.cpp | 1 -
 15 files changed, 25 deletions(-)

diff --git a/apps/launcher/advancedpage.cpp b/apps/launcher/advancedpage.cpp
index 91e3842fa9..4ba7322345 100644
--- a/apps/launcher/advancedpage.cpp
+++ b/apps/launcher/advancedpage.cpp
@@ -3,10 +3,8 @@
 #include <array>
 
 #include <components/config/gamesettings.hpp>
-#include <components/config/launchersettings.hpp>
 #include <QFileDialog>
 #include <QCompleter>
-#include <QProxyStyle>
 #include <QString>
 #include <components/contentselector/view/contentselector.hpp>
 #include <components/contentselector/model/esmfile.hpp>
diff --git a/apps/launcher/advancedpage.hpp b/apps/launcher/advancedpage.hpp
index a373fae430..93b818dbb6 100644
--- a/apps/launcher/advancedpage.hpp
+++ b/apps/launcher/advancedpage.hpp
@@ -1,7 +1,6 @@
 #ifndef ADVANCEDPAGE_H
 #define ADVANCEDPAGE_H
 
-#include <QWidget>
 #include <QCompleter>
 #include <QStringListModel>
 
diff --git a/apps/launcher/datafilespage.cpp b/apps/launcher/datafilespage.cpp
index 81544b0945..956483a3f2 100644
--- a/apps/launcher/datafilespage.cpp
+++ b/apps/launcher/datafilespage.cpp
@@ -4,7 +4,6 @@
 
 #include <QPushButton>
 #include <QMessageBox>
-#include <QCheckBox>
 #include <QMenu>
 #include <QSortFilterProxyModel>
 #include <thread>
@@ -14,7 +13,6 @@
 #include <components/files/configurationmanager.hpp>
 
 #include <components/contentselector/model/esmfile.hpp>
-#include <components/contentselector/model/naturalsort.hpp>
 #include <components/contentselector/view/contentselector.hpp>
 
 #include <components/config/gamesettings.hpp>
diff --git a/apps/launcher/datafilespage.hpp b/apps/launcher/datafilespage.hpp
index 3d200e6d2d..5a7a6dc6e6 100644
--- a/apps/launcher/datafilespage.hpp
+++ b/apps/launcher/datafilespage.hpp
@@ -6,7 +6,6 @@
 
 
 #include <QDir>
-#include <QFile>
 #include <QStringList>
 
 class QSortFilterProxyModel;
diff --git a/apps/launcher/graphicspage.hpp b/apps/launcher/graphicspage.hpp
index 35f7115003..7801e6475b 100644
--- a/apps/launcher/graphicspage.hpp
+++ b/apps/launcher/graphicspage.hpp
@@ -1,8 +1,6 @@
 #ifndef GRAPHICSPAGE_H
 #define GRAPHICSPAGE_H
 
-#include <QWidget>
-
 #include "ui_graphicspage.h"
 
 #include <components/settings/settings.hpp>
diff --git a/apps/launcher/main.cpp b/apps/launcher/main.cpp
index f15abafce0..9c9acb4a17 100644
--- a/apps/launcher/main.cpp
+++ b/apps/launcher/main.cpp
@@ -1,10 +1,8 @@
 #include <iostream>
 
-#include <QApplication>
 #include <QTranslator>
 #include <QTextCodec>
 #include <QDir>
-#include <QDebug>
 
 #ifdef MAC_OS_X_VERSION_MIN_REQUIRED
 #undef MAC_OS_X_VERSION_MIN_REQUIRED
diff --git a/apps/launcher/maindialog.cpp b/apps/launcher/maindialog.cpp
index 215258bcd2..6924153090 100644
--- a/apps/launcher/maindialog.cpp
+++ b/apps/launcher/maindialog.cpp
@@ -5,15 +5,12 @@
 
 #include <QDate>
 #include <QMessageBox>
-#include <QPushButton>
 #include <QFontDatabase>
 #include <QInputDialog>
 #include <QFileDialog>
 #include <QCloseEvent>
 #include <QTextCodec>
 
-#include <QDebug>
-
 #include "playpage.hpp"
 #include "graphicspage.hpp"
 #include "datafilespage.hpp"
diff --git a/apps/launcher/maindialog.hpp b/apps/launcher/maindialog.hpp
index de74233305..80e014e285 100644
--- a/apps/launcher/maindialog.hpp
+++ b/apps/launcher/maindialog.hpp
@@ -1,8 +1,6 @@
 #ifndef MAINDIALOG_H
 #define MAINDIALOG_H
 
-#include <QMainWindow>
-#include <QProcess>
 
 #ifndef Q_MOC_RUN
 #include <components/files/configurationmanager.hpp>
diff --git a/apps/launcher/playpage.hpp b/apps/launcher/playpage.hpp
index b0bd3ee277..8f414dc6aa 100644
--- a/apps/launcher/playpage.hpp
+++ b/apps/launcher/playpage.hpp
@@ -1,8 +1,6 @@
 #ifndef PLAYPAGE_H
 #define PLAYPAGE_H
 
-#include <QWidget>
-
 #include "ui_playpage.h"
 
 class QComboBox;
diff --git a/apps/launcher/sdlinit.cpp b/apps/launcher/sdlinit.cpp
index 1fe1fd4c2f..4717fb2818 100644
--- a/apps/launcher/sdlinit.cpp
+++ b/apps/launcher/sdlinit.cpp
@@ -1,7 +1,6 @@
 #include <signal.h>
 
 #include <SDL.h>
-#include <SDL_video.h>
 
 bool initSDL()
 {
diff --git a/apps/launcher/settingspage.cpp b/apps/launcher/settingspage.cpp
index 59d7cfd25b..ca7fd028a7 100644
--- a/apps/launcher/settingspage.cpp
+++ b/apps/launcher/settingspage.cpp
@@ -2,7 +2,6 @@
 
 #include <QFileDialog>
 #include <QMessageBox>
-#include <QDebug>
 #include <QDir>
 
 #include <components/files/configurationmanager.hpp>
diff --git a/apps/launcher/settingspage.hpp b/apps/launcher/settingspage.hpp
index 97b099dd62..df7c0e8eb5 100644
--- a/apps/launcher/settingspage.hpp
+++ b/apps/launcher/settingspage.hpp
@@ -1,9 +1,6 @@
 #ifndef SETTINGSPAGE_HPP
 #define SETTINGSPAGE_HPP
 
-#include <QWidget>
-#include <QProcess>
-
 #include <components/process/processinvoker.hpp>
 
 #include "ui_settingspage.h"
diff --git a/apps/launcher/utils/cellnameloader.hpp b/apps/launcher/utils/cellnameloader.hpp
index c58d09226a..899ff75adb 100644
--- a/apps/launcher/utils/cellnameloader.hpp
+++ b/apps/launcher/utils/cellnameloader.hpp
@@ -1,7 +1,6 @@
 #ifndef OPENMW_CELLNAMELOADER_H
 #define OPENMW_CELLNAMELOADER_H
 
-#include <QComboBox>
 #include <QSet>
 #include <QString>
 
diff --git a/apps/launcher/utils/lineedit.hpp b/apps/launcher/utils/lineedit.hpp
index da28e858ce..89de39588a 100644
--- a/apps/launcher/utils/lineedit.hpp
+++ b/apps/launcher/utils/lineedit.hpp
@@ -11,7 +11,6 @@
 #define LINEEDIT_H
 
 #include <QLineEdit>
-#include <QStyle>
 #include <QStylePainter>
 #include <QToolButton>
 
diff --git a/apps/launcher/utils/profilescombobox.cpp b/apps/launcher/utils/profilescombobox.cpp
index 462c2ebc27..af349ddfff 100644
--- a/apps/launcher/utils/profilescombobox.cpp
+++ b/apps/launcher/utils/profilescombobox.cpp
@@ -1,5 +1,4 @@
 #include <QRegExpValidator>
-#include <QLineEdit>
 #include <QString>
 #include <QApplication>
 #include <QKeyEvent>