Further reduction of include dependencies

rtengine/FTblockDN.cc

@@ -41,7 +41,6 @@
 #include "opthelper.h"
 #include "procparams.h"
 #include "rt_math.h"
-#include "rtengine.h"
 #include "sleef.c"
 
 #include "../rtgui/threadutils.h"

rtengine/ahd_demosaic_RT.cc

@@ -24,11 +24,9 @@
 //
 
 #include <cstdint>
-#include "colortemp.h"
 #include "rtengine.h"
 #include "rawimagesource.h"
 #include "rt_math.h"
-#include "procparams.h"
 #include "../rtgui/multilangmgr.h"
 #include "median.h"
 //#define BENCHMARK

rtengine/amaze_demosaic_RT.cc

@@ -33,7 +33,6 @@
 #include "sleef.c"
 #include "opthelper.h"
 #include "median.h"
-#include "procparams.h"
 #include "StopWatch.h"
 
 namespace rtengine

rtengine/dcraw.cc

@@ -26,12 +26,13 @@
 /*RT*/#include <omp.h>
 /*RT*/#endif
 
+#include <memory>
 #include <utility>
 #include <vector>
 #include "opthelper.h"
 //#define BENCHMARK
 #include "StopWatch.h"
-
+#include "utils.h"
 #include <zlib.h>
 #include <stdint.h>
 

rtengine/dcrop.cc

@@ -19,7 +19,6 @@
  */
 
 #include "cieimage.h"
-#include "colortemp.h"
 #include "curves.h"
 #include "dcp.h"
 #include "dcrop.h"

rtengine/demosaic_algos.cc

@@ -25,7 +25,6 @@
 #include "rt_math.h"
 #include "color.h"
 #include "../rtgui/multilangmgr.h"
-#include "procparams.h"
 #include "sleef.c"
 #include "opthelper.h"
 #include "median.h"

rtengine/dfmanager.cc

@@ -16,20 +16,28 @@
  *  You should have received a copy of the GNU General Public License
  *  along with RawTherapee.  If not, see <https://www.gnu.org/licenses/>.
  */
-#include "dfmanager.h"
-#include "../rtgui/options.h"
-#include <giomm.h>
-#include "rawimage.h"
+
 #include <sstream>
 #include <iostream>
 #include <cstdio>
-#include "imagedata.h"
+#include <giomm.h>
 #include <glibmm/ustring.h>
 
