From 3aa84c48da4d46509ac7c798a8f16c9d021a3cc9 Mon Sep 17 00:00:00 2001
From: Ingo Weyrich <heckflosse67@gmx.de>
Date: Tue, 29 Oct 2019 12:33:14 +0100
Subject: [PATCH] Forward declare ColorTemp

---
 rtengine/ahd_demosaic_RT.cc   | 1 +
 rtengine/clutstore.cc         | 1 +
 rtengine/colortemp.h          | 4 +---
 rtengine/dcp.h                | 2 +-
 rtengine/dcrop.cc             | 1 +
 rtengine/image16.cc           | 1 +
 rtengine/image8.cc            | 2 ++
 rtengine/imagefloat.cc        | 2 ++
 rtengine/imageio.h            | 2 +-
 rtengine/imagesource.h        | 2 +-
 rtengine/improccoordinator.cc | 1 +
 rtengine/improccoordinator.h  | 1 +
 rtengine/rawimagesource.h     | 1 +
 rtengine/stdimagesource.h     | 1 +
 rtgui/thumbnail.cc            | 1 +
 15 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/rtengine/ahd_demosaic_RT.cc b/rtengine/ahd_demosaic_RT.cc
index b3a34295c..77e342c18 100644
--- a/rtengine/ahd_demosaic_RT.cc
+++ b/rtengine/ahd_demosaic_RT.cc
@@ -24,6 +24,7 @@
 //
 
 #include <cstdint>
+#include "colortemp.h"
 #include "rtengine.h"
 #include "rawimagesource.h"
 #include "rt_math.h"
diff --git a/rtengine/clutstore.cc b/rtengine/clutstore.cc
index 10b7a2c38..cd97ed9e9 100644
--- a/rtengine/clutstore.cc
+++ b/rtengine/clutstore.cc
@@ -2,6 +2,7 @@
 
 #include "clutstore.h"
 
+#include "colortemp.h"
 #include "iccstore.h"
 #include "imagefloat.h"
 #include "opthelper.h"
diff --git a/rtengine/colortemp.h b/rtengine/colortemp.h
index da83177be..a38e01072 100644
--- a/rtengine/colortemp.h
+++ b/rtengine/colortemp.h
@@ -16,8 +16,7 @@
  *  You should have received a copy of the GNU General Public License
  *  along with RawTherapee.  If not, see <https://www.gnu.org/licenses/>.
  */
-#ifndef _COLORTEMP_
-#define _COLORTEMP_
+#pragma once
 
 #include <cmath>
 #include <map>
@@ -207,4 +206,3 @@ public:
 
 };
 }
-#endif
diff --git a/rtengine/dcp.h b/rtengine/dcp.h
index ba8be93eb..062459e42 100644
--- a/rtengine/dcp.h
+++ b/rtengine/dcp.h
@@ -29,12 +29,12 @@
 #include "../rtgui/threadutils.h"
 
 #include "curves.h"
