Merge branch 'dev' into spot-removal-tool

rtengine/improccoordinator.h

@@ -16,21 +16,27 @@
  *  You should have received a copy of the GNU General Public License
  *  along with RawTherapee.  If not, see <https://www.gnu.org/licenses/>.
  */
-#ifndef _IMPROCCOORDINATOR_H_
-#define _IMPROCCOORDINATOR_H_
+#pragma once
 
 #include <memory>
 
-#include "rtengine.h"
-#include "improcfun.h"
-#include "image8.h"
-#include "image16.h"
-#include "imagesource.h"
-#include "procevents.h"
+#include "array2D.h"
+#include "colortemp.h"
+#include "curves.h"
 #include "dcrop.h"
+#include "imagesource.h"
+#include "improcfun.h"
 #include "LUT.h"
+#include "procevents.h"
+#include "rtengine.h"
+
 #include "../rtgui/threadutils.h"
 
+namespace Glib
+{
+class Thread;
+}
+
 namespace rtengine
 {
 
@@ -182,7 +188,6 @@ protected:
 
     MyMutex minit;  // to gain mutually exclusive access to ... to what exactly?
 
-    void progress (Glib::ustring str, int pr);
     void backupParams();
     void restoreParams();
     void reallocAll ();
@@ -417,5 +422,5 @@ public:
     } denoiseInfoStore;
 
 };
+
 }
-#endif