+#include "dfmanager.h"
+#include "../rtgui/options.h"
+#include "rawimage.h"
+#include "imagedata.h"
+
 namespace rtengine
 {
 
 // *********************** class dfInfo **************************************
+dfInfo::~dfInfo()
+{
+    if( ri ) {
+        delete ri;
+    }
+}
 
 inline dfInfo& dfInfo::operator =(const dfInfo &o)
 {

rtengine/dfmanager.h

@@ -19,13 +19,13 @@
 #pragma once
 
 #include <cmath>
+#include <list>
 #include <map>
 #include <string>
 
 #include <glibmm/ustring.h>
 
 #include "pixelsmap.h"
-#include "rawimage.h"
 
 namespace rtengine
 {
@@ -49,13 +49,7 @@ public:
 
     dfInfo( const dfInfo &o)
         : pathname(o.pathname), maker(o.maker), model(o.model), iso(o.iso), shutter(o.shutter), timestamp(o.timestamp), ri(nullptr) {}
-    ~dfInfo()
-    {
-        if( ri ) {
-            delete ri;
-        }
-    }
-
+    ~dfInfo();
 
     dfInfo &operator =(const dfInfo &o);
     bool operator <(const dfInfo &e2) const;

rtengine/eahd_demosaic.cc

@@ -24,11 +24,9 @@
 #include "rawimagesource.h"
 #include "rawimagesource_i.h"
 #include "jaggedarray.h"
-#include "rawimage.h"
 #include "iccmatrices.h"
 #include "rt_math.h"
 #include "../rtgui/multilangmgr.h"
-#include "procparams.h"
 //#define BENCHMARK
 #include "StopWatch.h"
 

rtengine/fast_demo.cc

@@ -25,7 +25,6 @@
 #include <cmath>
 #include "rawimagesource.h"
 #include "../rtgui/multilangmgr.h"
-#include "procparams.h"
 #include "opthelper.h"
 
 using namespace std;

rtengine/hphd_demosaic_RT.cc

@@ -22,9 +22,7 @@
 #include "rawimagesource.h"
 #include "rawimagesource_i.h"
 #include "jaggedarray.h"
-#include "rawimage.h"
 #include "rt_math.h"
-#include "procparams.h"
 #include "../rtgui/multilangmgr.h"
 #include "opthelper.h"
 //#define BENCHMARK

rtengine/iccstore.cc

@@ -36,7 +36,6 @@
 #include "iccmatrices.h"
 #include "utils.h"
 
-#include "../rtgui/guiutils.h"
 #include "../rtgui/options.h"
 #include "../rtgui/threadutils.h"
 #include "lcms2_plugin.h"

rtengine/myfile.cc

@@ -18,7 +18,7 @@
  */
 #include "myfile.h"
 #include <cstdarg>
-
+#include "rtengine.h"
 // get mmap() sorted out
 #ifdef MYFILE_MMAP
 

rtengine/myfile.h

@@ -23,7 +23,13 @@
 
 #include <glib/gstdio.h>
 
-#include "rtengine.h"
+#include "opthelper.h"
+
+namespace rtengine {
+
+class ProgressListener;
+
+}
 
 struct IMFILE {
     int fd;

rtengine/rawimage.cc

@@ -15,6 +15,7 @@
 #include "settings.h"
 #include "camconst.h"
 #include "utils.h"
+#include "rtengine.h"
 
 namespace rtengine
 {

rtengine/rawimage.h

@@ -21,6 +21,7 @@
 #include <ctime>
 #include <cmath>
 #include <iostream>
+#include <glibmm/ustring.h>
 
 #include "dcraw.h"
 #include "imageformat.h"

rtengine/rawimagesource.cc

@@ -34,7 +34,6 @@
 #include "pdaflinesfilter.h"
 #include "procparams.h"
 #include "rawimage.h"
-#include "rawimage.h"
 #include "rawimagesource_i.h"
 #include "rawimagesource.h"
 #include "rt_math.h"

rtengine/rcd_demosaic.cc

@@ -20,7 +20,6 @@
 
 #include "rawimagesource.h"
 #include "rt_math.h"
-#include "procparams.h"
 #include "../rtgui/multilangmgr.h"
 #include "opthelper.h"
 #include "StopWatch.h"

rtengine/vng4_demosaic_RT.cc

@@ -23,7 +23,6 @@
 #include "rtengine.h"
 #include "rawimage.h"
 #include "rawimagesource.h"
-#include "procparams.h"
 #include "../rtgui/multilangmgr.h"
 //#define BENCHMARK
 #include "StopWatch.h"

rtgui/darkframe.cc

@@ -25,6 +25,7 @@
 #include "rtimage.h"
 
 #include "../rtengine/procparams.h"
+#include "../rtengine/rawimage.h"
 
 using namespace rtengine;
 using namespace rtengine::procparams;

rtgui/darkframe.h

@@ -25,8 +25,11 @@
 #include "guiutils.h"
 #include "toolpanel.h"
 
-#include "../rtengine/rawimage.h"
+namespace rtengine {
 
+class RawImage;
+
+}
 class DFProvider
 {
 public:

rtgui/flatfield.cc

@@ -25,6 +25,7 @@
 #include "rtimage.h"
 
 #include "../rtengine/procparams.h"
+#include "../rtengine/rawimage.h"
 
 using namespace rtengine;
 using namespace rtengine::procparams;

rtgui/flatfield.h

@@ -26,8 +26,11 @@
 #include "guiutils.h"
 #include "toolpanel.h"
 
-#include "../rtengine/rawimage.h"
+namespace rtengine {
 
+class RawImage;
+
+}
 class FFProvider
 {
 public: