Merge branch 'clean_qt_headers' into 'master'

Clean up Qt includes See merge request OpenMW/openmw!2027
3 years ago · aeed99ca2c
parent e466a812d8 8b9ed57348
commit aeed99ca2c
84 changed files with 57 additions and 184 deletions
--- a/apps/launcher/advancedpage.cpp
+++ b/apps/launcher/advancedpage.cpp
@ -2,16 +2,16 @@

 #include <array>
 #include <string>
+#include <cmath>

-#include <components/config/gamesettings.hpp>
 #include <QFileDialog>
 #include <QCompleter>
 #include <QString>
+
+#include <components/config/gamesettings.hpp>
 #include <components/contentselector/view/contentselector.hpp>
 #include <components/contentselector/model/esmfile.hpp>

-#include <cmath>
-
 #include "utils/openalutil.hpp"

 Launcher::AdvancedPage::AdvancedPage(Config::GameSettings &gameSettings, QWidget *parent)
--- a/apps/launcher/datafilespage.cpp
+++ b/apps/launcher/datafilespage.cpp
@ -2,14 +2,10 @@
 #include "maindialog.hpp"

 #include <QDebug>
-
 #include <QPushButton>
 #include <QMessageBox>
-#include <QMenu>
-#include <QSortFilterProxyModel>
 #include <QFileDialog>
-#include <QTreeView>
-#include <qnamespace.h>
+
 #include <thread>
 #include <mutex>
 #include <algorithm>
--- a/apps/launcher/graphicspage.cpp
+++ b/apps/launcher/graphicspage.cpp
@ -1,8 +1,6 @@
 #include "graphicspage.hpp"

-#include <QDesktopWidget>
 #include <QMessageBox>
-#include <QDir>
 #include <QScreen>

 #ifdef MAC_OS_X_VERSION_MIN_REQUIRED
--- a/apps/launcher/main.cpp
+++ b/apps/launcher/main.cpp
@ -1,7 +1,6 @@
 #include <iostream>

 #include <QTranslator>
-#include <QTextCodec>
 #include <QDir>

 #include <components/debug/debugging.hpp>
--- a/apps/launcher/maindialog.cpp
+++ b/apps/launcher/maindialog.cpp
@ -3,11 +3,10 @@
 #include <components/version/version.hpp>
 #include <components/misc/helpviewer.hpp>

-#include <QDate>
+#include <QTime>
 #include <QDir>
+#include <QDebug>
 #include <QMessageBox>
-#include <QFontDatabase>
-#include <QFileDialog>
 #include <QCloseEvent>
 #include <QTextCodec>

--- a/apps/launcher/settingspage.cpp
+++ b/apps/launcher/settingspage.cpp
@ -2,6 +2,7 @@

 #include <QFileDialog>
 #include <QMessageBox>
+#include <QDebug>
 #include <QDir>

 #include "utils/textinputdialog.hpp"
--- a/apps/launcher/utils/profilescombobox.cpp
+++ b/apps/launcher/utils/profilescombobox.cpp
@ -1,7 +1,5 @@
-#include <QRegExpValidator>
 #include <QString>
 #include <QApplication>
-#include <QKeyEvent>

 #include "profilescombobox.hpp"

--- a/apps/launcher/utils/profilescombobox.hpp
+++ b/apps/launcher/utils/profilescombobox.hpp
@ -4,7 +4,7 @@
 #include "components/contentselector/view/combobox.hpp"
 #include "lineedit.hpp"

-#include <QDebug>
+#include <QWidget>

 class QString;

--- a/apps/opencs/main.cpp
+++ b/apps/opencs/main.cpp
@ -5,7 +5,6 @@

 #include <QApplication>
 #include <QIcon>
-#include <QMetaType>

 #include <components/debug/debugging.hpp>
 #include <components/platform/platform.hpp>
--- a/apps/opencs/model/doc/document.hpp
+++ b/apps/opencs/model/doc/document.hpp
@ -7,7 +7,6 @@

 #include <QUndoStack>
 #include <QObject>
-#include <QTimer>

 #include <components/files/multidircollection.hpp>
 #include <components/to_utf8/to_utf8.hpp>
