From f7e9ffb2006b1234e13fa0831bad13bd76d27d09 Mon Sep 17 00:00:00 2001
From: "Joachim Wuttke (o)" <j.wuttke@fz-juelich.de>
Date: Fri, 3 Mar 2023 16:16:12 +0100
Subject: [PATCH] rm spurious includes from GUI/View/C-F
---
GUI/View/Common/IntensityDataPropertyWidget.cpp | 4 ----
GUI/View/Device/AxisPropertyForm.cpp | 3 ---
GUI/View/Device/BackgroundForm.cpp | 2 --
GUI/View/Device/DetectorAlignmentForm.cpp | 2 --
GUI/View/Device/FootprintForm.cpp | 1 -
GUI/View/Device/RectangularDetectorForm.cpp | 5 -----
GUI/View/Device/ResolutionForm.cpp | 1 -
GUI/View/Device/SphericalAxisForm.cpp | 2 --
GUI/View/Fit/FitActivityPanel.cpp | 4 ----
GUI/View/Fit/FitObjectiveBuilder.cpp | 1 -
GUI/View/Fit/FitParameterWidget.cpp | 6 ------
GUI/View/Fit/FitSessionController.cpp | 2 --
GUI/View/Fit/FitSessionManager.cpp | 1 -
GUI/View/Fit/FitSessionWidget.cpp | 1 -
GUI/View/Fit/FitWorker.cpp | 1 -
GUI/View/Fit/GUIFitObserver.cpp | 1 -
GUI/View/Fit/JobMessagePanel.cpp | 1 -
GUI/View/Fit/JobRealTimeWidget.cpp | 1 -
GUI/View/Fit/MinimizerSettingsWidget.cpp | 7 -------
GUI/View/Fit/ParameterTuningDelegate.cpp | 12 ------------
GUI/View/Fit/ParameterTuningWidget.cpp | 1 -
GUI/View/Fit/RunFitControlWidget.cpp | 2 --
GUI/View/Fit/SliderSettingsWidget.cpp | 2 --
23 files changed, 63 deletions(-)
diff --git a/GUI/View/Common/IntensityDataPropertyWidget.cpp b/GUI/View/Common/IntensityDataPropertyWidget.cpp
index be5cf942250..67836d8b180 100644
--- a/GUI/View/Common/IntensityDataPropertyWidget.cpp
+++ b/GUI/View/Common/IntensityDataPropertyWidget.cpp
@@ -14,15 +14,11 @@
#include "GUI/View/Common/IntensityDataPropertyWidget.h"
#include "Base/Util/Assert.h"
-#include "GUI/Model/Data/ComboProperty.h"
#include "GUI/Model/Data/IntensityDataItem.h"
#include "GUI/Model/Device/AxesItems.h"
#include "GUI/Model/Project/ProjectDocument.h"
-#include "GUI/View/Numeric/DoubleSpinBox.h"
#include "GUI/View/Numeric/NumWidgetUtils.h"
#include "GUI/View/Tool/LayoutUtils.h"
-#include <QCheckBox>
-#include <QFormLayout>
#include <QGroupBox>
#include <QLineEdit>
diff --git a/GUI/View/Device/AxisPropertyForm.cpp b/GUI/View/Device/AxisPropertyForm.cpp
index cbef26e285e..cb77a5add0d 100644
--- a/GUI/View/Device/AxisPropertyForm.cpp
+++ b/GUI/View/Device/AxisPropertyForm.cpp
@@ -18,9 +18,6 @@
#include "GUI/View/Numeric/DoubleSpinBox.h"
#include "GUI/View/Numeric/NumWidgetUtils.h"
#include "GUI/View/Tool/GroupBoxCollapser.h"
-#include <QFormLayout>
-#include <QGroupBox>
-#include <QSpinBox>
AxisPropertyForm::AxisPropertyForm(QWidget* parent, const QString& groupTitle,
AxisProperty* axisProperty, QString nbinsTooltip)
diff --git a/GUI/View/Device/BackgroundForm.cpp b/GUI/View/Device/BackgroundForm.cpp
index b4703a1d72e..507a161dd76 100644
--- a/GUI/View/Device/BackgroundForm.cpp
+++ b/GUI/View/Device/BackgroundForm.cpp
@@ -13,12 +13,10 @@
// ************************************************************************************************
#include "GUI/View/Device/BackgroundForm.h"
-#include "GUI/Model/Device/BackgroundItems.h"
#include "GUI/Model/Device/InstrumentItems.h"
#include "GUI/View/Numeric/DoubleSpinBox.h"
#include "GUI/View/Numeric/NumWidgetUtils.h"
#include "GUI/View/Tool/GroupBoxCollapser.h"
-#include <QFormLayout>
BackgroundForm::BackgroundForm(QWidget* parent, InstrumentItem* instrument)
: QGroupBox("Environment", parent)
diff --git a/GUI/View/Device/DetectorAlignmentForm.cpp b/GUI/View/Device/DetectorAlignmentForm.cpp
index b2ec3a2328a..b92703017f5 100644
--- a/GUI/View/Device/DetectorAlignmentForm.cpp
+++ b/GUI/View/Device/DetectorAlignmentForm.cpp
@@ -16,8 +16,6 @@
#include "GUI/Model/Device/RectangularDetectorItem.h"
#include "GUI/View/Numeric/DoubleSpinBox.h"
#include "GUI/View/Numeric/NumWidgetUtils.h"
-#include <QComboBox>
-#include <QFormLayout>
#include <QLabel>
namespace {
diff --git a/GUI/View/Device/FootprintForm.cpp b/GUI/View/Device/FootprintForm.cpp
index bb4997389bc..19f652aeb4f 100644
--- a/GUI/View/Device/FootprintForm.cpp
+++ b/GUI/View/Device/FootprintForm.cpp
@@ -18,7 +18,6 @@
#include "GUI/View/Numeric/DoubleSpinBox.h"
#include "GUI/View/Numeric/NumWidgetUtils.h"
#include "GUI/View/Tool/GroupBoxCollapser.h"
-#include <QFormLayout>
FootprintForm::FootprintForm(QWidget* parent, ScanItem* item)
: QGroupBox("Footprint correction", parent)
diff --git a/GUI/View/Device/RectangularDetectorForm.cpp b/GUI/View/Device/RectangularDetectorForm.cpp
index 97e71d78add..12b8c3160f2 100644
--- a/GUI/View/Device/RectangularDetectorForm.cpp
+++ b/GUI/View/Device/RectangularDetectorForm.cpp
@@ -13,7 +13,6 @@
// ************************************************************************************************
#include "GUI/View/Device/RectangularDetectorForm.h"
-#include "GUI/Model/Device/AxesItems.h"
#include "GUI/Model/Device/RectangularDetectorItem.h"
#include "GUI/View/Device/DetectorAlignmentForm.h"
#include "GUI/View/Device/ResolutionForm.h"
@@ -21,10 +20,6 @@
#include "GUI/View/Numeric/SafeSpinBox.h"
#include "GUI/View/Tool/GroupBoxCollapser.h"
#include <QFormLayout>
-#include <QGridLayout>
-#include <QGroupBox>
-#include <QSpinBox>
-#include <QVBoxLayout>
RectangularDetectorForm::RectangularDetectorForm(QWidget* parent, RectangularDetectorItem* detector)
: QWidget(parent)
diff --git a/GUI/View/Device/ResolutionForm.cpp b/GUI/View/Device/ResolutionForm.cpp
index 05b97400ea5..ed227ba3629 100644
--- a/GUI/View/Device/ResolutionForm.cpp
+++ b/GUI/View/Device/ResolutionForm.cpp
@@ -18,7 +18,6 @@
#include "GUI/View/Numeric/DoubleSpinBox.h"
#include "GUI/View/Numeric/NumWidgetUtils.h"
#include "GUI/View/Tool/GroupBoxCollapser.h"
-#include <QFormLayout>
ResolutionForm::ResolutionForm(Unit unit, QWidget* parent, DetectorItem* item)
: QGroupBox("Resolution function", parent)
diff --git a/GUI/View/Device/SphericalAxisForm.cpp b/GUI/View/Device/SphericalAxisForm.cpp
index bb15c44c5cc..944b91e7a06 100644
--- a/GUI/View/Device/SphericalAxisForm.cpp
+++ b/GUI/View/Device/SphericalAxisForm.cpp
@@ -15,8 +15,6 @@
#include "GUI/View/Device/SphericalAxisForm.h"
#include "GUI/Model/Device/AxesItems.h"
#include "GUI/View/Numeric/SafeSpinBox.h"
-#include <QFormLayout>
-#include <QGroupBox>
SphericalAxisForm::SphericalAxisForm(QFormLayout* form, QWidget* parent)
: QObject(parent)
diff --git a/GUI/View/Fit/FitActivityPanel.cpp b/GUI/View/Fit/FitActivityPanel.cpp
index cc259f5197e..26207336d7e 100644
--- a/GUI/View/Fit/FitActivityPanel.cpp
+++ b/GUI/View/Fit/FitActivityPanel.cpp
@@ -13,8 +13,6 @@
// ************************************************************************************************
#include "GUI/View/Fit/FitActivityPanel.h"
-#include "GUI/Model/Job/JobItem.h"
-#include "GUI/Model/Model/JobModel.h"
#include "GUI/View/Fit/FitSessionController.h"
#include "GUI/View/Fit/FitSessionManager.h"
#include "GUI/View/Fit/FitSessionWidget.h"
@@ -22,9 +20,7 @@
#include "GUI/View/Fit/RunFitControlWidget.h"
#include "GUI/View/Tool/mainwindow_constants.h"
#include <QLabel>
-#include <QPushButton>
#include <QSettings>
-#include <QStackedWidget>
#include <QVBoxLayout>
FitActivityPanel::FitActivityPanel(QWidget* parent)
diff --git a/GUI/View/Fit/FitObjectiveBuilder.cpp b/GUI/View/Fit/FitObjectiveBuilder.cpp
index 0bf614eb44e..03d65373ba8 100644
--- a/GUI/View/Fit/FitObjectiveBuilder.cpp
+++ b/GUI/View/Fit/FitObjectiveBuilder.cpp
@@ -24,7 +24,6 @@
#include "GUI/Model/Job/JobItem.h"
#include "GUI/Model/Job/MinimizerItem.h"
#include "GUI/Model/ToCore/SimulationToCore.h"
-#include "GUI/Support/Util/Error.h"
#include "GUI/View/Fit/GUIFitObserver.h"
#include "Sim/Fitting/FitObjective.h"
#include "Sim/Fitting/ObjectiveMetric.h"
diff --git a/GUI/View/Fit/FitParameterWidget.cpp b/GUI/View/Fit/FitParameterWidget.cpp
index 21d1c3100ff..af0b0c39f2f 100644
--- a/GUI/View/Fit/FitParameterWidget.cpp
+++ b/GUI/View/Fit/FitParameterWidget.cpp
@@ -15,12 +15,8 @@
#include "GUI/View/Fit/FitParameterWidget.h"
#include "Base/Util/Assert.h"
#include "GUI/Model/Job/FitParameterContainerItem.h"
-#include "GUI/Model/Job/FitParameterItem.h"
-#include "GUI/Model/Job/FitParameterLinkItem.h"
-#include "GUI/Model/Job/JobItem.h"
#include "GUI/Model/Job/ParameterTreeItems.h"
#include "GUI/Model/Model/FitParameterModel.h"
-#include "GUI/Model/Model/JobModel.h"
#include "GUI/Model/Project/ProjectDocument.h"
#include "GUI/Support/Util/CustomEventFilters.h"
#include "GUI/View/Fit/FitParameterDelegate.h"
@@ -28,13 +24,11 @@
#include "GUI/View/Info/OverlayLabelController.h"
#include <QAction>
#include <QHeaderView>
-#include <QItemSelection>
#include <QMenu>
#include <QTreeView>
#include <QVBoxLayout>
#include <boost/polymorphic_cast.hpp>
-using boost::polymorphic_downcast;
FitParameterWidget::FitParameterWidget(QWidget* parent)
: DataAccessWidget(parent)
diff --git a/GUI/View/Fit/FitSessionController.cpp b/GUI/View/Fit/FitSessionController.cpp
index de87731c269..1c7f09f8c95 100644
--- a/GUI/View/Fit/FitSessionController.cpp
+++ b/GUI/View/Fit/FitSessionController.cpp
@@ -16,11 +16,9 @@
#include "Base/Util/Assert.h"
#include "GUI/Model/Data/IntensityDataItem.h"
#include "GUI/Model/Job/FitParameterContainerItem.h"
-#include "GUI/Model/Job/FitParameterItem.h"
#include "GUI/Model/Job/FitSuiteItem.h"
#include "GUI/Model/Job/JobItem.h"
#include "GUI/Support/Util/Error.h"
-#include "GUI/Support/Util/Path.h"
#include "GUI/View/Fit/FitLog.h"
#include "GUI/View/Fit/FitObjectiveBuilder.h"
#include "GUI/View/Fit/FitWorkerLauncher.h"
diff --git a/GUI/View/Fit/FitSessionManager.cpp b/GUI/View/Fit/FitSessionManager.cpp
index e00c9badc18..a87a01c681f 100644
--- a/GUI/View/Fit/FitSessionManager.cpp
+++ b/GUI/View/Fit/FitSessionManager.cpp
@@ -15,7 +15,6 @@
#include "GUI/View/Fit/FitSessionManager.h"
#include "GUI/Model/Job/JobItem.h"
#include "GUI/Support/Util/Error.h"
-#include "GUI/View/Fit/FitLog.h"
#include "GUI/View/Fit/FitSessionController.h"
FitSessionManager::FitSessionManager(QObject* parent)
diff --git a/GUI/View/Fit/FitSessionWidget.cpp b/GUI/View/Fit/FitSessionWidget.cpp
index 9124bbfd320..42e055268cf 100644
--- a/GUI/View/Fit/FitSessionWidget.cpp
+++ b/GUI/View/Fit/FitSessionWidget.cpp
@@ -14,7 +14,6 @@
#include "GUI/View/Fit/FitSessionWidget.h"
#include "Base/Util/Assert.h"
-#include "GUI/Model/Job/JobItem.h"
#include "GUI/View/Fit/FitParameterWidget.h"
#include "GUI/View/Fit/FitSessionController.h"
#include "GUI/View/Fit/MinimizerSettingsWidget.h"
diff --git a/GUI/View/Fit/FitWorker.cpp b/GUI/View/Fit/FitWorker.cpp
index 9c98526fd42..3d2788aafce 100644
--- a/GUI/View/Fit/FitWorker.cpp
+++ b/GUI/View/Fit/FitWorker.cpp
@@ -14,7 +14,6 @@
#include "GUI/View/Fit/FitWorker.h"
#include "GUI/View/Fit/FitObjectiveBuilder.h"
-#include <QDateTime>
void FitWorker::startFit()
{
diff --git a/GUI/View/Fit/GUIFitObserver.cpp b/GUI/View/Fit/GUIFitObserver.cpp
index a6f9aee8989..8611c269bb2 100644
--- a/GUI/View/Fit/GUIFitObserver.cpp
+++ b/GUI/View/Fit/GUIFitObserver.cpp
@@ -14,7 +14,6 @@
#include "GUI/View/Fit/GUIFitObserver.h"
#include "Fit/Minimizer/MinimizerResult.h"
-#include "Fit/Tools/MinimizerUtils.h"
#include "Sim/Fitting/FitObjective.h"
#include "Sim/Fitting/IterationInfo.h"
#include "Sim/Fitting/SimDataPair.h"
diff --git a/GUI/View/Fit/JobMessagePanel.cpp b/GUI/View/Fit/JobMessagePanel.cpp
index c58f489f3ed..e048b5bbd52 100644
--- a/GUI/View/Fit/JobMessagePanel.cpp
+++ b/GUI/View/Fit/JobMessagePanel.cpp
@@ -16,7 +16,6 @@
#include "GUI/View/Tool/mainwindow_constants.h"
#include <QScrollBar>
#include <QSettings>
-#include <QTextEdit>
namespace {
diff --git a/GUI/View/Fit/JobRealTimeWidget.cpp b/GUI/View/Fit/JobRealTimeWidget.cpp
index ac8a2e8c88d..1137ae4cf79 100644
--- a/GUI/View/Fit/JobRealTimeWidget.cpp
+++ b/GUI/View/Fit/JobRealTimeWidget.cpp
@@ -13,7 +13,6 @@
// ************************************************************************************************
#include "GUI/View/Fit/JobRealTimeWidget.h"
-#include "GUI/Model/Job/JobItem.h"
#include "GUI/Model/Model/JobModel.h"
#include "GUI/View/Fit/ParameterTuningWidget.h"
#include "GUI/View/Tool/mainwindow_constants.h"
diff --git a/GUI/View/Fit/MinimizerSettingsWidget.cpp b/GUI/View/Fit/MinimizerSettingsWidget.cpp
index 8d6c0fd5273..39e90b6a3da 100644
--- a/GUI/View/Fit/MinimizerSettingsWidget.cpp
+++ b/GUI/View/Fit/MinimizerSettingsWidget.cpp
@@ -15,17 +15,10 @@
#include "GUI/View/Fit/MinimizerSettingsWidget.h"
#include "Base/Util/Assert.h"
#include "GUI/Model/Job/FitSuiteItem.h"
-#include "GUI/Model/Job/JobItem.h"
#include "GUI/Model/Project/ProjectDocument.h"
-#include "GUI/View/Numeric/DoubleSpinBox.h"
#include "GUI/View/Numeric/NumWidgetUtils.h"
-#include "GUI/View/Numeric/SafeSpinBox.h"
#include "GUI/View/Tool/LayoutUtils.h"
-#include <QComboBox>
-#include <QFormLayout>
-#include <QPushButton>
#include <QStandardItemModel>
-#include <QVBoxLayout>
MinimizerSettingsWidget::MinimizerSettingsWidget(QWidget* parent)
: QWidget(parent)
diff --git a/GUI/View/Fit/ParameterTuningDelegate.cpp b/GUI/View/Fit/ParameterTuningDelegate.cpp
index 0493ca8244f..011090741b7 100644
--- a/GUI/View/Fit/ParameterTuningDelegate.cpp
+++ b/GUI/View/Fit/ParameterTuningDelegate.cpp
@@ -17,19 +17,7 @@
#include "GUI/Model/Model/ParameterTuningModel.h"
#include "GUI/Model/Project/ProjectDocument.h"
#include "GUI/View/Numeric/ScientificSpinBox.h"
-#include <QAbstractItemModel>
-#include <QApplication>
#include <QHBoxLayout>
-#include <QItemSelectionModel>
-#include <QMouseEvent>
-#include <QPaintDevice>
-#include <QPainter>
-#include <QRect>
-#include <QStyleOptionSlider>
-#include <QWidget>
-#include <cmath>
-#include <iostream>
-#include <limits>
namespace {
diff --git a/GUI/View/Fit/ParameterTuningWidget.cpp b/GUI/View/Fit/ParameterTuningWidget.cpp
index 085fe09df27..87cf15ea1ae 100644
--- a/GUI/View/Fit/ParameterTuningWidget.cpp
+++ b/GUI/View/Fit/ParameterTuningWidget.cpp
@@ -16,7 +16,6 @@
#include "Base/Util/Assert.h"
#include "GUI/Model/Data/IntensityDataItem.h"
#include "GUI/Model/Job/ParameterTreeItems.h"
-#include "GUI/Model/Model/JobModel.h"
#include "GUI/Model/Model/ParameterTuningModel.h"
#include "GUI/Model/Project/ProjectDocument.h"
#include "GUI/Support/Util/Error.h"
diff --git a/GUI/View/Fit/RunFitControlWidget.cpp b/GUI/View/Fit/RunFitControlWidget.cpp
index 939ca315554..0774c4fe930 100644
--- a/GUI/View/Fit/RunFitControlWidget.cpp
+++ b/GUI/View/Fit/RunFitControlWidget.cpp
@@ -15,12 +15,10 @@
#include "GUI/View/Fit/RunFitControlWidget.h"
#include "Base/Util/Assert.h"
#include "GUI/Model/Job/FitSuiteItem.h"
-#include "GUI/Model/Job/JobItem.h"
#include "GUI/Model/Project/ProjectDocument.h"
#include "GUI/View/Info/CautionSign.h"
#include "GUI/View/Tool/DesignerHelper.h"
#include "GUI/View/Tool/mainwindow_constants.h"
-#include <QFont>
#include <QHBoxLayout>
#include <QLabel>
#include <QPushButton>
diff --git a/GUI/View/Fit/SliderSettingsWidget.cpp b/GUI/View/Fit/SliderSettingsWidget.cpp
index 727d79a7095..a391abbce96 100644
--- a/GUI/View/Fit/SliderSettingsWidget.cpp
+++ b/GUI/View/Fit/SliderSettingsWidget.cpp
@@ -15,8 +15,6 @@
#include "GUI/View/Fit/SliderSettingsWidget.h"
#include "GUI/Model/Data/IntensityDataItem.h"
#include "GUI/Model/Project/ProjectDocument.h"
-#include <QGroupBox>
-#include <QHBoxLayout>
#include <QLabel>
#include <QVBoxLayout>
--
GitLab