From 8b9ed5734871fad887b52c544f328a8433190e19 Mon Sep 17 00:00:00 2001 From: jvoisin Date: Thu, 16 Jun 2022 21:29:55 +0200 Subject: [PATCH] Clean up Qt includes --- apps/launcher/advancedpage.cpp | 6 ++--- apps/launcher/datafilespage.cpp | 6 +---- apps/launcher/graphicspage.cpp | 2 -- apps/launcher/main.cpp | 1 - apps/launcher/maindialog.cpp | 5 ++-- apps/launcher/settingspage.cpp | 1 + apps/launcher/utils/profilescombobox.cpp | 2 -- apps/launcher/utils/profilescombobox.hpp | 2 +- apps/opencs/main.cpp | 1 - apps/opencs/model/doc/document.hpp | 1 - apps/opencs/model/doc/messages.hpp | 2 -- apps/opencs/model/doc/operation.hpp | 1 - apps/opencs/model/doc/runner.cpp | 1 - apps/opencs/model/prefs/boolsetting.cpp | 1 - apps/opencs/model/prefs/coloursetting.cpp | 1 - apps/opencs/model/prefs/shortcutmanager.cpp | 1 - apps/opencs/model/tools/tools.cpp | 2 -- apps/opencs/model/world/columnbase.hpp | 1 - apps/opencs/model/world/columnimp.cpp | 1 - apps/opencs/model/world/columnimp.hpp | 1 - apps/opencs/model/world/commands.hpp | 1 - apps/opencs/view/doc/filedialog.cpp | 3 --- apps/opencs/view/doc/loader.hpp | 1 - apps/opencs/view/doc/newgame.cpp | 3 +-- apps/opencs/view/doc/operation.cpp | 2 +- apps/opencs/view/doc/operations.cpp | 1 - apps/opencs/view/doc/startup.cpp | 3 +-- apps/opencs/view/doc/subview.cpp | 1 - apps/opencs/view/doc/view.cpp | 4 --- apps/opencs/view/doc/viewmanager.cpp | 1 - apps/opencs/view/filter/editwidget.cpp | 1 - apps/opencs/view/filter/editwidget.hpp | 1 - apps/opencs/view/filter/filterbox.hpp | 1 - apps/opencs/view/filter/recordfilterbox.hpp | 3 --- apps/opencs/view/prefs/dialogue.cpp | 2 -- .../view/render/pagedworldspacewidget.cpp | 2 -- apps/opencs/view/render/pathgridmode.cpp | 1 - apps/opencs/view/render/scenewidget.cpp | 4 +-- .../opencs/view/render/terraintexturemode.cpp | 3 --- .../view/render/unpagedworldspacewidget.cpp | 2 -- apps/opencs/view/render/worldspacewidget.cpp | 3 --- apps/opencs/view/tools/searchbox.cpp | 2 -- apps/opencs/view/widget/coloreditor.cpp | 4 +-- apps/opencs/view/widget/colorpickerpopup.cpp | 4 +-- apps/opencs/view/widget/scenetoolmode.cpp | 1 - .../view/widget/scenetoolshapebrush.cpp | 27 ++++++++----------- .../view/widget/scenetoolshapebrush.hpp | 4 --- .../view/widget/scenetooltexturebrush.cpp | 25 +++++++---------- .../view/widget/scenetooltexturebrush.hpp | 13 ++++----- apps/opencs/view/widget/scenetooltoggle2.cpp | 1 - apps/opencs/view/world/colordelegate.cpp | 1 - .../opencs/view/world/datadisplaydelegate.hpp | 1 - apps/opencs/view/world/dialoguesubview.cpp | 18 +++++-------- apps/opencs/view/world/dragrecordtable.hpp | 1 - apps/opencs/view/world/enumdelegate.cpp | 1 - apps/opencs/view/world/enumdelegate.hpp | 1 - .../world/extendedcommandconfigurator.cpp | 1 - apps/opencs/view/world/nestedtable.cpp | 1 - apps/opencs/view/world/nestedtable.hpp | 2 -- .../view/world/recordstatusdelegate.cpp | 4 --- .../view/world/recordstatusdelegate.hpp | 2 -- apps/opencs/view/world/regionmap.hpp | 3 --- apps/opencs/view/world/scriptedit.cpp | 1 - apps/opencs/view/world/scriptsubview.cpp | 2 -- apps/opencs/view/world/scriptsubview.hpp | 1 - apps/opencs/view/world/table.cpp | 1 - apps/opencs/view/world/table.hpp | 2 -- .../world/tableheadermouseeventhandler.cpp | 1 + .../world/tableheadermouseeventhandler.hpp | 2 +- apps/opencs/view/world/tablesubview.hpp | 2 -- apps/opencs/view/world/util.cpp | 3 --- apps/opencs/view/world/vartypedelegate.cpp | 2 -- apps/wizard/existinginstallationpage.cpp | 1 - apps/wizard/installationpage.cpp | 3 +-- apps/wizard/mainwizard.cpp | 3 +-- apps/wizard/unshield/unshieldworker.cpp | 3 --- apps/wizard/unshield/unshieldworker.hpp | 2 -- components/config/settingsbase.hpp | 1 - .../contentselector/model/contentmodel.cpp | 1 - components/contentselector/model/esmfile.cpp | 1 - components/contentselector/view/combobox.cpp | 2 ++ components/contentselector/view/combobox.hpp | 1 - .../contentselector/view/contentselector.cpp | 3 --- components/process/processinvoker.cpp | 4 ++- 84 files changed, 57 insertions(+), 184 deletions(-) diff --git a/apps/launcher/advancedpage.cpp b/apps/launcher/advancedpage.cpp index 6566bd8d51..9eed0605f0 100644 --- a/apps/launcher/advancedpage.cpp +++ b/apps/launcher/advancedpage.cpp @@ -2,16 +2,16 @@ #include #include +#include -#include #include #include #include + +#include #include #include -#include - #include "utils/openalutil.hpp" Launcher::AdvancedPage::AdvancedPage(Config::GameSettings &gameSettings, QWidget *parent) diff --git a/apps/launcher/datafilespage.cpp b/apps/launcher/datafilespage.cpp index c096198462..cb94eddd78 100644 --- a/apps/launcher/datafilespage.cpp +++ b/apps/launcher/datafilespage.cpp @@ -2,14 +2,10 @@ #include "maindialog.hpp" #include - #include #include -#include -#include #include -#include -#include + #include #include #include diff --git a/apps/launcher/graphicspage.cpp b/apps/launcher/graphicspage.cpp index 67b1380130..5cdfb578da 100644 --- a/apps/launcher/graphicspage.cpp +++ b/apps/launcher/graphicspage.cpp @@ -1,8 +1,6 @@ #include "graphicspage.hpp" -#include #include -#include #include #ifdef MAC_OS_X_VERSION_MIN_REQUIRED diff --git a/apps/launcher/main.cpp b/apps/launcher/main.cpp index 57b8ee4b78..486f771366 100644 --- a/apps/launcher/main.cpp +++ b/apps/launcher/main.cpp @@ -1,7 +1,6 @@ #include #include -#include #include #include diff --git a/apps/launcher/maindialog.cpp b/apps/launcher/maindialog.cpp index 62534e95bd..ba7de5b7e7 100644 --- a/apps/launcher/maindialog.cpp +++ b/apps/launcher/maindialog.cpp @@ -3,11 +3,10 @@ #include #include -#include +#include #include +#include #include -#include -#include #include #include diff --git a/apps/launcher/settingspage.cpp b/apps/launcher/settingspage.cpp index 9c750a7c25..1739c5cc05 100644 --- a/apps/launcher/settingspage.cpp +++ b/apps/launcher/settingspage.cpp @@ -2,6 +2,7 @@ #include #include +#include #include #include "utils/textinputdialog.hpp" diff --git a/apps/launcher/utils/profilescombobox.cpp b/apps/launcher/utils/profilescombobox.cpp index d06cfacff6..dc0a806c9f 100644 --- a/apps/launcher/utils/profilescombobox.cpp +++ b/apps/launcher/utils/profilescombobox.cpp @@ -1,7 +1,5 @@ -#include #include #include -#include #include "profilescombobox.hpp" diff --git a/apps/launcher/utils/profilescombobox.hpp b/apps/launcher/utils/profilescombobox.hpp index 065682f3d1..f29ac58e12 100644 --- 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 +#include class QString; diff --git a/apps/opencs/main.cpp b/apps/opencs/main.cpp index a15ab17fa2..e46a46a34e 100644 --- a/apps/opencs/main.cpp +++ b/apps/opencs/main.cpp @@ -5,7 +5,6 @@ #include #include -#include #include #include diff --git a/apps/opencs/model/doc/document.hpp b/apps/opencs/model/doc/document.hpp index 0332cb43a1..4aae282fb6 100644 --- a/apps/opencs/model/doc/document.hpp +++ b/apps/opencs/model/doc/document.hpp @@ -7,7 +7,6 @@ #include #include -#include #include #include diff --git a/apps/opencs/model/doc/messages.hpp b/apps/opencs/model/doc/messages.hpp index 671ded82a0..355493b79b 100644 --- a/apps/opencs/model/doc/messages.hpp +++ b/apps/opencs/model/doc/messages.hpp @@ -4,8 +4,6 @@ #include #include -#include - #include "../world/universalid.hpp" namespace CSMDoc diff --git a/apps/opencs/model/doc/operation.hpp b/apps/opencs/model/doc/operation.hpp index ff396fa3ce..b094c08b4c 100644 --- a/apps/opencs/model/doc/operation.hpp +++ b/apps/opencs/model/doc/operation.hpp @@ -6,7 +6,6 @@ #include #include -#include #include "messages.hpp" diff --git a/apps/opencs/model/doc/runner.cpp b/apps/opencs/model/doc/runner.cpp index f1179b1624..9320941841 100644 --- a/apps/opencs/model/doc/runner.cpp +++ b/apps/opencs/model/doc/runner.cpp @@ -1,6 +1,5 @@ #include "runner.hpp" -#include #include #include #include diff --git a/apps/opencs/model/prefs/boolsetting.cpp b/apps/opencs/model/prefs/boolsetting.cpp index 0058753490..c8a2c7c5e2 100644 --- a/apps/opencs/model/prefs/boolsetting.cpp +++ b/apps/opencs/model/prefs/boolsetting.cpp @@ -1,4 +1,3 @@ - #include "boolsetting.hpp" #include diff --git a/apps/opencs/model/prefs/coloursetting.cpp b/apps/opencs/model/prefs/coloursetting.cpp index e676ad91c3..24735a3bac 100644 --- a/apps/opencs/model/prefs/coloursetting.cpp +++ b/apps/opencs/model/prefs/coloursetting.cpp @@ -1,4 +1,3 @@ - #include "coloursetting.hpp" #include diff --git a/apps/opencs/model/prefs/shortcutmanager.cpp b/apps/opencs/model/prefs/shortcutmanager.cpp index 4c5f77900c..4b3f81d0ef 100644 --- a/apps/opencs/model/prefs/shortcutmanager.cpp +++ b/apps/opencs/model/prefs/shortcutmanager.cpp @@ -2,7 +2,6 @@ #include -#include #include #include "shortcut.hpp" diff --git a/apps/opencs/model/tools/tools.cpp b/apps/opencs/model/tools/tools.cpp index a3d7db497f..07e0cc038e 100644 --- a/apps/opencs/model/tools/tools.cpp +++ b/apps/opencs/model/tools/tools.cpp @@ -1,7 +1,5 @@ #include "tools.hpp" -#include - #include "../doc/state.hpp" #include "../doc/operation.hpp" #include "../doc/document.hpp" diff --git a/apps/opencs/model/world/columnbase.hpp b/apps/opencs/model/world/columnbase.hpp index b7c0d8a248..688cdffb74 100644 --- a/apps/opencs/model/world/columnbase.hpp +++ b/apps/opencs/model/world/columnbase.hpp @@ -5,7 +5,6 @@ #include #include -#include #include #include "record.hpp" diff --git a/apps/opencs/model/world/columnimp.cpp b/apps/opencs/model/world/columnimp.cpp index 0244ab1e8d..78c7bc02d5 100644 --- a/apps/opencs/model/world/columnimp.cpp +++ b/apps/opencs/model/world/columnimp.cpp @@ -1,7 +1,6 @@ #include "columnimp.hpp" #include -#include namespace CSMWorld { diff --git a/apps/opencs/model/world/columnimp.hpp b/apps/opencs/model/world/columnimp.hpp index 493f62694e..2d69c664d4 100644 --- a/apps/opencs/model/world/columnimp.hpp +++ b/apps/opencs/model/world/columnimp.hpp @@ -6,7 +6,6 @@ #include #include -#include #include #include diff --git a/apps/opencs/model/world/commands.hpp b/apps/opencs/model/world/commands.hpp index 2ed629ef5c..4b619d11ed 100644 --- 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 diff --git a/apps/opencs/view/doc/filedialog.cpp b/apps/opencs/view/doc/filedialog.cpp index 51745be0a7..1eca8d68a6 100644 --- a/apps/opencs/view/doc/filedialog.cpp +++ b/apps/opencs/view/doc/filedialog.cpp @@ -2,9 +2,6 @@ #include #include -#include -#include -#include #include "components/contentselector/model/esmfile.hpp" #include "components/contentselector/view/contentselector.hpp" diff --git a/apps/opencs/view/doc/loader.hpp b/apps/opencs/view/doc/loader.hpp index 1d21d1e02e..80d986283d 100644 --- a/apps/opencs/view/doc/loader.hpp +++ b/apps/opencs/view/doc/loader.hpp @@ -5,7 +5,6 @@ #include #include -#include class QLabel; class QProgressBar; diff --git a/apps/opencs/view/doc/newgame.cpp b/apps/opencs/view/doc/newgame.cpp index 7b247652ed..dc7e12423e 100644 --- a/apps/opencs/view/doc/newgame.cpp +++ b/apps/opencs/view/doc/newgame.cpp @@ -1,7 +1,6 @@ #include "newgame.hpp" -#include -#include +#include #include #include #include diff --git a/apps/opencs/view/doc/operation.cpp b/apps/opencs/view/doc/operation.cpp index e5c1e7b89e..c3714a001e 100644 --- a/apps/opencs/view/doc/operation.cpp +++ b/apps/opencs/view/doc/operation.cpp @@ -4,7 +4,7 @@ #include #include -#include +#include #include "../../model/doc/document.hpp" diff --git a/apps/opencs/view/doc/operations.cpp b/apps/opencs/view/doc/operations.cpp index 9ed77ff9c5..2177679b00 100644 --- a/apps/opencs/view/doc/operations.cpp +++ b/apps/opencs/view/doc/operations.cpp @@ -1,7 +1,6 @@ #include "operations.hpp" #include -#include #include "operation.hpp" diff --git a/apps/opencs/view/doc/startup.cpp b/apps/opencs/view/doc/startup.cpp index 3a1950a6e3..df4701d8c1 100644 --- a/apps/opencs/view/doc/startup.cpp +++ b/apps/opencs/view/doc/startup.cpp @@ -1,7 +1,6 @@ #include "startup.hpp" -#include -#include +#include #include #include #include diff --git a/apps/opencs/view/doc/subview.cpp b/apps/opencs/view/doc/subview.cpp index 82cbe835e7..a566a6e26f 100644 --- a/apps/opencs/view/doc/subview.cpp +++ b/apps/opencs/view/doc/subview.cpp @@ -2,7 +2,6 @@ #include "view.hpp" -#include #include #include diff --git a/apps/opencs/view/doc/view.cpp b/apps/opencs/view/doc/view.cpp index 1fea81ce97..68658248eb 100644 --- a/apps/opencs/view/doc/view.cpp +++ b/apps/opencs/view/doc/view.cpp @@ -6,13 +6,9 @@ #include #include #include -#include -#include #include #include #include -#include -#include #include #include diff --git a/apps/opencs/view/doc/viewmanager.cpp b/apps/opencs/view/doc/viewmanager.cpp index 95f9f606da..b417a5b499 100644 --- a/apps/opencs/view/doc/viewmanager.cpp +++ b/apps/opencs/view/doc/viewmanager.cpp @@ -4,7 +4,6 @@ #include #include -#include #include #include diff --git a/apps/opencs/view/filter/editwidget.cpp b/apps/opencs/view/filter/editwidget.cpp index 78dfef704b..6db8751a0c 100644 --- a/apps/opencs/view/filter/editwidget.cpp +++ b/apps/opencs/view/filter/editwidget.cpp @@ -2,7 +2,6 @@ #include -#include #include #include #include diff --git a/apps/opencs/view/filter/editwidget.hpp b/apps/opencs/view/filter/editwidget.hpp index f933ec92eb..c15e4ef913 100644 --- a/apps/opencs/view/filter/editwidget.hpp +++ b/apps/opencs/view/filter/editwidget.hpp @@ -3,7 +3,6 @@ #include #include -#include #include "../../model/filter/parser.hpp" #include "../../model/filter/node.hpp" diff --git a/apps/opencs/view/filter/filterbox.hpp b/apps/opencs/view/filter/filterbox.hpp index 94b5fced30..e01f77ce6b 100644 --- a/apps/opencs/view/filter/filterbox.hpp +++ b/apps/opencs/view/filter/filterbox.hpp @@ -4,7 +4,6 @@ #include #include -#include #include "../../model/filter/node.hpp" #include "../../model/world/universalid.hpp" diff --git a/apps/opencs/view/filter/recordfilterbox.hpp b/apps/opencs/view/filter/recordfilterbox.hpp index 3bcd7c57b4..b6e04b2758 100644 --- a/apps/opencs/view/filter/recordfilterbox.hpp +++ b/apps/opencs/view/filter/recordfilterbox.hpp @@ -2,9 +2,6 @@ #define CSV_FILTER_RECORDFILTERBOX_H #include -#include - -#include #include "../../model/filter/node.hpp" diff --git a/apps/opencs/view/prefs/dialogue.cpp b/apps/opencs/view/prefs/dialogue.cpp index 7e41fcf822..2dd92901ea 100644 --- a/apps/opencs/view/prefs/dialogue.cpp +++ b/apps/opencs/view/prefs/dialogue.cpp @@ -1,9 +1,7 @@ #include "dialogue.hpp" #include -#include #include -#include #include #include #include diff --git a/apps/opencs/view/render/pagedworldspacewidget.cpp b/apps/opencs/view/render/pagedworldspacewidget.cpp index 09306174c1..f0299c5ace 100644 --- a/apps/opencs/view/render/pagedworldspacewidget.cpp +++ b/apps/opencs/view/render/pagedworldspacewidget.cpp @@ -4,8 +4,6 @@ #include #include -#include -#include #include diff --git a/apps/opencs/view/render/pathgridmode.cpp b/apps/opencs/view/render/pathgridmode.cpp index 193cb664db..c267f5762d 100644 --- a/apps/opencs/view/render/pathgridmode.cpp +++ b/apps/opencs/view/render/pathgridmode.cpp @@ -1,6 +1,5 @@ #include "pathgridmode.hpp" -#include #include #include diff --git a/apps/opencs/view/render/scenewidget.cpp b/apps/opencs/view/render/scenewidget.cpp index 2cc3b3a582..578723ccd8 100644 --- a/apps/opencs/view/render/scenewidget.cpp +++ b/apps/opencs/view/render/scenewidget.cpp @@ -3,9 +3,7 @@ #include #include -#include -#include -#include +#include #include #include diff --git a/apps/opencs/view/render/terraintexturemode.cpp b/apps/opencs/view/render/terraintexturemode.cpp index 226ac36f3b..20467e9514 100644 --- a/apps/opencs/view/render/terraintexturemode.cpp +++ b/apps/opencs/view/render/terraintexturemode.cpp @@ -5,10 +5,7 @@ #include #include -#include #include -#include -#include #include diff --git a/apps/opencs/view/render/unpagedworldspacewidget.cpp b/apps/opencs/view/render/unpagedworldspacewidget.cpp index 943de15691..d9ba551ccb 100644 --- a/apps/opencs/view/render/unpagedworldspacewidget.cpp +++ b/apps/opencs/view/render/unpagedworldspacewidget.cpp @@ -2,8 +2,6 @@ #include -#include - #include #include "../../model/doc/document.hpp" diff --git a/apps/opencs/view/render/worldspacewidget.cpp b/apps/opencs/view/render/worldspacewidget.cpp index d3bf1fcf0c..a145d13d30 100644 --- a/apps/opencs/view/render/worldspacewidget.cpp +++ b/apps/opencs/view/render/worldspacewidget.cpp @@ -2,13 +2,10 @@ #include -#include #include #include #include #include -#include -#include #include #include diff --git a/apps/opencs/view/tools/searchbox.cpp b/apps/opencs/view/tools/searchbox.cpp index e0f965e3c8..f89f82ef79 100644 --- a/apps/opencs/view/tools/searchbox.cpp +++ b/apps/opencs/view/tools/searchbox.cpp @@ -3,8 +3,6 @@ #include #include -#include -#include #include "../../model/world/columns.hpp" diff --git a/apps/opencs/view/widget/coloreditor.cpp b/apps/opencs/view/widget/coloreditor.cpp index 1cc649313b..1d1f4af1ce 100644 --- a/apps/opencs/view/widget/coloreditor.cpp +++ b/apps/opencs/view/widget/coloreditor.cpp @@ -1,8 +1,6 @@ #include "coloreditor.hpp" -#include -#include -#include +#include #include #include #include diff --git a/apps/opencs/view/widget/colorpickerpopup.cpp b/apps/opencs/view/widget/colorpickerpopup.cpp index 3d69523924..0c98698ea6 100644 --- a/apps/opencs/view/widget/colorpickerpopup.cpp +++ b/apps/opencs/view/widget/colorpickerpopup.cpp @@ -4,8 +4,8 @@ #include #include #include -#include -#include +#include +#include CSVWidget::ColorPickerPopup::ColorPickerPopup(QWidget *parent) : QFrame(parent) diff --git a/apps/opencs/view/widget/scenetoolmode.cpp b/apps/opencs/view/widget/scenetoolmode.cpp index 3aec44f1ba..ae923f5b37 100644 --- a/apps/opencs/view/widget/scenetoolmode.cpp +++ b/apps/opencs/view/widget/scenetoolmode.cpp @@ -2,7 +2,6 @@ #include #include -#include #include #include #include diff --git a/apps/opencs/view/widget/scenetoolshapebrush.cpp b/apps/opencs/view/widget/scenetoolshapebrush.cpp index d0419a13ad..dcb2fe8e41 100644 --- a/apps/opencs/view/widget/scenetoolshapebrush.cpp +++ b/apps/opencs/view/widget/scenetoolshapebrush.cpp @@ -1,25 +1,20 @@ #include "scenetoolshapebrush.hpp" -#include -#include -#include -#include - -#include -#include -#include -#include -#include -#include -#include #include -#include +#include #include -#include -#include +#include +#include +#include +#include #include -#include +#include +#include #include +#include +#include +#include +#include #include "brushshapes.hpp" #include "scenetool.hpp" diff --git a/apps/opencs/view/widget/scenetoolshapebrush.hpp b/apps/opencs/view/widget/scenetoolshapebrush.hpp index 3afd7f8b3b..e616e6958e 100644 --- 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 #include #include #include -#include #include #include #include #include -#include -#include #include #ifndef Q_MOC_RUN diff --git a/apps/opencs/view/widget/scenetooltexturebrush.cpp b/apps/opencs/view/widget/scenetooltexturebrush.cpp index f55bda0464..e412392dfc 100644 --- a/apps/opencs/view/widget/scenetooltexturebrush.cpp +++ b/apps/opencs/view/widget/scenetooltexturebrush.cpp @@ -1,24 +1,19 @@ #include "scenetooltexturebrush.hpp" -#include -#include -#include -#include - -#include -#include -#include -#include -#include -#include #include -#include #include -#include -#include +#include +#include +#include +#include #include -#include +#include #include +#include +#include +#include +#include +#include #include "scenetool.hpp" diff --git a/apps/opencs/view/widget/scenetooltexturebrush.hpp b/apps/opencs/view/widget/scenetooltexturebrush.hpp index 5f42800cb3..929ed1ebae 100644 --- 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 #include -#include - -#include -#include -#include #include -#include -#include #include +#include +#include #include +#include +#include +#include #ifndef Q_MOC_RUN #include "brushshapes.hpp" diff --git a/apps/opencs/view/widget/scenetooltoggle2.cpp b/apps/opencs/view/widget/scenetooltoggle2.cpp index 363cae5709..4042c1fccb 100644 --- a/apps/opencs/view/widget/scenetooltoggle2.cpp +++ b/apps/opencs/view/widget/scenetooltoggle2.cpp @@ -6,7 +6,6 @@ #include #include #include -#include #include "scenetoolbar.hpp" #include "pushbutton.hpp" diff --git a/apps/opencs/view/world/colordelegate.cpp b/apps/opencs/view/world/colordelegate.cpp index 3b5f692fe2..8d5f5485df 100644 --- a/apps/opencs/view/world/colordelegate.cpp +++ b/apps/opencs/view/world/colordelegate.cpp @@ -1,7 +1,6 @@ #include "colordelegate.hpp" #include -#include CSVWorld::ColorDelegate::ColorDelegate(CSMWorld::CommandDispatcher *dispatcher, CSMDoc::Document& document, diff --git a/apps/opencs/view/world/datadisplaydelegate.hpp b/apps/opencs/view/world/datadisplaydelegate.hpp index df06359a04..52e2294f03 100755 --- 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 #include "enumdelegate.hpp" namespace CSMPrefs diff --git a/apps/opencs/view/world/dialoguesubview.cpp b/apps/opencs/view/world/dialoguesubview.cpp index 311c80a490..459f55780a 100644 --- a/apps/opencs/view/world/dialoguesubview.cpp +++ b/apps/opencs/view/world/dialoguesubview.cpp @@ -4,22 +4,18 @@ #include #include -#include -#include -#include #include -#include -#include -#include -#include -#include #include -#include -#include #include +#include +#include #include -#include +#include +#include #include +#include +#include +#include #include "../../model/world/nestedtableproxymodel.hpp" #include "../../model/world/columnbase.hpp" diff --git a/apps/opencs/view/world/dragrecordtable.hpp b/apps/opencs/view/world/dragrecordtable.hpp index f6c3fa8909..4b986f759a 100644 --- a/apps/opencs/view/world/dragrecordtable.hpp +++ b/apps/opencs/view/world/dragrecordtable.hpp @@ -2,7 +2,6 @@ #define CSV_WORLD_DRAGRECORDTABLE_H #include -#include #include "../../model/world/columnbase.hpp" diff --git a/apps/opencs/view/world/enumdelegate.cpp b/apps/opencs/view/world/enumdelegate.cpp index 2681a398b2..6ec585381c 100644 --- a/apps/opencs/view/world/enumdelegate.cpp +++ b/apps/opencs/view/world/enumdelegate.cpp @@ -5,7 +5,6 @@ #include #include -#include #include "../../model/world/commands.hpp" diff --git a/apps/opencs/view/world/enumdelegate.hpp b/apps/opencs/view/world/enumdelegate.hpp index 91326e2c05..c5a851c9f8 100644 --- a/apps/opencs/view/world/enumdelegate.hpp +++ b/apps/opencs/view/world/enumdelegate.hpp @@ -4,7 +4,6 @@ #include #include -#include #include diff --git a/apps/opencs/view/world/extendedcommandconfigurator.cpp b/apps/opencs/view/world/extendedcommandconfigurator.cpp index 8947420242..d7ed39e19e 100644 --- a/apps/opencs/view/world/extendedcommandconfigurator.cpp +++ b/apps/opencs/view/world/extendedcommandconfigurator.cpp @@ -5,7 +5,6 @@ #include #include #include -#include #include #include "../../model/doc/document.hpp" diff --git a/apps/opencs/view/world/nestedtable.cpp b/apps/opencs/view/world/nestedtable.cpp index d52f7ca736..c69913f0ac 100644 --- a/apps/opencs/view/world/nestedtable.cpp +++ b/apps/opencs/view/world/nestedtable.cpp @@ -3,7 +3,6 @@ #include #include #include -#include #include "../../model/prefs/shortcut.hpp" diff --git a/apps/opencs/view/world/nestedtable.hpp b/apps/opencs/view/world/nestedtable.hpp index f864f5d80c..da4afe6420 100644 --- 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 - #include "dragrecordtable.hpp" class QAction; diff --git a/apps/opencs/view/world/recordstatusdelegate.cpp b/apps/opencs/view/world/recordstatusdelegate.cpp index fd98fe6cd9..dd45baff0f 100644 --- a/apps/opencs/view/world/recordstatusdelegate.cpp +++ b/apps/opencs/view/world/recordstatusdelegate.cpp @@ -1,9 +1,5 @@ #include "recordstatusdelegate.hpp" -#include -#include -#include - #include "../../model/world/columns.hpp" CSVWorld::RecordStatusDelegate::RecordStatusDelegate(const ValueList& values, diff --git a/apps/opencs/view/world/recordstatusdelegate.hpp b/apps/opencs/view/world/recordstatusdelegate.hpp index 38f066862b..ece19e26d5 100644 --- 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 -#include #include "datadisplaydelegate.hpp" #include "../../model/world/record.hpp" diff --git a/apps/opencs/view/world/regionmap.hpp b/apps/opencs/view/world/regionmap.hpp index 443de9ce3d..fe88987848 100644 --- a/apps/opencs/view/world/regionmap.hpp +++ b/apps/opencs/view/world/regionmap.hpp @@ -4,9 +4,6 @@ #include #include -#include -#include - #include "./dragrecordtable.hpp" class QAction; diff --git a/apps/opencs/view/world/scriptedit.cpp b/apps/opencs/view/world/scriptedit.cpp index 743df9c765..1217d36f64 100644 --- a/apps/opencs/view/world/scriptedit.cpp +++ b/apps/opencs/view/world/scriptedit.cpp @@ -3,7 +3,6 @@ #include #include -#include #include #include #include diff --git a/apps/opencs/view/world/scriptsubview.cpp b/apps/opencs/view/world/scriptsubview.cpp index 6b07f2ea71..5036077fc3 100644 --- a/apps/opencs/view/world/scriptsubview.cpp +++ b/apps/opencs/view/world/scriptsubview.cpp @@ -2,8 +2,6 @@ #include -#include -#include #include #include diff --git a/apps/opencs/view/world/scriptsubview.hpp b/apps/opencs/view/world/scriptsubview.hpp index dc352cc5b0..a4171db6ee 100644 --- 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; diff --git a/apps/opencs/view/world/table.cpp b/apps/opencs/view/world/table.cpp index 69242fbca3..a3ab3d19d3 100644 --- a/apps/opencs/view/world/table.cpp +++ b/apps/opencs/view/world/table.cpp @@ -6,7 +6,6 @@ #include #include #include -#include #include #include diff --git a/apps/opencs/view/world/table.hpp b/apps/opencs/view/world/table.hpp index a7c932a383..caae3165cf 100644 --- a/apps/opencs/view/world/table.hpp +++ b/apps/opencs/view/world/table.hpp @@ -4,8 +4,6 @@ #include #include -#include - #include "../../model/filter/node.hpp" #include "../../model/world/columnbase.hpp" #include "../../model/world/universalid.hpp" diff --git a/apps/opencs/view/world/tableheadermouseeventhandler.cpp b/apps/opencs/view/world/tableheadermouseeventhandler.cpp index a9d34ce7ab..9c76cfaffe 100644 --- a/apps/opencs/view/world/tableheadermouseeventhandler.cpp +++ b/apps/opencs/view/world/tableheadermouseeventhandler.cpp @@ -3,6 +3,7 @@ #include #include +#include namespace CSVWorld { diff --git a/apps/opencs/view/world/tableheadermouseeventhandler.hpp b/apps/opencs/view/world/tableheadermouseeventhandler.hpp index 934bc1dbb7..381e127624 100644 --- a/apps/opencs/view/world/tableheadermouseeventhandler.hpp +++ b/apps/opencs/view/world/tableheadermouseeventhandler.hpp @@ -1,7 +1,7 @@ #pragma once #include -#include +#include namespace CSVWorld { diff --git a/apps/opencs/view/world/tablesubview.hpp b/apps/opencs/view/world/tablesubview.hpp index d89f71e8a4..97d2bf15f2 100644 --- a/apps/opencs/view/world/tablesubview.hpp +++ b/apps/opencs/view/world/tablesubview.hpp @@ -3,8 +3,6 @@ #include "../doc/subview.hpp" -#include - class QModelIndex; class QWidget; diff --git a/apps/opencs/view/world/util.cpp b/apps/opencs/view/world/util.cpp index 80bd4580c8..14033f20fb 100644 --- a/apps/opencs/view/world/util.cpp +++ b/apps/opencs/view/world/util.cpp @@ -4,13 +4,10 @@ #include #include -#include #include #include -#include #include #include -#include #include #include "../../model/world/commands.hpp" diff --git a/apps/opencs/view/world/vartypedelegate.cpp b/apps/opencs/view/world/vartypedelegate.cpp index 48fb4ab874..80c96afce4 100644 --- a/apps/opencs/view/world/vartypedelegate.cpp +++ b/apps/opencs/view/world/vartypedelegate.cpp @@ -1,7 +1,5 @@ #include "vartypedelegate.hpp" -#include - #include "../../model/world/commands.hpp" #include "../../model/world/columns.hpp" #include "../../model/world/commandmacro.hpp" diff --git a/apps/wizard/existinginstallationpage.cpp b/apps/wizard/existinginstallationpage.cpp index 42b7766693..35f3c8c257 100644 --- a/apps/wizard/existinginstallationpage.cpp +++ b/apps/wizard/existinginstallationpage.cpp @@ -1,6 +1,5 @@ #include "existinginstallationpage.hpp" -#include #include #include #include diff --git a/apps/wizard/installationpage.cpp b/apps/wizard/installationpage.cpp index 8aad714be3..24e573f1b5 100644 --- a/apps/wizard/installationpage.cpp +++ b/apps/wizard/installationpage.cpp @@ -1,10 +1,9 @@ #include "installationpage.hpp" -#include #include -#include #include #include +#include #include "mainwizard.hpp" diff --git a/apps/wizard/mainwizard.cpp b/apps/wizard/mainwizard.cpp index 8f3b5d01a0..840027323a 100644 --- a/apps/wizard/mainwizard.cpp +++ b/apps/wizard/mainwizard.cpp @@ -1,8 +1,7 @@ #include "mainwizard.hpp" #include - -#include +#include #include #include #include diff --git a/apps/wizard/unshield/unshieldworker.cpp b/apps/wizard/unshield/unshieldworker.cpp index 3b68f87cc1..8ff0690667 100644 --- a/apps/wizard/unshield/unshieldworker.cpp +++ b/apps/wizard/unshield/unshieldworker.cpp @@ -1,16 +1,13 @@ #include "unshieldworker.hpp" #include - #include -#include #include #include #include #include #include #include -#include Wizard::UnshieldWorker::UnshieldWorker(qint64 expectedMorrowindBsaSize, QObject *parent) : QObject(parent), diff --git a/apps/wizard/unshield/unshieldworker.hpp b/apps/wizard/unshield/unshieldworker.hpp index 483264e990..6e37e734d6 100644 --- a/apps/wizard/unshield/unshieldworker.hpp +++ b/apps/wizard/unshield/unshieldworker.hpp @@ -2,8 +2,6 @@ #define UNSHIELDWORKER_HPP #include -#include -#include #include #include #include diff --git a/components/config/settingsbase.hpp b/components/config/settingsbase.hpp index 03ce9d3551..595fb9d78f 100644 --- a/components/config/settingsbase.hpp +++ b/components/config/settingsbase.hpp @@ -5,7 +5,6 @@ #include #include #include -#include namespace Config { diff --git a/components/contentselector/model/contentmodel.cpp b/components/contentselector/model/contentmodel.cpp index c1d35ad1e2..8f69f6bc0f 100644 --- a/components/contentselector/model/contentmodel.cpp +++ b/components/contentselector/model/contentmodel.cpp @@ -5,7 +5,6 @@ #include #include -#include #include #include diff --git a/components/contentselector/model/esmfile.cpp b/components/contentselector/model/esmfile.cpp index c6223128a4..60ca199a3b 100644 --- a/components/contentselector/model/esmfile.cpp +++ b/components/contentselector/model/esmfile.cpp @@ -1,6 +1,5 @@ #include "esmfile.hpp" -#include #include int ContentSelectorModel::EsmFile::sPropertyCount = 7; diff --git a/components/contentselector/view/combobox.cpp b/components/contentselector/view/combobox.cpp index 742e236b30..310806240d 100644 --- a/components/contentselector/view/combobox.cpp +++ b/components/contentselector/view/combobox.cpp @@ -1,6 +1,8 @@ #include #include +#include + #include "combobox.hpp" ContentSelectorView::ComboBox::ComboBox(QWidget *parent) : diff --git a/components/contentselector/view/combobox.hpp b/components/contentselector/view/combobox.hpp index 9af3c83af8..ebca824c3d 100644 --- a/components/contentselector/view/combobox.hpp +++ b/components/contentselector/view/combobox.hpp @@ -2,7 +2,6 @@ #define COMBOBOX_HPP #include -#include class QString; class QRegExpValidator; diff --git a/components/contentselector/view/contentselector.cpp b/components/contentselector/view/contentselector.cpp index 441caa3b23..0a12b01942 100644 --- a/components/contentselector/view/contentselector.cpp +++ b/components/contentselector/view/contentselector.cpp @@ -3,10 +3,7 @@ #include #include - #include -#include - #include #include diff --git a/components/process/processinvoker.cpp b/components/process/processinvoker.cpp index 7c45c865a1..54462acb9c 100644 --- a/components/process/processinvoker.cpp +++ b/components/process/processinvoker.cpp @@ -4,8 +4,10 @@ #include #include #include -#include + +#if defined(Q_OS_MAC) #include +#endif Process::ProcessInvoker::ProcessInvoker(QObject* parent) : QObject(parent)