--- a/apps/opencs/model/doc/messages.hpp
+++ b/apps/opencs/model/doc/messages.hpp
@ -4,8 +4,6 @@
 #include <string>
 #include <vector>

-#include <QMetaType>
-
 #include "../world/universalid.hpp"

 namespace CSMDoc
--- a/apps/opencs/model/doc/operation.hpp
+++ b/apps/opencs/model/doc/operation.hpp
@ -6,7 +6,6 @@

 #include <QObject>
 #include <QTimer>
-#include <QStringList>

 #include "messages.hpp"

--- a/apps/opencs/model/doc/runner.cpp
+++ b/apps/opencs/model/doc/runner.cpp
@ -1,6 +1,5 @@
 #include "runner.hpp"

-#include <QApplication>
 #include <QDir>
 #include <QTemporaryFile>
 #include <QTextStream>
--- a/apps/opencs/model/prefs/boolsetting.cpp
+++ b/apps/opencs/model/prefs/boolsetting.cpp
@ -1,4 +1,3 @@
-
 #include "boolsetting.hpp"

 #include <QCheckBox>
--- a/apps/opencs/model/prefs/coloursetting.cpp
+++ b/apps/opencs/model/prefs/coloursetting.cpp
@ -1,4 +1,3 @@
-
 #include "coloursetting.hpp"

 #include <QLabel>
--- a/apps/opencs/model/prefs/shortcutmanager.cpp
+++ b/apps/opencs/model/prefs/shortcutmanager.cpp
@ -2,7 +2,6 @@

 #include <algorithm>

-#include <QApplication>
 #include <QStringList>

 #include "shortcut.hpp"
--- a/apps/opencs/model/tools/tools.cpp
+++ b/apps/opencs/model/tools/tools.cpp
@ -1,7 +1,5 @@
 #include "tools.hpp"

-#include <QThreadPool>
-
 #include "../doc/state.hpp"
 #include "../doc/operation.hpp"
 #include "../doc/document.hpp"
--- a/apps/opencs/model/world/columnbase.hpp
+++ b/apps/opencs/model/world/columnbase.hpp
@ -5,7 +5,6 @@
 #include <vector>
 #include <stdexcept>

-#include <Qt>
 #include <QVariant>

 #include "record.hpp"
--- a/apps/opencs/model/world/columnimp.cpp
+++ b/apps/opencs/model/world/columnimp.cpp
@ -1,7 +1,6 @@
 #include "columnimp.hpp"

 #include <stdexcept>
