From c1f9120ef46c9398c68be3e023cce52edd8a5be1 Mon Sep 17 00:00:00 2001 From: Ingo Weyrich Date: Fri, 1 Nov 2019 21:20:52 +0100 Subject: [PATCH] Further reduction of include dependencies --- rtengine/bilateral2.h | 4 -- rtgui/batchqueueentry.cc | 2 + rtgui/batchqueueentry.h | 4 +- rtgui/batchtoolpanelcoord.cc | 1 + rtgui/batchtoolpanelcoord.h | 2 +- rtgui/bqentryupdater.cc | 2 + rtgui/bqentryupdater.h | 3 +- rtgui/colorappearance.h | 1 - rtgui/editorpanel.cc | 1 + rtgui/editorpanel.h | 2 +- rtgui/filebrowser.cc | 1 + rtgui/filebrowserentry.cc | 1 + rtgui/filebrowserentry.h | 3 +- rtgui/filecatalog.cc | 1 + rtgui/filepanel.cc | 1 + rtgui/histogrampanel.h | 1 - rtgui/imageareatoollistener.h | 2 +- rtgui/previewwindow.cc | 1 + rtgui/rtwindow.cc | 1 + rtgui/thumbbrowserentrybase.h | 4 +- rtgui/thumbimageupdater.cc | 1 + rtgui/thumbnailbrowser.h | 99 ----------------------------------- rtgui/tonecurve.h | 1 - 23 files changed, 26 insertions(+), 113 deletions(-) delete mode 100644 rtgui/thumbnailbrowser.h diff --git a/rtengine/bilateral2.h b/rtengine/bilateral2.h index ecdcc7fe5..53e18fb20 100644 --- a/rtengine/bilateral2.h +++ b/rtengine/bilateral2.h @@ -27,10 +27,6 @@ #include "LUT.h" #include "rt_math.h" -#ifdef _OPENMP -#include -#endif - using namespace rtengine; // This seems ugly, but way faster than any other solutions I tried diff --git a/rtgui/batchqueueentry.cc b/rtgui/batchqueueentry.cc index 424c8e486..90079b2cc 100644 --- a/rtgui/batchqueueentry.cc +++ b/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 BatchQueueEntry::savedAsIcon; diff --git a/rtgui/batchqueueentry.h b/rtgui/batchqueueentry.h index 3161bded4..c4cd48615 100644 --- a/rtgui/batchqueueentry.h +++ b/rtgui/batchqueueentry.h @@ -23,11 +23,13 @@ #include #include "bqentryupdater.h" +#include "options.h" #include "thumbbrowserentrybase.h" -#include "thumbnail.h" #include "../rtengine/noncopyable.h" +class Thumbnail; + namespace rtengine { class ProcessingJob; diff --git a/rtgui/batchtoolpanelcoord.cc b/rtgui/batchtoolpanelcoord.cc index 87320892e..760614d5e 100644 --- a/rtgui/batchtoolpanelcoord.cc +++ b/rtgui/batchtoolpanelcoord.cc @@ -22,6 +22,7 @@ #include "filepanel.h" #include "procparamchangers.h" #include "addsetids.h" +#include "thumbnail.h" using namespace rtengine::procparams; diff --git a/rtgui/batchtoolpanelcoord.h b/rtgui/batchtoolpanelcoord.h index 6c64e15ea..7a5fe77ed 100644 --- a/rtgui/batchtoolpanelcoord.h +++ b/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, diff --git a/rtgui/bqentryupdater.cc b/rtgui/bqentryupdater.cc index 8f5687b81..61683e158 100644 --- a/rtgui/bqentryupdater.cc +++ b/rtgui/bqentryupdater.cc @@ -19,6 +19,8 @@ #include "bqentryupdater.h" #include "guiutils.h" +#include "options.h" +#include "thumbnail.h" #include "../rtengine/utils.h" namespace diff --git a/rtgui/bqentryupdater.h b/rtgui/bqentryupdater.h index 4cbbf6e59..dfd42aff1 100644 --- a/rtgui/bqentryupdater.h +++ b/rtgui/bqentryupdater.h @@ -21,7 +21,8 @@ #include #include "threadutils.h" -#include "thumbnail.h" + +class Thumbnail; namespace rtengine { diff --git a/rtgui/colorappearance.h b/rtgui/colorappearance.h index 1f8fdef84..3d82ee831 100644 --- a/rtgui/colorappearance.h +++ b/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 : diff --git a/rtgui/editorpanel.cc b/rtgui/editorpanel.cc index 3c5182938..c7d8436ef 100644 --- a/rtgui/editorpanel.cc +++ b/rtgui/editorpanel.cc @@ -33,6 +33,7 @@ #include "procparamchangers.h" #include "placesbrowser.h" #include "pathutils.h" +#include "thumbnail.h" using namespace rtengine::procparams; diff --git a/rtgui/editorpanel.h b/rtgui/editorpanel.h index ec59563e0..00f1a942e 100644 --- a/rtgui/editorpanel.h +++ b/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; diff --git a/rtgui/filebrowser.cc b/rtgui/filebrowser.cc index bfd614ffd..3dcb573ca 100644 --- a/rtgui/filebrowser.cc +++ b/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" diff --git a/rtgui/filebrowserentry.cc b/rtgui/filebrowserentry.cc index 44146b990..4d31d625e 100644 --- a/rtgui/filebrowserentry.cc +++ b/rtgui/filebrowserentry.cc @@ -27,6 +27,7 @@ #include "rtimage.h" #include "threadutils.h" #include "thumbbrowserbase.h" +#include "thumbnail.h" #include "../rtengine/procparams.h" diff --git a/rtgui/filebrowserentry.h b/rtgui/filebrowserentry.h index c7eebcd44..1bdbb2ecb 100644 --- a/rtgui/filebrowserentry.h +++ b/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; diff --git a/rtgui/filecatalog.cc b/rtgui/filecatalog.cc index fb8bd4923..923a15e8d 100644 --- a/rtgui/filecatalog.cc +++ b/rtgui/filecatalog.cc @@ -37,6 +37,7 @@ #include "batchqueue.h" #include "placesbrowser.h" #include "pathutils.h" +#include "thumbnail.h" using namespace std; diff --git a/rtgui/filepanel.cc b/rtgui/filepanel.cc index 3e23cbc5d..0c401a701 100644 --- a/rtgui/filepanel.cc +++ b/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) { diff --git a/rtgui/histogrampanel.h b/rtgui/histogrampanel.h index 92d0dc7b4..23b065534 100644 --- a/rtgui/histogrampanel.h +++ b/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" diff --git a/rtgui/imageareatoollistener.h b/rtgui/imageareatoollistener.h index 86fdca6a2..3c753a5e0 100644 --- a/rtgui/imageareatoollistener.h +++ b/rtgui/imageareatoollistener.h @@ -19,9 +19,9 @@ #pragma once #include "cropguilistener.h" -#include "thumbnail.h" #include "toolbar.h" +class Thumbnail; class ImageAreaToolListener { diff --git a/rtgui/previewwindow.cc b/rtgui/previewwindow.cc index c813f04a2..3f787a16b 100644 --- a/rtgui/previewwindow.cc +++ b/rtgui/previewwindow.cc @@ -20,6 +20,7 @@ #include "guiutils.h" #include "imagearea.h" #include "cursormanager.h" +#include "options.h" #include "../rtengine/procparams.h" diff --git a/rtgui/rtwindow.cc b/rtgui/rtwindow.cc index 45d07c4af..2db0ef192 100644 --- a/rtgui/rtwindow.cc +++ b/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" diff --git a/rtgui/thumbbrowserentrybase.h b/rtgui/thumbbrowserentrybase.h index 5f018eefd..dbc6cf73e 100644 --- a/rtgui/thumbbrowserentrybase.h +++ b/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 { diff --git a/rtgui/thumbimageupdater.cc b/rtgui/thumbimageupdater.cc index 182eba704..bf230fe63 100644 --- a/rtgui/thumbimageupdater.cc +++ b/rtgui/thumbimageupdater.cc @@ -26,6 +26,7 @@ #include "guiutils.h" #include "threadutils.h" +#include "thumbnail.h" #include "../rtengine/procparams.h" diff --git a/rtgui/thumbnailbrowser.h b/rtgui/thumbnailbrowser.h deleted file mode 100644 index ef953c0e9..000000000 --- a/rtgui/thumbnailbrowser.h +++ /dev/null @@ -1,99 +0,0 @@ -/* - * This file is part of RawTherapee. - * - * Copyright (c) 2004-2010 Gabor Horvath - * - * 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 . - */ -#pragma once - -#include - -#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 fd; - std::vector 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& style); -}; diff --git a/rtgui/tonecurve.h b/rtgui/tonecurve.h index b44a7ccab..cba810e15 100644 --- a/rtgui/tonecurve.h +++ b/rtgui/tonecurve.h @@ -24,7 +24,6 @@ #include "curveeditor.h" #include "curveeditorgroup.h" #include "guiutils.h" -#include "mycurve.h" #include "toolpanel.h" class EditDataProvider;