-#include "colortemp.h"
 #include "noncopyable.h"
 
 namespace rtengine
 {
 
+class ColorTemp;
 class Imagefloat;
 
 class DCPProfile final
diff --git a/rtengine/dcrop.cc b/rtengine/dcrop.cc
index 85074fd96..6d45d232b 100644
--- a/rtengine/dcrop.cc
+++ b/rtengine/dcrop.cc
@@ -18,6 +18,7 @@
  *  along with RawTherapee.  If not, see <https://www.gnu.org/licenses/>.
  */
 
+#include "colortemp.h"
 #include "cieimage.h"
 #include "image8.h"
 #include "imagefloat.h"
diff --git a/rtengine/image16.cc b/rtengine/image16.cc
index 14ba4964d..a98d64d51 100644
--- a/rtengine/image16.cc
+++ b/rtengine/image16.cc
@@ -18,6 +18,7 @@
  */
 #include <cstdio>
 
+#include "colortemp.h"
 #include "image16.h"
 #include "imagefloat.h"
 #include "image8.h"
diff --git a/rtengine/image8.cc b/rtengine/image8.cc
index fb71e94a4..3d0a8df06 100644
--- a/rtengine/image8.cc
+++ b/rtengine/image8.cc
@@ -18,6 +18,8 @@
  */
 #include <cstring>
 #include <cstdio>
+
+#include "colortemp.h"
 #include "image8.h"
 #include "imagefloat.h"
 #include "rtengine.h"
diff --git a/rtengine/imagefloat.cc b/rtengine/imagefloat.cc
index 0b67e0785..3e80b617b 100644
--- a/rtengine/imagefloat.cc
+++ b/rtengine/imagefloat.cc
@@ -17,6 +17,8 @@
  *  along with RawTherapee.  If not, see <https://www.gnu.org/licenses/>.
  */
 #include <tiffio.h>
+
+#include "colortemp.h"
 #include "imagefloat.h"
 #include "image16.h"
 #include "image8.h"
diff --git a/rtengine/imageio.h b/rtengine/imageio.h
index 89c482ca3..baf456037 100644
--- a/rtengine/imageio.h
+++ b/rtengine/imageio.h
@@ -37,11 +37,11 @@
 #include "../rtexif/rtexif.h"
 #include "imagedimensions.h"
 #include "iimage.h"
-#include "colortemp.h"
 
 namespace rtengine
 {
 
+class ColorTemp;
 class ProgressListener;
 class Imagefloat;
 
diff --git a/rtengine/imagesource.h b/rtengine/imagesource.h
index 428027bc0..0f7a2ff51 100644
--- a/rtengine/imagesource.h
+++ b/rtengine/imagesource.h
@@ -23,7 +23,6 @@
 
 #include <glibmm.h>
 
-#include "colortemp.h"
 #include "coord2d.h"
 #include "dcp.h"
 #include "imagedata.h"
@@ -32,6 +31,7 @@
 
 namespace rtengine
 {
+class ColorTemp;
 class Imagefloat;
 
 namespace procparams
diff --git a/rtengine/improccoordinator.cc b/rtengine/improccoordinator.cc
index 0ab015fd3..b0996c6dd 100644
--- a/rtengine/improccoordinator.cc
+++ b/rtengine/improccoordinator.cc
@@ -17,6 +17,7 @@
  *  along with RawTherapee.  If not, see <https://www.gnu.org/licenses/>.
  */
 #include "improccoordinator.h"
+
 #include "cieimage.h"
 #include "image8.h"
 #include "imagefloat.h"
diff --git a/rtengine/improccoordinator.h b/rtengine/improccoordinator.h
index e7199565b..14e93b771 100644
--- a/rtengine/improccoordinator.h
+++ b/rtengine/improccoordinator.h
@@ -21,6 +21,7 @@
 
 #include <memory>
 
+#include "colortemp.h"
 #include "rtengine.h"
 #include "improcfun.h"
 #include "imagesource.h"
diff --git a/rtengine/rawimagesource.h b/rtengine/rawimagesource.h
index ab8459f20..6c8dff696 100644
--- a/rtengine/rawimagesource.h
+++ b/rtengine/rawimagesource.h
@@ -24,6 +24,7 @@
 
 #include "array2D.h"
 #include "color.h"
+#include "colortemp.h"
 #include "curves.h"
 #include "dcp.h"
 #include "iimage.h"
diff --git a/rtengine/stdimagesource.h b/rtengine/stdimagesource.h
index 632b84ccb..b70c6554b 100644
--- a/rtengine/stdimagesource.h
+++ b/rtengine/stdimagesource.h
@@ -19,6 +19,7 @@
 #ifndef _STDIMAGESOURCE_
 #define _STDIMAGESOURCE_
 
+#include "colortemp.h"
 #include "imagesource.h"
 
 namespace rtengine
diff --git a/rtgui/thumbnail.cc b/rtgui/thumbnail.cc
index 7ec1fef4e..78928fdf4 100644
--- a/rtgui/thumbnail.cc
+++ b/rtgui/thumbnail.cc
@@ -24,6 +24,7 @@
 #include <cstdio>
 #include <cstdlib>
 #include <glibmm.h>
+#include "../rtengine/colortemp.h"
 #include "../rtengine/imagedata.h"
 #include "../rtengine/procparams.h"
 #include <glib/gstdio.h>