From e682b364b51febfbe7e53f67658d65987b62acdd Mon Sep 17 00:00:00 2001 From: Ingo Weyrich Date: Fri, 1 Nov 2019 14:51:33 +0100 Subject: [PATCH] Further reduction of include dependencies --- rtengine/bilateral2.h | 1 - rtengine/color.cc | 5 ++++- rtengine/imagefloat.cc | 1 - rtengine/improccoordinator.cc | 1 - rtengine/improcfun.cc | 5 ++++- rtengine/iptransform.cc | 1 - rtengine/ipvibrance.cc | 1 - rtengine/ipwavelet.cc | 1 - rtengine/profilestore.h | 3 ++- rtgui/batchqueueentry.h | 11 +++++++++-- rtgui/clipboard.cc | 1 + rtgui/clipboard.h | 6 +++--- rtgui/cropwindow.cc | 4 +++- rtgui/filebrowser.cc | 1 + rtgui/filebrowser.h | 2 +- rtgui/pparamschangelistener.h | 2 +- rtgui/profilepanel.cc | 1 + rtgui/profilepanel.h | 4 +++- rtgui/profilestorecombobox.h | 4 +--- rtgui/thumbbrowserbase.cc | 1 - rtgui/thumbbrowserentrybase.cc | 2 -- rtgui/thumbnail.cc | 8 ++++++-- rtgui/toolpanel.h | 2 -- 23 files changed, 40 insertions(+), 28 deletions(-) diff --git a/rtengine/bilateral2.h b/rtengine/bilateral2.h index a431bcecd..ecdcc7fe5 100644 --- a/rtengine/bilateral2.h +++ b/rtengine/bilateral2.h @@ -25,7 +25,6 @@ #include "array2D.h" #include "LUT.h" -#include "mytime.h" #include "rt_math.h" #ifdef _OPENMP diff --git a/rtengine/color.cc b/rtengine/color.cc index 20b2c7310..8437a36b1 100644 --- a/rtengine/color.cc +++ b/rtengine/color.cc @@ -20,11 +20,14 @@ #include "rtengine.h" #include "color.h" #include "iccmatrices.h" -#include "mytime.h" #include "sleef.c" #include "opthelper.h" #include "iccstore.h" +#ifdef _DEBUG +#include "mytime.h" +#endif + using namespace std; namespace rtengine diff --git a/rtengine/imagefloat.cc b/rtengine/imagefloat.cc index 3e80b617b..1da91a4b4 100644 --- a/rtengine/imagefloat.cc +++ b/rtengine/imagefloat.cc @@ -25,7 +25,6 @@ #include "labimage.h" #include #include "rtengine.h" -#include "mytime.h" #include "iccstore.h" #include "alignedbuffer.h" #include "rt_math.h" diff --git a/rtengine/improccoordinator.cc b/rtengine/improccoordinator.cc index 729682b0f..d5242f4df 100644 --- a/rtengine/improccoordinator.cc +++ b/rtengine/improccoordinator.cc @@ -33,7 +33,6 @@ #include "imagefloat.h" #include "improcfun.h" #include "labimage.h" -#include "mytime.h" #include "procparams.h" #include "refreshmap.h" diff --git a/rtengine/improcfun.cc b/rtengine/improcfun.cc index 886e49567..b1bff49a0 100644 --- a/rtengine/improcfun.cc +++ b/rtengine/improcfun.cc @@ -30,7 +30,6 @@ #include "improcfun.h" #include "curves.h" #include "dcp.h" -#include "mytime.h" #include "iccstore.h" #include "imagesource.h" #include "rtthumbnail.h" @@ -48,6 +47,10 @@ #include "../rtgui/ppversion.h" #include "../rtgui/editcallbacks.h" +#ifdef _DEBUG +#include "mytime.h" +#endif + #undef CLIPD #define CLIPD(a) ((a)>0.0f?((a)<1.0f?(a):1.0f):0.0f) diff --git a/rtengine/iptransform.cc b/rtengine/iptransform.cc index b6338b8d3..640fab2a6 100644 --- a/rtengine/iptransform.cc +++ b/rtengine/iptransform.cc @@ -25,7 +25,6 @@ #include "imagefloat.h" #include "improcfun.h" -#include "mytime.h" #include "procparams.h" #include "rt_math.h" #include "rtengine.h" diff --git a/rtengine/ipvibrance.cc b/rtengine/ipvibrance.cc index 1c5c6c4d5..b46cfb413 100644 --- a/rtengine/ipvibrance.cc +++ b/rtengine/ipvibrance.cc @@ -24,7 +24,6 @@ #include "improcfun.h" #include "iccstore.h" #include "labimage.h" -#include "mytime.h" #include "curves.h" #include "color.h" #include "procparams.h" diff --git a/rtengine/ipwavelet.cc b/rtengine/ipwavelet.cc index d550664b9..78a4dd509 100644 --- a/rtengine/ipwavelet.cc +++ b/rtengine/ipwavelet.cc @@ -36,7 +36,6 @@ #include "labimage.h" #include "LUT.h" #include "median.h" -#include "mytime.h" #include "opthelper.h" #include "procparams.h" #include "rt_math.h" diff --git a/rtengine/profilestore.h b/rtengine/profilestore.h index ee913947f..460facb72 100644 --- a/rtengine/profilestore.h +++ b/rtengine/profilestore.h @@ -25,7 +25,6 @@ #include "dynamicprofile.h" #include "noncopyable.h" -#include "procparams.h" #include "../rtgui/threadutils.h" // forward decl @@ -35,6 +34,8 @@ namespace rtengine namespace procparams { +class ProcParams; + class AutoPartialProfile; class PartialProfile; diff --git a/rtgui/batchqueueentry.h b/rtgui/batchqueueentry.h index bc93949e0..3161bded4 100644 --- a/rtgui/batchqueueentry.h +++ b/rtgui/batchqueueentry.h @@ -27,11 +27,18 @@ #include "thumbnail.h" #include "../rtengine/noncopyable.h" -#include "../rtengine/procparams.h" namespace rtengine { - class ProcessingJob; +class ProcessingJob; + +namespace procparams +{ + +class ProcParams; + +} + } class BatchQueueEntry; diff --git a/rtgui/clipboard.cc b/rtgui/clipboard.cc index 4cd50f574..f64f2ed07 100644 --- a/rtgui/clipboard.cc +++ b/rtgui/clipboard.cc @@ -18,6 +18,7 @@ */ #include "clipboard.h" +#include "paramsedited.h" #include "../rtengine/procparams.h" Clipboard clipboard; diff --git a/rtgui/clipboard.h b/rtgui/clipboard.h index 5e0c4b67d..1faf0b4d3 100644 --- a/rtgui/clipboard.h +++ b/rtgui/clipboard.h @@ -21,17 +21,17 @@ #include #include -#include "paramsedited.h" - #include "../rtengine/diagonalcurvetypes.h" #include "../rtengine/flatcurvetypes.h" +class ParamsEdited; + namespace rtengine { namespace procparams { - +class ProcParams; class PartialProfile; class IPTCPairs; diff --git a/rtgui/cropwindow.cc b/rtgui/cropwindow.cc index ef682cf1f..f0f4cbcba 100644 --- a/rtgui/cropwindow.cc +++ b/rtgui/cropwindow.cc @@ -17,6 +17,9 @@ * along with RawTherapee. If not, see . */ #include +#ifdef WIN32 +#include +#endif #include "cropwindow.h" @@ -32,7 +35,6 @@ #include "editwidgets.h" #include "../rtengine/dcrop.h" -#include "../rtengine/mytime.h" #include "../rtengine/procparams.h" #include "../rtengine/rt_math.h" diff --git a/rtgui/filebrowser.cc b/rtgui/filebrowser.cc index 5817222dd..bfd614ffd 100644 --- a/rtgui/filebrowser.cc +++ b/rtgui/filebrowser.cc @@ -29,6 +29,7 @@ #include "clipboard.h" #include "multilangmgr.h" #include "options.h" +#include "profilestorecombobox.h" #include "procparamchangers.h" #include "rtimage.h" #include "threadutils.h" diff --git a/rtgui/filebrowser.h b/rtgui/filebrowser.h index 74b491957..dc671fe85 100644 --- a/rtgui/filebrowser.h +++ b/rtgui/filebrowser.h @@ -29,7 +29,7 @@ #include "filebrowserentry.h" #include "partialpastedlg.h" #include "pparamschangelistener.h" -#include "profilestorecombobox.h" +#include "../rtengine/profilestore.h" #include "thumbbrowserbase.h" #include "../rtengine/noncopyable.h" diff --git a/rtgui/pparamschangelistener.h b/rtgui/pparamschangelistener.h index 5d457e882..449ebfca5 100644 --- a/rtgui/pparamschangelistener.h +++ b/rtgui/pparamschangelistener.h @@ -20,7 +20,7 @@ #include -#include "paramsedited.h" +class ParamsEdited; namespace rtengine { diff --git a/rtgui/profilepanel.cc b/rtgui/profilepanel.cc index 53e1cd583..4c8e30e44 100644 --- a/rtgui/profilepanel.cc +++ b/rtgui/profilepanel.cc @@ -22,6 +22,7 @@ #include "multilangmgr.h" #include "options.h" #include "profilestorecombobox.h" +#include "paramsedited.h" #include "pathutils.h" #include "rtimage.h" diff --git a/rtgui/profilepanel.h b/rtgui/profilepanel.h index 1e1a249bb..73d3a1949 100644 --- a/rtgui/profilepanel.h +++ b/rtgui/profilepanel.h @@ -26,10 +26,12 @@ #include "partialpastedlg.h" #include "pparamschangelistener.h" #include "profilechangelistener.h" -#include "profilestorecombobox.h" +#include "../rtengine/profilestore.h" #include "../rtengine/noncopyable.h" +class ProfileStoreComboBox; + namespace rtengine { diff --git a/rtgui/profilestorecombobox.h b/rtgui/profilestorecombobox.h index 6a74f8f71..bfd713235 100644 --- a/rtgui/profilestorecombobox.h +++ b/rtgui/profilestorecombobox.h @@ -24,11 +24,9 @@ #include #include "guiutils.h" -#include "paramsedited.h" #include "threadutils.h" -#include "../rtengine/profilestore.h" - +class ProfileStoreEntry; /** * @brief subclass of Gtk::Label with extra fields for Combobox and Menu, to link with a ProfileStoreEntry */ diff --git a/rtgui/thumbbrowserbase.cc b/rtgui/thumbbrowserbase.cc index f5f4076bb..b660afc61 100644 --- a/rtgui/thumbbrowserbase.cc +++ b/rtgui/thumbbrowserbase.cc @@ -22,7 +22,6 @@ #include "options.h" #include "thumbbrowserbase.h" -#include "../rtengine/mytime.h" #include "../rtengine/rt_math.h" using namespace std; diff --git a/rtgui/thumbbrowserentrybase.cc b/rtgui/thumbbrowserentrybase.cc index 9d74fbd79..12059c72e 100644 --- a/rtgui/thumbbrowserentrybase.cc +++ b/rtgui/thumbbrowserentrybase.cc @@ -21,8 +21,6 @@ #include "options.h" #include "thumbbrowserbase.h" -#include "../rtengine/mytime.h" - namespace { diff --git a/rtgui/thumbnail.cc b/rtgui/thumbnail.cc index bb911534a..d5038bba5 100644 --- a/rtgui/thumbnail.cc +++ b/rtgui/thumbnail.cc @@ -15,12 +15,15 @@ * You should have received a copy of the GNU General Public License * along with RawTherapee. If not, see . */ +#ifdef WIN32 +#include +#endif + #include "cachemanager.h" #include "multilangmgr.h" #include "thumbnail.h" #include #include -#include "../rtengine/mytime.h" #include #include #include "../rtengine/colortemp.h" @@ -30,12 +33,13 @@ #include #include "../rtengine/dynamicprofile.h" +#include "../rtengine/profilestore.h" #include "../rtengine/settings.h" #include "guiutils.h" #include "batchqueue.h" #include "extprog.h" #include "pathutils.h" -#include "profilestorecombobox.h" +#include "paramsedited.h" #include "procparamchangers.h" using namespace rtengine::procparams; diff --git a/rtgui/toolpanel.h b/rtgui/toolpanel.h index ee4f00e52..627200835 100644 --- a/rtgui/toolpanel.h +++ b/rtgui/toolpanel.h @@ -30,8 +30,6 @@ #include "../rtengine/noncopyable.h" #include "../rtengine/rtengine.h" -class ParamsEdited; - namespace rtengine { class ProcEvent;