-#include <QVector>

 namespace CSMWorld
 {
--- a/apps/opencs/model/world/columnimp.hpp
+++ b/apps/opencs/model/world/columnimp.hpp
@ -6,7 +6,6 @@
 #include <sstream>
 #include <stdexcept>

-#include <QColor>
 #include <QVector>

 #include <components/esm3/loadbody.hpp>
--- a/apps/opencs/model/world/commands.hpp
+++ b/apps/opencs/model/world/commands.hpp
@ -16,7 +16,6 @@
 #include "universalid.hpp"
 #include "nestedtablewrapper.hpp"

-class QModelIndex;
 class QAbstractItemModel;

 namespace CSMWorld
--- a/apps/opencs/view/doc/filedialog.cpp
+++ b/apps/opencs/view/doc/filedialog.cpp
@ -2,9 +2,6 @@

 #include <QPushButton>
 #include <QDialogButtonBox>
-#include <QSortFilterProxyModel>
-#include <QRegExp>
-#include <QLabel>

 #include "components/contentselector/model/esmfile.hpp"
 #include "components/contentselector/view/contentselector.hpp"
--- a/apps/opencs/view/doc/loader.hpp
+++ b/apps/opencs/view/doc/loader.hpp
@ -5,7 +5,6 @@

 #include <QObject>
 #include <QWidget>
-#include <QSignalMapper>

 class QLabel;
 class QProgressBar;
--- a/apps/opencs/view/doc/newgame.cpp
+++ b/apps/opencs/view/doc/newgame.cpp
@ -1,7 +1,6 @@
 #include "newgame.hpp"

-#include <QApplication>
-#include <QDesktopWidget>
+#include <QGuiApplication>
 #include <QVBoxLayout>
 #include <QDialogButtonBox>
 #include <QPushButton>
--- a/apps/opencs/view/doc/operation.cpp
+++ b/apps/opencs/view/doc/operation.cpp
@ -4,7 +4,7 @@

 #include <QProgressBar>
 #include <QPushButton>
-#include <QVBoxLayout>
+#include <QHBoxLayout>

 #include "../../model/doc/document.hpp"

--- a/apps/opencs/view/doc/operations.cpp
+++ b/apps/opencs/view/doc/operations.cpp
@ -1,7 +1,6 @@
 #include "operations.hpp"

 #include <QVBoxLayout>
-#include <QHBoxLayout>

 #include "operation.hpp"

--- a/apps/opencs/view/doc/startup.cpp
+++ b/apps/opencs/view/doc/startup.cpp
@ -1,7 +1,6 @@
 #include "startup.hpp"

-#include <QApplication>
-#include <QDesktopWidget>
+#include <QGuiApplication>
 #include <QVBoxLayout>
 #include <QHBoxLayout>
 #include <QRect>
--- a/apps/opencs/view/doc/subview.cpp
+++ b/apps/opencs/view/doc/subview.cpp
@ -2,7 +2,6 @@

 #include "view.hpp"

-#include <QShortcut>
 #include <QEvent>
 #include <QKeyEvent>

--- a/apps/opencs/view/doc/view.cpp
+++ b/apps/opencs/view/doc/view.cpp
@ -6,13 +6,9 @@
 #include <QCloseEvent>
 #include <QMenuBar>
 #include <QMessageBox>
-#include <QMdiArea>
-#include <QDockWidget>
 #include <QApplication>
 #include <QDesktopWidget>
 #include <QScrollArea>
-#include <QHBoxLayout>
-#include <QDesktopWidget>
 #include <QScrollBar>
 #include <QScreen>

--- a/apps/opencs/view/doc/viewmanager.cpp
+++ b/apps/opencs/view/doc/viewmanager.cpp
@ -4,7 +4,6 @@
 #include <map>

 #include <QApplication>
-#include <QDesktopWidget>
 #include <QMessageBox>
 #include <QPushButton>

--- a/apps/opencs/view/filter/editwidget.cpp
+++ b/apps/opencs/view/filter/editwidget.cpp
@ -2,7 +2,6 @@

 #include <sstream>

-#include <QAbstractItemModel>
 #include <QAction>
 #include <QContextMenuEvent>
 #include <QMenu>
--- a/apps/opencs/view/filter/editwidget.hpp
+++ b/apps/opencs/view/filter/editwidget.hpp
@ -3,7 +3,6 @@

 #include <QLineEdit>
 #include <QPalette>
-#include <QtCore/qnamespace.h>

 #include "../../model/filter/parser.hpp"
 #include "../../model/filter/node.hpp"
--- a/apps/opencs/view/filter/filterbox.hpp
+++ b/apps/opencs/view/filter/filterbox.hpp
@ -4,7 +4,6 @@
 #include <vector>

 #include <QWidget>
-#include <QtCore/qnamespace.h>

 #include "../../model/filter/node.hpp"
 #include "../../model/world/universalid.hpp"
--- a/apps/opencs/view/filter/recordfilterbox.hpp
+++ b/apps/opencs/view/filter/recordfilterbox.hpp
@ -2,9 +2,6 @@
 #define CSV_FILTER_RECORDFILTERBOX_H

 #include <QWidget>
-#include <QtCore/qnamespace.h>
-
-#include <QHBoxLayout>

 #include "../../model/filter/node.hpp"

--- a/apps/opencs/view/prefs/dialogue.cpp
+++ b/apps/opencs/view/prefs/dialogue.cpp
@ -1,9 +1,7 @@
 #include "dialogue.hpp"

 #include <QApplication>
-#include <QDesktopWidget>
 #include <QSplitter>
-#include <QListWidget>
 #include <QStackedWidget>
 #include <QListWidgetItem>
 #include <QScreen>
--- a/apps/opencs/view/render/pagedworldspacewidget.cpp
+++ b/apps/opencs/view/render/pagedworldspacewidget.cpp
@ -4,8 +4,6 @@
 #include <sstream>
 #include <string>

-#include <QMouseEvent>
-#include <QApplication>

 #include <components/misc/constants.hpp>

--- a/apps/opencs/view/render/pathgridmode.cpp
+++ b/apps/opencs/view/render/pathgridmode.cpp
@ -1,6 +1,5 @@
 #include "pathgridmode.hpp"

-#include <QMenu>
 #include <QPoint>

 #include <components/sceneutil/pathgridutil.hpp>
--- a/apps/opencs/view/render/scenewidget.cpp
+++ b/apps/opencs/view/render/scenewidget.cpp
@ -3,9 +3,7 @@
 #include <chrono>
 #include <thread>

-#include <QEvent>
-#include <QResizeEvent>
-#include <QTimer>
+#include <QMouseEvent>
 #include <QLayout>

 #include <extern/osgQt/GraphicsWindowQt>
--- a/apps/opencs/view/render/terraintexturemode.cpp
+++ b/apps/opencs/view/render/terraintexturemode.cpp
@ -5,10 +5,7 @@

 #include <QWidget>
 #include <QIcon>
-#include <QEvent>
 #include <QDropEvent>
-#include <QDragEnterEvent>
-#include <QDrag>

 #include <osg/Group>

--- a/apps/opencs/view/render/unpagedworldspacewidget.cpp
+++ b/apps/opencs/view/render/unpagedworldspacewidget.cpp
@ -2,8 +2,6 @@

 #include <sstream>

-#include <QEvent>
-
 #include <components/sceneutil/util.hpp>

 #include "../../model/doc/document.hpp"
--- a/apps/opencs/view/render/worldspacewidget.cpp
+++ b/apps/opencs/view/render/worldspacewidget.cpp
@ -2,13 +2,10 @@

 #include <algorithm>

-#include <QEvent>
 #include <QDragEnterEvent>
 #include <QDragMoveEvent>
 #include <QDropEvent>
 #include <QMouseEvent>
-#include <QKeyEvent>
-#include <QApplication>
 #include <QToolTip>

 #include <osgUtil/LineSegmentIntersector>
--- a/apps/opencs/view/tools/searchbox.cpp
+++ b/apps/opencs/view/tools/searchbox.cpp
@ -3,8 +3,6 @@
 #include <stdexcept>

 #include <QGridLayout>
-#include <QComboBox>
-#include <QPushButton>

 #include "../../model/world/columns.hpp"

--- a/apps/opencs/view/widget/coloreditor.cpp
+++ b/apps/opencs/view/widget/coloreditor.cpp
@ -1,8 +1,6 @@
 #include "coloreditor.hpp"

-#include <QApplication>
-#include <QColorDialog>
-#include <QDesktopWidget>
+#include <QGuiApplication>
 #include <QPainter>
 #include <QShowEvent>
 #include <QScreen>
--- a/apps/opencs/view/widget/colorpickerpopup.cpp
+++ b/apps/opencs/view/widget/colorpickerpopup.cpp
@ -4,8 +4,8 @@
 #include <QPushButton>
 #include <QEvent>
 #include <QKeyEvent>
-#include <QLayout>
-#include <QStyleOption>
+#include <QStyleOptionButton>
+#include <QVBoxLayout>

 CSVWidget::ColorPickerPopup::ColorPickerPopup(QWidget *parent) 
    : QFrame(parent)
--- a/apps/opencs/view/widget/scenetoolmode.cpp
+++ b/apps/opencs/view/widget/scenetoolmode.cpp
@ -2,7 +2,6 @@

 #include <QHBoxLayout>
 #include <QFrame>
-#include <QSignalMapper>
 #include <QMenu>
 #include <QContextMenuEvent>
 #include <QEvent>
--- a/apps/opencs/view/widget/scenetoolshapebrush.cpp
+++ b/apps/opencs/view/widget/scenetoolshapebrush.cpp
@ -1,25 +1,20 @@
 #include "scenetoolshapebrush.hpp"

-#include <QFrame>
-#include <QIcon>
-#include <QTableWidget>
-#include <QHBoxLayout>
-
-#include <QWidget>
-#include <QComboBox>
-#include <QSpinBox>
-#include <QGroupBox>
-#include <QSlider>
-#include <QEvent>
-#include <QDropEvent>
 #include <QButtonGroup>
-#include <QVBoxLayout>
+#include <QComboBox>
 #include <QDragEnterEvent>
-#include <QDrag>
-#include <QTableWidget>
+#include <QDropEvent>
+#include <QFrame>
+#include <QGroupBox>
+#include <QHBoxLayout>
 #include <QHeaderView>
-#include <QApplication>
+#include <QIcon>
+#include <QLabel>
 #include <QSizePolicy>
+#include <QSlider>
+#include <QTableWidget>
+#include <QVBoxLayout>
+#include <QWidget>

 #include "brushshapes.hpp"
 #include "scenetool.hpp"
--- a/apps/opencs/view/widget/scenetoolshapebrush.hpp
+++ b/apps/opencs/view/widget/scenetoolshapebrush.hpp
@ -1,18 +1,14 @@
 #ifndef CSV_WIDGET_SCENETOOLSHAPEBRUSH_H
 #define CSV_WIDGET_SCENETOOLSHAPEBRUSH_H

-#include <QIcon>
 #include <QFrame>
 #include <QModelIndex>

 #include <QWidget>
-#include <QLabel>
 #include <QComboBox>
 #include <QSpinBox>
 #include <QGroupBox>
 #include <QSlider>
-#include <QEvent>
-#include <QHBoxLayout>
 #include <QPushButton>

 #ifndef Q_MOC_RUN
--- a/apps/opencs/view/widget/scenetooltexturebrush.cpp
+++ b/apps/opencs/view/widget/scenetooltexturebrush.cpp
@ -1,24 +1,19 @@
 #include "scenetooltexturebrush.hpp"

-#include <QFrame>
-#include <QIcon>
-#include <QTableWidget>
-#include <QHBoxLayout>
-
-#include <QWidget>
-#include <QSpinBox>
-#include <QGroupBox>
-#include <QSlider>
-#include <QEvent>
-#include <QDropEvent>
 #include <QButtonGroup>
-#include <QVBoxLayout>
 #include <QDragEnterEvent>
-#include <QDrag>
-#include <QTableWidget>
+#include <QDropEvent>
+#include <QFrame>
+#include <QGroupBox>
+#include <QHBoxLayout>
 #include <QHeaderView>
-#include <QApplication>
+#include <QIcon>
 #include <QSizePolicy>
+#include <QSlider>
+#include <QSpinBox>
+#include <QTableWidget>
+#include <QVBoxLayout>
+#include <QWidget>

 #include "scenetool.hpp"

--- a/apps/opencs/view/widget/scenetooltexturebrush.hpp
+++ b/apps/opencs/view/widget/scenetooltexturebrush.hpp
@ -1,18 +1,15 @@
 #ifndef CSV_WIDGET_SCENETOOLTEXTUREBRUSH_H
 #define CSV_WIDGET_SCENETOOLTEXTUREBRUSH_H

-#include <QIcon>
 #include <QFrame>
-#include <QModelIndex>
-
-#include <QWidget>
-#include <QLabel>
-#include <QSpinBox>
 #include <QGroupBox>
-#include <QSlider>
-#include <QEvent>
 #include <QHBoxLayout>
+#include <QLabel>
+#include <QModelIndex>
 #include <QPushButton>
+#include <QSlider>
+#include <QSpinBox>
+#include <QWidget>

 #ifndef Q_MOC_RUN
 #include "brushshapes.hpp"
--- a/apps/opencs/view/widget/scenetooltoggle2.cpp
+++ b/apps/opencs/view/widget/scenetooltoggle2.cpp
@ -6,7 +6,6 @@
 #include <QHBoxLayout>
 #include <QFrame>
 #include <QIcon>
-#include <QPainter>

 #include "scenetoolbar.hpp"
 #include "pushbutton.hpp"
--- a/apps/opencs/view/world/colordelegate.cpp
+++ b/apps/opencs/view/world/colordelegate.cpp
@ -1,7 +1,6 @@
 #include "colordelegate.hpp"

 #include <QPainter>
-#include <QPushButton>

 CSVWorld::ColorDelegate::ColorDelegate(CSMWorld::CommandDispatcher *dispatcher,
                                       CSMDoc::Document& document,
--- a/apps/opencs/view/world/datadisplaydelegate.hpp
+++ b/apps/opencs/view/world/datadisplaydelegate.hpp
@ -1,7 +1,6 @@
 #ifndef DATADISPLAYDELEGATE_HPP
 #define DATADISPLAYDELEGATE_HPP

-#include <QTextOption>
 #include "enumdelegate.hpp"

 namespace CSMPrefs
--- a/apps/opencs/view/world/dialoguesubview.cpp
+++ b/apps/opencs/view/world/dialoguesubview.cpp
@ -4,22 +4,18 @@
 #include <memory>
 #include <stdexcept>

-#include <QGridLayout>
-#include <QLabel>
-#include <QSize>
 #include <QAbstractItemModel>
-#include <QDoubleSpinBox>
-#include <QSpinBox>
-#include <QLineEdit>
-#include <QEvent>
-#include <QDataWidgetMapper>
 #include <QCheckBox>
-#include <QLineEdit>
-#include <QPlainTextEdit>
 #include <QComboBox>
+#include <QDataWidgetMapper>
+#include <QGridLayout>
 #include <QHeaderView>
-#include <QScrollBar>
+#include <QLabel>
+#include <QLineEdit>
 #include <QMenu>
+#include <QPlainTextEdit>
+#include <QScrollBar>
+#include <QSize>

 #include "../../model/world/nestedtableproxymodel.hpp"
 #include "../../model/world/columnbase.hpp"
--- a/apps/opencs/view/world/dragrecordtable.hpp
+++ b/apps/opencs/view/world/dragrecordtable.hpp
@ -2,7 +2,6 @@
 #define CSV_WORLD_DRAGRECORDTABLE_H

 #include <QTableView>
-#include <QEvent>

 #include "../../model/world/columnbase.hpp"

--- a/apps/opencs/view/world/enumdelegate.cpp
+++ b/apps/opencs/view/world/enumdelegate.cpp
@ -5,7 +5,6 @@

 #include <QComboBox>
 #include <QApplication>
-#include <QUndoStack>

 #include "../../model/world/commands.hpp"

--- a/apps/opencs/view/world/enumdelegate.hpp
+++ b/apps/opencs/view/world/enumdelegate.hpp
@ -4,7 +4,6 @@
 #include <vector>

 #include <QString>
-#include <QStyledItemDelegate>

 #include <components/esm/defs.hpp>

--- a/apps/opencs/view/world/extendedcommandconfigurator.cpp
+++ b/apps/opencs/view/world/extendedcommandconfigurator.cpp
@ -5,7 +5,6 @@
 #include <QPushButton>
 #include <QGroupBox>
 #include <QCheckBox>
-#include <QLabel>
 #include <QLayout>

 #include "../../model/doc/document.hpp"
--- a/apps/opencs/view/world/nestedtable.cpp
+++ b/apps/opencs/view/world/nestedtable.cpp
@ -3,7 +3,6 @@
 #include <QHeaderView>
 #include <QContextMenuEvent>
 #include <QMenu>
-#include <QDebug>

 #include "../../model/prefs/shortcut.hpp"

--- a/apps/opencs/view/world/nestedtable.hpp
+++ b/apps/opencs/view/world/nestedtable.hpp
@ -1,8 +1,6 @@
 #ifndef CSV_WORLD_NESTEDTABLE_H
 #define CSV_WORLD_NESTEDTABLE_H

-#include <QEvent>
-
 #include "dragrecordtable.hpp"

 class QAction;
--- a/apps/opencs/view/world/recordstatusdelegate.cpp
+++ b/apps/opencs/view/world/recordstatusdelegate.cpp
@ -1,9 +1,5 @@
 #include "recordstatusdelegate.hpp"

-#include <QPainter>
-#include <QApplication>
-#include <QUndoStack>
-
 #include "../../model/world/columns.hpp"

 CSVWorld::RecordStatusDelegate::RecordStatusDelegate(const ValueList& values,
--- a/apps/opencs/view/world/recordstatusdelegate.hpp
+++ b/apps/opencs/view/world/recordstatusdelegate.hpp
@ -2,8 +2,6 @@
 #define RECORDSTATUSDELEGATE_H

 #include "util.hpp"
-#include <QTextOption>
-#include <QFont>

 #include "datadisplaydelegate.hpp"
 #include "../../model/world/record.hpp"
--- a/apps/opencs/view/world/regionmap.hpp
+++ b/apps/opencs/view/world/regionmap.hpp
@ -4,9 +4,6 @@
 #include <cstddef>
 #include <vector>

-#include <QObject>
-#include <QTableView>
-
 #include "./dragrecordtable.hpp"

 class QAction;
--- a/apps/opencs/view/world/scriptedit.cpp
+++ b/apps/opencs/view/world/scriptedit.cpp
@ -3,7 +3,6 @@
 #include <algorithm>

 #include <QDragEnterEvent>
-#include <QRegExp>
 #include <QString>
 #include <QPainter>
 #include <QTextDocumentFragment>
--- a/apps/opencs/view/world/scriptsubview.cpp
+++ b/apps/opencs/view/world/scriptsubview.cpp
@ -2,8 +2,6 @@

 #include <stdexcept>

-#include <QStatusBar>
-#include <QStackedLayout>
 #include <QSplitter>
 #include <QTimer>

--- a/apps/opencs/view/world/scriptsubview.hpp
+++ b/apps/opencs/view/world/scriptsubview.hpp
@ -9,7 +9,6 @@

 class QModelIndex;
 class QLabel;
-class QVBoxLayout;
 class QSplitter;
 class QTime;

--- a/apps/opencs/view/world/table.cpp
+++ b/apps/opencs/view/world/table.cpp
@ -6,7 +6,6 @@
 #include <QContextMenuEvent>
 #include <QString>
 #include <QMetaObject>
-#include <QtCore/qnamespace.h>

 #include <components/debug/debuglog.hpp>
 #include <components/misc/helpviewer.hpp>
--- a/apps/opencs/view/world/table.hpp
+++ b/apps/opencs/view/world/table.hpp
@ -4,8 +4,6 @@
 #include <vector>
 #include <string>

-#include <QEvent>
-
 #include "../../model/filter/node.hpp"
 #include "../../model/world/columnbase.hpp"
 #include "../../model/world/universalid.hpp"
--- a/apps/opencs/view/world/tableheadermouseeventhandler.cpp
+++ b/apps/opencs/view/world/tableheadermouseeventhandler.cpp
@ -3,6 +3,7 @@

 #include <QMenu>
 #include <QPoint>
+#include <QMouseEvent>

 namespace CSVWorld
 {
--- a/apps/opencs/view/world/tableheadermouseeventhandler.hpp
+++ b/apps/opencs/view/world/tableheadermouseeventhandler.hpp
@ -1,7 +1,7 @@
 #pragma once

 #include <QHeaderView>
-#include <QtGui>
+#include <QEvent>

 namespace CSVWorld
 {
--- a/apps/opencs/view/world/tablesubview.hpp
+++ b/apps/opencs/view/world/tablesubview.hpp
@ -3,8 +3,6 @@

 #include "../doc/subview.hpp"

-#include <QtCore/qnamespace.h>
-
 class QModelIndex;
 class QWidget;

--- a/apps/opencs/view/world/util.cpp
+++ b/apps/opencs/view/world/util.cpp
@ -4,13 +4,10 @@
 #include <stdexcept>

 #include <QUndoStack>
-#include <QMetaProperty>
 #include <QStyledItemDelegate>
 #include <QLineEdit>
-#include <QComboBox>
 #include <QCheckBox>
 #include <QPlainTextEdit>
-#include <QEvent>
 #include <QItemEditorFactory>

 #include "../../model/world/commands.hpp"
--- a/apps/opencs/view/world/vartypedelegate.cpp
+++ b/apps/opencs/view/world/vartypedelegate.cpp
@ -1,7 +1,5 @@
 #include "vartypedelegate.hpp"

-#include <QUndoStack>
-
 #include "../../model/world/commands.hpp"
 #include "../../model/world/columns.hpp"
 #include "../../model/world/commandmacro.hpp"
--- a/apps/wizard/existinginstallationpage.cpp
+++ b/apps/wizard/existinginstallationpage.cpp
@ -1,6 +1,5 @@
 #include "existinginstallationpage.hpp"

-#include <QDebug>
 #include <QMessageBox>
 #include <QFileDialog>
 #include <QFileInfo>
--- a/apps/wizard/installationpage.cpp
+++ b/apps/wizard/installationpage.cpp
@ -1,10 +1,9 @@
 #include "installationpage.hpp"

-#include <QDebug>
 #include <QTextCodec>
-#include <QFileInfo>
 #include <QFileDialog>
 #include <QMessageBox>
+#include <QThread>

 #include "mainwizard.hpp"

--- a/apps/wizard/mainwizard.cpp
+++ b/apps/wizard/mainwizard.cpp
@ -1,8 +1,7 @@
 #include "mainwizard.hpp"

 #include <QDebug>
-
-#include <QTime>
+#include <QDateTime>
 #include <QMessageBox>
 #include <QTextCodec>
 #include <QDir>
--- a/apps/wizard/unshield/unshieldworker.cpp
+++ b/apps/wizard/unshield/unshieldworker.cpp
@ -1,16 +1,13 @@
 #include "unshieldworker.hpp"

 #include <QDebug>
-
 #include <QReadLocker>
-#include <QFileDialog>
 #include <QFileInfo>
 #include <QStringList>
 #include <QTextStream>
 #include <QTextCodec>
 #include <QFile>
 #include <QDir>
-#include <QDirIterator>

 Wizard::UnshieldWorker::UnshieldWorker(qint64 expectedMorrowindBsaSize, QObject *parent) :
    QObject(parent),
--- a/apps/wizard/unshield/unshieldworker.hpp
+++ b/apps/wizard/unshield/unshieldworker.hpp
@ -2,8 +2,6 @@
 #define UNSHIELDWORKER_HPP

 #include <QObject>
-#include <QThread>
-#include <QMutex>
 #include <QWaitCondition>
 #include <QReadWriteLock>
 #include <QStringList>
--- a/components/config/settingsbase.hpp
+++ b/components/config/settingsbase.hpp
@ -5,7 +5,6 @@
 #include <QStringList>
 #include <QString>
 #include <QRegExp>
-#include <QMultiMap>

 namespace Config
 {
--- a/components/contentselector/model/contentmodel.cpp
+++ b/components/contentselector/model/contentmodel.cpp
@ -5,7 +5,6 @@
 #include <unordered_set>

 #include <QDir>
-#include <QTextCodec>
 #include <QDebug>

 #include <components/esm3/esmreader.hpp>
--- a/components/contentselector/model/esmfile.cpp
+++ b/components/contentselector/model/esmfile.cpp
@ -1,6 +1,5 @@
 #include "esmfile.hpp"

-#include <QMimeData>
 #include <QDataStream>

 int ContentSelectorModel::EsmFile::sPropertyCount = 7;
--- a/components/contentselector/view/combobox.cpp
+++ b/components/contentselector/view/combobox.cpp
@ -1,6 +1,8 @@
 #include <QString>
 #include <QKeyEvent>

+#include <QStylePainter>
+
 #include "combobox.hpp"

 ContentSelectorView::ComboBox::ComboBox(QWidget *parent) :
--- a/components/contentselector/view/combobox.hpp
+++ b/components/contentselector/view/combobox.hpp
@ -2,7 +2,6 @@
 #define COMBOBOX_HPP

 #include <QComboBox>
-#include <QStylePainter>

 class QString;
 class QRegExpValidator;
--- a/components/contentselector/view/contentselector.cpp
+++ b/components/contentselector/view/contentselector.cpp
@ -3,10 +3,7 @@
 #include <components/contentselector/model/esmfile.hpp>

 #include <QSortFilterProxyModel>
-
 #include <QMenu>
-#include <QContextMenuEvent>
-
 #include <QClipboard>
 #include <QModelIndex>

--- a/components/process/processinvoker.cpp
+++ b/components/process/processinvoker.cpp
@ -4,8 +4,10 @@
 #include <QStringList>
 #include <QString>
 #include <QDir>
-#include <QDebug>
+
+#if defined(Q_OS_MAC)
 #include <QCoreApplication>
+#endif

 Process::ProcessInvoker::ProcessInvoker(QObject* parent)
    : QObject(parent)