From 785273e7bfa2a079125946d646a4a07fa6177e48 Mon Sep 17 00:00:00 2001 From: Ingo Weyrich Date: Fri, 1 Nov 2019 01:03:30 +0100 Subject: [PATCH] Further reduction of include dependencies --- rtengine/curves.cc | 2 +- rtengine/curves.h | 2 +- rtengine/dynamicprofile.cc | 1 + rtengine/dynamicprofile.h | 6 +++++- rtengine/profilestore.h | 3 ++- rtgui/batchqueueentry.h | 7 ++++++- rtgui/bqentryupdater.h | 10 +++++++++- rtgui/clipboard.h | 2 +- rtgui/main-cli.cc | 1 + rtgui/paramsedited.h | 14 +++++++++++++- rtgui/partialpastedlg.h | 12 +++++++++++- rtgui/pparamschangelistener.h | 15 ++++++++++++++- rtgui/profilechangelistener.h | 3 ++- rtgui/profilepanel.cc | 1 + rtgui/profilepanel.h | 16 +++++++++++++++- rtgui/profilestorecombobox.h | 1 - rtgui/thumbimageupdater.h | 13 ++++++++++++- rtgui/toolpanel.h | 13 +++++++++++++ rtgui/whitebalance.cc | 2 +- 19 files changed, 109 insertions(+), 15 deletions(-) diff --git a/rtengine/curves.cc b/rtengine/curves.cc index a7e3337c8..eb6cc57c3 100644 --- a/rtengine/curves.cc +++ b/rtengine/curves.cc @@ -514,7 +514,7 @@ void CurveFactory::complexCurve (double ecomp, double black, double hlcompr, dou double shcompr, double br, double contr, const std::vector& curvePoints, const std::vector& curvePoints2, - LUTu & histogram, + const LUTu & histogram, LUTf & hlCurve, LUTf & shCurve, LUTf & outCurve, LUTu & outBeforeCCurveHistogram, ToneCurve & customToneCurve1, diff --git a/rtengine/curves.h b/rtengine/curves.h index 4d38e9cce..9c5a84eac 100644 --- a/rtengine/curves.h +++ b/rtengine/curves.h @@ -352,7 +352,7 @@ public: public: static void complexCurve (double ecomp, double black, double hlcompr, double hlcomprthresh, double shcompr, double br, double contr, const std::vector& curvePoints, const std::vector& curvePoints2, - LUTu & histogram, LUTf & hlCurve, LUTf & shCurve, LUTf & outCurve, LUTu & outBeforeCCurveHistogram, ToneCurve & outToneCurve, ToneCurve & outToneCurve2, + const LUTu & histogram, LUTf & hlCurve, LUTf & shCurve, LUTf & outCurve, LUTu & outBeforeCCurveHistogram, ToneCurve & outToneCurve, ToneCurve & outToneCurve2, int skip = 1); static void curveBW (const std::vector& curvePointsbw, const std::vector& curvePointsbw2, const LUTu & histogrambw, LUTu & outBeforeCCurveHistogrambw, diff --git a/rtengine/dynamicprofile.cc b/rtengine/dynamicprofile.cc index 0e3d75b43..617ec2747 100644 --- a/rtengine/dynamicprofile.cc +++ b/rtengine/dynamicprofile.cc @@ -24,6 +24,7 @@ #include #include +#include "rtengine.h" #include "../rtgui/options.h" using namespace rtengine; diff --git a/rtengine/dynamicprofile.h b/rtengine/dynamicprofile.h index 9b893fae2..d91b91aee 100644 --- a/rtengine/dynamicprofile.h +++ b/rtengine/dynamicprofile.h @@ -20,7 +20,11 @@ #include #include -#include "../rtengine/rtengine.h" + +namespace rtengine +{ + class FramesMetaData; +} class DynamicProfileRule { diff --git a/rtengine/profilestore.h b/rtengine/profilestore.h index 08afc88f3..ee913947f 100644 --- a/rtengine/profilestore.h +++ b/rtengine/profilestore.h @@ -25,7 +25,8 @@ #include "dynamicprofile.h" #include "noncopyable.h" -#include "rtengine.h" +#include "procparams.h" +#include "../rtgui/threadutils.h" // forward decl namespace rtengine diff --git a/rtgui/batchqueueentry.h b/rtgui/batchqueueentry.h index d56c0e340..bc93949e0 100644 --- a/rtgui/batchqueueentry.h +++ b/rtgui/batchqueueentry.h @@ -27,7 +27,12 @@ #include "thumbnail.h" #include "../rtengine/noncopyable.h" -#include "../rtengine/rtengine.h" +#include "../rtengine/procparams.h" + +namespace rtengine +{ + class ProcessingJob; +} class BatchQueueEntry; struct BatchQueueEntryIdleHelper { diff --git a/rtgui/bqentryupdater.h b/rtgui/bqentryupdater.h index 6dbb4bedf..1e71c0fc0 100644 --- a/rtgui/bqentryupdater.h +++ b/rtgui/bqentryupdater.h @@ -23,8 +23,16 @@ #include "threadutils.h" #include "thumbnail.h" -#include "../rtengine/rtengine.h" +namespace rtengine +{ +namespace procparams +{ +class ProcParams; + +} + +} class BQEntryUpdateListener { diff --git a/rtgui/clipboard.h b/rtgui/clipboard.h index 7d25dd0d5..5e0c4b67d 100644 --- a/rtgui/clipboard.h +++ b/rtgui/clipboard.h @@ -25,7 +25,6 @@ #include "../rtengine/diagonalcurvetypes.h" #include "../rtengine/flatcurvetypes.h" -#include "../rtengine/rtengine.h" namespace rtengine { @@ -34,6 +33,7 @@ namespace procparams { class PartialProfile; +class IPTCPairs; } diff --git a/rtgui/main-cli.cc b/rtgui/main-cli.cc index 8310867df..c60cba070 100644 --- a/rtgui/main-cli.cc +++ b/rtgui/main-cli.cc @@ -33,6 +33,7 @@ #include #include "../rtengine/procparams.h" #include "../rtengine/profilestore.h" +#include "../rtengine/rtengine.h" #include "options.h" #include "soundman.h" #include "rtimage.h" diff --git a/rtgui/paramsedited.h b/rtgui/paramsedited.h index e435e2291..ec83e82cd 100644 --- a/rtgui/paramsedited.h +++ b/rtgui/paramsedited.h @@ -20,7 +20,19 @@ #include -#include "../rtengine/rtengine.h" +namespace rtengine +{ + +namespace procparams +{ + +class ProcParams; + +struct PartialProfile; + +} + +} struct GeneralParamsEdited { bool rank; diff --git a/rtgui/partialpastedlg.h b/rtgui/partialpastedlg.h index 6c4228061..da6c9251a 100644 --- a/rtgui/partialpastedlg.h +++ b/rtgui/partialpastedlg.h @@ -20,7 +20,17 @@ #include -#include "../rtengine/rtengine.h" +namespace rtengine +{ +namespace procparams +{ + +class ProcParams; + + +} + +} struct ParamsEdited; diff --git a/rtgui/pparamschangelistener.h b/rtgui/pparamschangelistener.h index de590dd9f..5d457e882 100644 --- a/rtgui/pparamschangelistener.h +++ b/rtgui/pparamschangelistener.h @@ -22,7 +22,20 @@ #include "paramsedited.h" -#include "../rtengine/rtengine.h" +namespace rtengine +{ + +class ProcEvent; + +namespace procparams +{ + +class ProcParams; + + +} + +} class PParamsChangeListener { diff --git a/rtgui/profilechangelistener.h b/rtgui/profilechangelistener.h index c2e3f2654..58c565393 100644 --- a/rtgui/profilechangelistener.h +++ b/rtgui/profilechangelistener.h @@ -20,14 +20,15 @@ #include -#include "../rtengine/rtengine.h" namespace rtengine { +class ProcEvent; namespace procparams { +class ProcParams; class PartialProfile; } diff --git a/rtgui/profilepanel.cc b/rtgui/profilepanel.cc index 723bbfd61..53e1cd583 100644 --- a/rtgui/profilepanel.cc +++ b/rtgui/profilepanel.cc @@ -26,6 +26,7 @@ #include "rtimage.h" #include "../rtengine/procparams.h" +#include "../rtengine/procevents.h" using namespace rtengine; using namespace rtengine::procparams; diff --git a/rtgui/profilepanel.h b/rtgui/profilepanel.h index 378b2a984..1e1a249bb 100644 --- a/rtgui/profilepanel.h +++ b/rtgui/profilepanel.h @@ -29,8 +29,22 @@ #include "profilestorecombobox.h" #include "../rtengine/noncopyable.h" -#include "../rtengine/rtengine.h" +namespace rtengine +{ + +class ProcEvent; + +namespace procparams +{ + +class ProcParams; + +struct PartialProfile; + +} + +} class RTImage; class ProfilePanel : diff --git a/rtgui/profilestorecombobox.h b/rtgui/profilestorecombobox.h index 447d2e157..6a74f8f71 100644 --- a/rtgui/profilestorecombobox.h +++ b/rtgui/profilestorecombobox.h @@ -28,7 +28,6 @@ #include "threadutils.h" #include "../rtengine/profilestore.h" -#include "../rtengine/rtengine.h" /** * @brief subclass of Gtk::Label with extra fields for Combobox and Menu, to link with a ProfileStoreEntry diff --git a/rtgui/thumbimageupdater.h b/rtgui/thumbimageupdater.h index 6c4171a87..cdf65bd62 100644 --- a/rtgui/thumbimageupdater.h +++ b/rtgui/thumbimageupdater.h @@ -22,9 +22,20 @@ #include "thumbbrowserentrybase.h" -#include "../rtengine/rtengine.h" #include "../rtengine/noncopyable.h" +namespace rtengine +{ + class IImage8; + +namespace procparams +{ + + struct CropParams; + +} + +} class ThumbImageUpdateListener { public: diff --git a/rtgui/toolpanel.h b/rtgui/toolpanel.h index aeb0f60a6..ee4f00e52 100644 --- a/rtgui/toolpanel.h +++ b/rtgui/toolpanel.h @@ -30,6 +30,19 @@ #include "../rtengine/noncopyable.h" #include "../rtengine/rtengine.h" +class ParamsEdited; + +namespace rtengine +{ + class ProcEvent; + +namespace procparams +{ + +class ProcParams; +} +} + class FoldableToolPanel; class ToolPanel; diff --git a/rtgui/whitebalance.cc b/rtgui/whitebalance.cc index 109fb7502..2ab09c10a 100644 --- a/rtgui/whitebalance.cc +++ b/rtgui/whitebalance.cc @@ -55,7 +55,7 @@ void WhiteBalance::init () void WhiteBalance::cleanup () { - for (unsigned int i = 0; i < toUnderlying(WBEntry::Type::CUSTOM) + 1; i++) { + for (int i = 0; i < toUnderlying(WBEntry::Type::CUSTOM) + 1; i++) { wbPixbufs[i].reset(); } }