From 7e33fee1ac7980e44bcb11521c60fc6981c83155 Mon Sep 17 00:00:00 2001 From: Magne Sjaastad Date: Thu, 13 Mar 2025 10:50:14 +0100 Subject: [PATCH] Avoid include in headers --- .../ProjectDataModel/AnalysisPlots/RimAnalysisPlot.cpp | 1 + .../ProjectDataModel/Summary/RimSummaryEnsembleTools.cpp | 1 + .../ProjectDataModel/Summary/RimSummaryMultiPlot.cpp | 7 ++++--- .../ProjectDataModel/Summary/RimSummaryPlot.cpp | 1 + .../ProjectDataModel/Summary/RimSummaryPlot.h | 2 +- .../Summary/RimSummaryPlotAxisFormatter.cpp | 1 + ApplicationLibCode/UserInterface/RiuMatrixPlotWidget.cpp | 1 + ApplicationLibCode/UserInterface/RiuMatrixPlotWidget.h | 2 +- ApplicationLibCode/UserInterface/RiuSummaryQwtPlot.h | 2 +- 9 files changed, 12 insertions(+), 6 deletions(-) diff --git a/ApplicationLibCode/ProjectDataModel/AnalysisPlots/RimAnalysisPlot.cpp b/ApplicationLibCode/ProjectDataModel/AnalysisPlots/RimAnalysisPlot.cpp index 13c31e08d9..30d19b47c2 100644 --- a/ApplicationLibCode/ProjectDataModel/AnalysisPlots/RimAnalysisPlot.cpp +++ b/ApplicationLibCode/ProjectDataModel/AnalysisPlots/RimAnalysisPlot.cpp @@ -41,6 +41,7 @@ #include "RiuGroupedBarChartBuilder.h" #include "RiuPlotMainWindowTools.h" #include "RiuQwtPlotTools.h" +#include "RiuQwtPlotWidget.h" #include "RiuSummaryQwtPlot.h" #include "RiuSummaryVectorSelectionDialog.h" diff --git a/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryEnsembleTools.cpp b/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryEnsembleTools.cpp index 8ed5ea96ac..7b1839b70a 100644 --- a/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryEnsembleTools.cpp +++ b/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryEnsembleTools.cpp @@ -33,6 +33,7 @@ #include "RimSummaryPlot.h" #include "RiuPlotMainWindow.h" +#include "RiuQwtPlotWidget.h" #include "cafPdmUiTreeView.h" diff --git a/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryMultiPlot.cpp b/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryMultiPlot.cpp index 12ed404fb0..6c170ce998 100644 --- a/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryMultiPlot.cpp +++ b/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryMultiPlot.cpp @@ -21,6 +21,8 @@ #include "RiaApplication.h" #include "RiaNumericalTools.h" #include "RiaPlotDefines.h" +#include "RiaPreferences.h" +#include "RiaQDateTimeTools.h" #include "RiaTimeTTools.h" #include "Summary/RiaSummaryAddressAnalyzer.h" #include "Summary/RiaSummaryAddressModifier.h" @@ -50,10 +52,12 @@ #include "RimSummaryPlot.h" #include "RimSummaryPlotControls.h" #include "RimSummaryPlotNameHelper.h" +#include "RimSummaryPlotReadOut.h" #include "RimSummaryPlotSourceStepping.h" #include "RimSummaryTimeAxisProperties.h" #include "RiuPlotMainWindowTools.h" +#include "RiuQwtPlotWidget.h" #include "RiuSummaryMultiPlotBook.h" #include "RiuSummaryVectorSelectionUi.h" @@ -67,9 +71,6 @@ #include -#include "RiaPreferences.h" -#include "RiaQDateTimeTools.h" -#include "RimSummaryPlotReadOut.h" #include namespace caf diff --git a/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryPlot.cpp b/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryPlot.cpp index 331a1fa8ab..7cea22029b 100644 --- a/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryPlot.cpp +++ b/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryPlot.cpp @@ -64,6 +64,7 @@ #include "RiuPlotMainWindowTools.h" #include "RiuQwtPlotCurve.h" #include "RiuQwtPlotItem.h" +#include "RiuQwtPlotWidget.h" #include "RiuSummaryQwtPlot.h" #ifdef USE_QTCHARTS diff --git a/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryPlot.h b/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryPlot.h index 3488e5cdf2..e054e7e57b 100644 --- a/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryPlot.h +++ b/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryPlot.h @@ -25,7 +25,7 @@ #include "RimPlotAxisProperties.h" #include "RimSummaryDataSourceStepping.h" -#include "RiuQwtPlotWidget.h" +#include "RiuPlotWidget.h" #include "RiuSummaryPlot.h" #include "cafPdmChildArrayField.h" diff --git a/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryPlotAxisFormatter.cpp b/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryPlotAxisFormatter.cpp index b337f87385..d357bd0b5a 100644 --- a/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryPlotAxisFormatter.cpp +++ b/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryPlotAxisFormatter.cpp @@ -32,6 +32,7 @@ #include "Tools/RimPlotAxisTools.h" #include "RiuQtChartsPlotWidget.h" +#include "RiuQwtPlotWidget.h" #include "RiuSummaryQuantityNameInfoProvider.h" #include "RiuSummaryQwtPlot.h" diff --git a/ApplicationLibCode/UserInterface/RiuMatrixPlotWidget.cpp b/ApplicationLibCode/UserInterface/RiuMatrixPlotWidget.cpp index d52787db20..e923b82652 100644 --- a/ApplicationLibCode/UserInterface/RiuMatrixPlotWidget.cpp +++ b/ApplicationLibCode/UserInterface/RiuMatrixPlotWidget.cpp @@ -29,6 +29,7 @@ #include "RiuQwtLinearScaleEngine.h" #include "RiuQwtPlotItem.h" #include "RiuQwtPlotTools.h" +#include "RiuQwtPlotWidget.h" #include "RiuScalarMapperLegendFrame.h" #include "cvfColor3.h" diff --git a/ApplicationLibCode/UserInterface/RiuMatrixPlotWidget.h b/ApplicationLibCode/UserInterface/RiuMatrixPlotWidget.h index 5ce978beb7..11657e6cb7 100644 --- a/ApplicationLibCode/UserInterface/RiuMatrixPlotWidget.h +++ b/ApplicationLibCode/UserInterface/RiuMatrixPlotWidget.h @@ -20,7 +20,6 @@ #include "RiuInterfaceToViewWindow.h" #include "RiuPlotItem.h" -#include "RiuQwtPlotWidget.h" #include "cafPdmPointer.h" #include "cafSignal.h" @@ -35,6 +34,7 @@ class RimViewWindow; class RimRegularLegendConfig; class RiuAbstractLegendFrame; +class RiuQwtPlotWidget; class RiuMatrixPlotWidget : public QWidget, public RiuInterfaceToViewWindow, public caf::SignalEmitter { diff --git a/ApplicationLibCode/UserInterface/RiuSummaryQwtPlot.h b/ApplicationLibCode/UserInterface/RiuSummaryQwtPlot.h index ce8c7ea228..7518b74f7a 100644 --- a/ApplicationLibCode/UserInterface/RiuSummaryQwtPlot.h +++ b/ApplicationLibCode/UserInterface/RiuSummaryQwtPlot.h @@ -21,7 +21,6 @@ #include "RiaDateTimeDefines.h" #include "RiuInterfaceToViewWindow.h" -#include "RiuQwtPlotWidget.h" #include "RiuSummaryPlot.h" #include @@ -34,6 +33,7 @@ class RiuQwtPlotWheelZoomer; class RimPlotAxisPropertiesInterface; class RiuPlotAnnotationTool; class RiuQwtCurvePointTracker; +class RiuQwtPlotWidget; //================================================================================================== //