Further reduction of include dependencies

rtengine/bilateral2.h

@@ -27,10 +27,6 @@
 #include "LUT.h"
 #include "rt_math.h"
 
-#ifdef _OPENMP
-#include <omp.h>
-#endif
-
 using namespace rtengine;
 
 // This seems ugly, but way faster than any other solutions I tried

rtgui/batchqueueentry.cc

@@ -25,8 +25,10 @@
 #include "rtimage.h"
 #include "multilangmgr.h"
 #include "thumbbrowserbase.h"
+#include "thumbnail.h"
 
 #include "../rtengine/procparams.h"
+#include "../rtengine/rtengine.h"
 
 bool BatchQueueEntry::iconsLoaded(false);
 Glib::RefPtr<Gdk::Pixbuf> BatchQueueEntry::savedAsIcon;

rtgui/batchqueueentry.h

@@ -23,11 +23,13 @@
 #include <gtkmm.h>
 
 #include "bqentryupdater.h"
+#include "options.h"
 #include "thumbbrowserentrybase.h"
-#include "thumbnail.h"
 
 #include "../rtengine/noncopyable.h"
 
+class Thumbnail;
+
 namespace rtengine
 {
 class ProcessingJob;

rtgui/batchtoolpanelcoord.cc

@@ -22,6 +22,7 @@
 #include "filepanel.h"
 #include "procparamchangers.h"
 #include "addsetids.h"
+#include "thumbnail.h"
 
 using namespace rtengine::procparams;
 

rtgui/batchtoolpanelcoord.h

@@ -20,7 +20,6 @@
 
 #include "fileselectionchangelistener.h"
 #include "paramsedited.h"
-#include "thumbnail.h"
 #include "thumbnaillistener.h"
 #include "toolpanelcoord.h"
 
@@ -28,6 +27,7 @@
 #include "../rtengine/procparams.h"
 
 class FilePanel;
+class Thumbnail;
 class BatchToolPanelCoordinator :
     public ToolPanelCoordinator,
     public FileSelectionChangeListener,

rtgui/bqentryupdater.cc

@@ -19,6 +19,8 @@
 #include "bqentryupdater.h"
 
 #include "guiutils.h"
+#include "options.h"
+#include "thumbnail.h"
 #include "../rtengine/utils.h"
 
 namespace

rtgui/bqentryupdater.h

@@ -21,7 +21,8 @@
 #include <glibmm/thread.h>
 
 #include "threadutils.h"
-#include "thumbnail.h"
+
+class Thumbnail;
 
 namespace rtengine
 {

rtgui/colorappearance.h

@@ -25,7 +25,6 @@
 #include "curveeditor.h"
 #include "curveeditorgroup.h"
 #include "guiutils.h"
-#include "mycurve.h"
 #include "toolpanel.h"
 
 class ColorAppearance final :

rtgui/editorpanel.cc

@@ -33,6 +33,7 @@
 #include "procparamchangers.h"
 #include "placesbrowser.h"
 #include "pathutils.h"
+#include "thumbnail.h"
 
 using namespace rtengine::procparams;
 

rtgui/editorpanel.h

@@ -30,7 +30,6 @@
 #include "profilepanel.h"
 #include "progressconnector.h"
 #include "saveasdlg.h"
-#include "thumbnail.h"
 #include "thumbnaillistener.h"
 #include "toolpanelcoord.h"
 
@@ -39,6 +38,7 @@
 
 class EditorPanel;
 class MyProgressBar;
+class Thumbnail;
 
 struct EditorPanelIdleHelper {
     EditorPanel* epanel;

rtgui/filebrowser.cc

@@ -33,6 +33,7 @@
 #include "procparamchangers.h"
 #include "rtimage.h"
 #include "threadutils.h"
+#include "thumbnail.h"
 
 #include "../rtengine/dfmanager.h"
 #include "../rtengine/ffmanager.h"

rtgui/filebrowserentry.cc

@@ -27,6 +27,7 @@
 #include "rtimage.h"
 #include "threadutils.h"
 #include "thumbbrowserbase.h"
+#include "thumbnail.h"
 
 #include "../rtengine/procparams.h"
 

rtgui/filebrowserentry.h

@@ -29,13 +29,14 @@
 #include "imageareatoollistener.h"
 #include "thumbbrowserentrybase.h"
 #include "thumbimageupdater.h"
-#include "thumbnail.h"
 #include "thumbnaillistener.h"
 
 #include "../rtengine/noncopyable.h"
 #include "../rtengine/rtengine.h"
 
 class FileBrowserEntry;
+class Thumbnail;
+
 struct FileBrowserEntryIdleHelper {
     FileBrowserEntry* fbentry;
     bool destroyed;

rtgui/filecatalog.cc

@@ -37,6 +37,7 @@
 #include "batchqueue.h"
 #include "placesbrowser.h"
 #include "pathutils.h"
+#include "thumbnail.h"
 
 using namespace std;
 

rtgui/filepanel.cc

@@ -21,6 +21,7 @@
 #include "rtwindow.h"
 #include "inspector.h"
 #include "placesbrowser.h"
+#include "thumbnail.h"
 
 FilePanel::FilePanel () : parent(nullptr), error(0)
 {

rtgui/histogrampanel.h

@@ -27,7 +27,6 @@
 #include "guiutils.h"
 #include "pointermotionlistener.h"
 
-#include "../rtengine/improccoordinator.h"
 #include "../rtengine/LUT.h"
 #include "../rtengine/noncopyable.h"
 

rtgui/imageareatoollistener.h

@@ -19,9 +19,9 @@
 #pragma once
 
 #include "cropguilistener.h"
-#include "thumbnail.h"
 #include "toolbar.h"
 
+class Thumbnail;
 class ImageAreaToolListener
 {
 

rtgui/previewwindow.cc

@@ -20,6 +20,7 @@
 #include "guiutils.h"
 #include "imagearea.h"
 #include "cursormanager.h"
+#include "options.h"
 
 #include "../rtengine/procparams.h"
 

rtgui/rtwindow.cc

@@ -24,6 +24,7 @@
 #include "iccprofilecreator.h"
 #include "cursormanager.h"
 #include "rtimage.h"
+#include "thumbnail.h"
 #include "whitebalance.h"
 #include "../rtengine/settings.h"
 

rtgui/thumbbrowserentrybase.h

@@ -26,8 +26,10 @@
 #include "guiutils.h"
 #include "lwbuttonset.h"
 #include "threadutils.h"
-#include "thumbnail.h"
 
+#include "../rtengine/coord2d.h"
+
+class Thumbnail;
 class ThumbBrowserBase;
 class ThumbBrowserEntryBase
 {

rtgui/thumbimageupdater.cc

@@ -26,6 +26,7 @@
 
 #include "guiutils.h"
 #include "threadutils.h"
+#include "thumbnail.h"
 
 #include "../rtengine/procparams.h"
 

rtgui/thumbnailbrowser.h

@@ -1,99 +0,0 @@
-/*
- *  This file is part of RawTherapee.
- *
- *  Copyright (c) 2004-2010 Gabor Horvath <hgabor@rawtherapee.com>
- *
- *  RawTherapee is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  RawTherapee is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with RawTherapee.  If not, see <https://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#include <gtkmm.h>
-
-#include "filecatalog.h"
-#include "thumbnail.h"
-
-class ThumbBrowserEntry
-{
-
-public:
-// set by arrangeFiles():
-    int width;      // minimal width
-    int height;     // minimal height
-    int exp_width;  // ararnged width
-    int startx;     // x coord. in the widget
-    int starty;     // y coord. in the widget
-// thumbnail preview properties:
-    int prew;       // width of the thumbnail
-    int preh;       // height of the thumbnail
-    guint8* preview;
-// file and directory attributes:
-    Glib::ustring filename;
-    Glib::ustring shortname;
-    Glib::ustring dirname;
-// the associated thumbnail instance:
-    Thumbnail* thumbnail;
-
-    ThumbBrowserEntry (Thumbnail* thm, Glib::ustring fname, Glib::ustring sname, Glib::ustring dname, int h)
-        : thumbnail(thm), filename(fname), shortname(sname), dirname(dname), preh(h)
-    {
-        preview = thumbnail ? (guint8*) thumbnail->getThumbnailImage (prew, preh) : NULL;
-    }
-
-    bool operator< (FileDescr& other)
-    {
-        return shortname > other.shortname;
-    }
-};
-
-class ThumbBrowser  : public Gtk::DrawingArea
-{
-
-protected:
-    int dx, dy, w, h;
-
-    Gdk::RGBA black;
-    Gdk::RGBA white;
-    Gdk::RGBA blue;
-    Gdk::RGBA bluew;
-
-    std::vector<ThumbBrowserEntry*> fd;
-    std::vector<ThumbBrowserEntry*> selected;
-
-    int rowHeight;
-    int numOfRows;
-
-    ThumbBrowserListener* tbl;
-
-    void arrangeFiles (int rows);
-
-public:
-
-    ThumbBrowser ();
-
-    void addEntry (ThumbBrowserEntry* entry);
-    void setThumbBrowserListener (ThumbBrowserListener* l)
-    {
-        tbl = l;
-    }
-
-    virtual void on_realize();
-    virtual bool on_draw(const ::Cairo::RefPtr< Cairo::Context> &cr);
-    virtual bool on_button_press_event (GdkEventButton* event);
-    virtual bool on_button_release_event (GdkEventButton* event);
-    virtual void previewReady (FileDescr* fdn);
-
-    void resized (Gtk::Allocation& req);
-    void redraw ();
-    void styleChanged (const Glib::RefPtr<Gtk::Style>& style);
-};

rtgui/tonecurve.h

@@ -24,7 +24,6 @@
 #include "curveeditor.h"
 #include "curveeditorgroup.h"
 #include "guiutils.h"
-#include "mycurve.h"
 #include "toolpanel.h"
 
 class EditDataProvider;