Further cleanup of include dependencies

2019-10-30 16:38:02 +01:00 · 2019-10-30 16:38:02 +01:00 · ba8dda1836
commit ba8dda1836
parent 1d51016bdd
50 changed files with 44 additions and 48 deletions
--- a/rtengine/dcp.cc
+++ b/rtengine/dcp.cc
@ -31,6 +31,7 @@
 #include "imagefloat.h"
 #include "rawimagesource.h"
 #include "rt_math.h"
+#include "../rtgui/options.h"

 namespace rtengine
 {
--- a/rtengine/iccstore.cc
+++ b/rtengine/iccstore.cc
@ -35,6 +35,7 @@

 #include "iccmatrices.h"

+#include "../rtgui/guiutils.h"
 #include "../rtgui/options.h"
 #include "../rtgui/threadutils.h"
 #include "lcms2_plugin.h"
--- a/rtengine/improccoordinator.cc
+++ b/rtengine/improccoordinator.cc
@ -36,12 +36,14 @@
 #include "procparams.h"
 #include "refreshmap.h"

+#include "../rtgui/options.h"
 #include "../rtgui/ppversion.h"

 #ifdef _OPENMP
 #include <omp.h>
 #endif

+
 namespace rtengine
 {

--- a/rtengine/iplab2rgb.cc
+++ b/rtengine/iplab2rgb.cc
@ -24,7 +24,6 @@
 #include <glibmm/ustring.h>
 #include "iccstore.h"
 #include "iccmatrices.h"
-#include "../rtgui/options.h"
 #include "settings.h"
 #include "alignedbuffer.h"
 #include "color.h"
--- a/rtengine/ipwavelet.cc
+++ b/rtengine/ipwavelet.cc
@ -42,6 +42,7 @@
 #include "rt_math.h"
 #include "rtengine.h"
 #include "sleef.c"
+#include "../rtgui/options.h"

 #ifdef _OPENMP
 #include <omp.h>
@ -56,7 +57,6 @@

 #define epsilon 0.001f/(TS*TS) //tolerance

-
 namespace rtengine
 {

--- a/rtengine/procparams.h
+++ b/rtengine/procparams.h
@ -20,11 +20,11 @@

 #include <cmath>
 #include <cstdio>
+#include <map>
 #include <type_traits>
 #include <vector>

 #include <glibmm/ustring.h>
-#include <glibmm/keyfile.h>
 #include <lcms2.h>

 #include "noncopyable.h"
--- a/rtengine/rawimagesource.cc
+++ b/rtengine/rawimagesource.cc
@ -40,6 +40,7 @@
 #include "rt_math.h"
 #include "rtengine.h"
 #include "rtlensfun.h"
+#include "../rtgui/options.h"

 //#define BENCHMARK
 //#include "StopWatch.h"
--- a/rtengine/rtthumbnail.cc
+++ b/rtengine/rtthumbnail.cc
@ -191,8 +191,6 @@ void scale_colors (rtengine::RawImage *ri, float scale_mul[4], float cblack[4],

 }

-extern Options options;
-
 namespace rtengine
 {

--- a/rtgui/batchqueue.h
+++ b/rtgui/batchqueue.h
@ -26,7 +26,6 @@

 #include "batchqueueentry.h"
 #include "lwbuttonset.h"
-#include "options.h"
 #include "threadutils.h"
 #include "thumbbrowserbase.h"
 #include "../rtengine/noncopyable.h"
--- a/rtgui/batchtoolpanelcoord.h
+++ b/rtgui/batchtoolpanelcoord.h
@ -22,7 +22,8 @@
 #include "thumbnail.h"
 #include "toolpanelcoord.h"
 #include "fileselectionchangelistener.h"
-#include "../rtengine/rtengine.h"
+#include "../rtengine/procparams.h"
+#include "../rtengine/procevents.h"
 #include "paramsedited.h"
 #include "thumbnaillistener.h"

--- a/rtgui/blackwhite.cc
+++ b/rtgui/blackwhite.cc
@ -23,6 +23,7 @@

 #include "guiutils.h"
 #include "rtimage.h"
+#include "options.h"

 #include "../rtengine/color.h"
 #include "../rtengine/procparams.h"
--- a/rtgui/colorappearance.cc
+++ b/rtgui/colorappearance.cc
@ -21,6 +21,7 @@
 #include "colorappearance.h"

 #include "guiutils.h"
+#include "options.h"

 #include "../rtengine/color.h"
 #include "../rtengine/procparams.h"
--- a/rtgui/colortoning.cc
+++ b/rtgui/colortoning.cc
@ -6,6 +6,7 @@
 #include "rtimage.h"
 #include "eventmapper.h"
 #include "labgrid.h"
+#include "options.h"

 using namespace rtengine;
 using namespace rtengine::procparams;
--- a/rtgui/crop.cc
+++ b/rtgui/crop.cc
@ -26,8 +26,6 @@
 using namespace rtengine;
 using namespace rtengine::procparams;

-extern Options options;
-
 namespace
 {

--- a/rtgui/cropwindow.h
+++ b/rtgui/cropwindow.h
@ -19,7 +19,6 @@
 #ifndef _CROPWINDOW_
 #define _CROPWINDOW_

-#include "../rtengine/rtengine.h"
 #include <gtkmm.h>
 #include "lwbutton.h"
 #include "lwbuttonset.h"
@ -33,6 +32,11 @@
 #include "editcoordsys.h"
 #include "../rtengine/noncopyable.h"

+namespace rtengine {
+
+class Coord;
+
+}
 class CropWindow;

 class CropWindowListener
--- a/rtgui/cursormanager.cc
+++ b/rtgui/cursormanager.cc
@ -18,7 +18,6 @@
 */
 #include "cursormanager.h"

-#include "options.h"
 #include "rtimage.h"

 CursorManager mainWindowCursorManager;
--- a/rtgui/curveeditorgroup.cc
+++ b/rtgui/curveeditorgroup.cc
@ -25,6 +25,7 @@
 #include "flatcurveeditorsubgroup.h"
 #include "multilangmgr.h"
 #include "rtimage.h"
+#include "options.h"

 CurveEditorGroup::CurveEditorGroup (Glib::ustring& curveDir, Glib::ustring groupLabel) : curveDir(curveDir), line(0), curve_reset(nullptr),
    displayedCurve(nullptr), flatSubGroup(nullptr), diagonalSubGroup(nullptr), cl(nullptr), numberOfPackedCurve(0)
--- a/rtgui/defringe.cc
+++ b/rtgui/defringe.cc
@ -20,6 +20,7 @@
 #include <iomanip>

 #include "defringe.h"
+#include "options.h"

 #include "../rtengine/procparams.h"

--- a/rtgui/diagonalcurveeditorsubgroup.cc
+++ b/rtgui/diagonalcurveeditorsubgroup.cc
@ -31,6 +31,7 @@
 #include "curveeditor.h"
 #include "diagonalcurveeditorsubgroup.h"
 #include "rtimage.h"
+#include "options.h"

 #include "../rtengine/curves.h"

--- a/rtgui/dirpyrdenoise.cc
+++ b/rtgui/dirpyrdenoise.cc
@ -21,14 +21,14 @@

 #include "dirpyrdenoise.h"

+#include "editbuffer.h"
 #include "guiutils.h"
+#include "options.h"

 #include "../rtengine/procparams.h"
-#include "editbuffer.h"

 using namespace rtengine;
 using namespace rtengine::procparams;
-extern Options options;

 DirPyrDenoise::DirPyrDenoise () : FoldableToolPanel(this, "dirpyrdenoise", M("TP_DIRPYRDENOISE_LABEL"), true, true), lastmedian(false)
 {
--- a/rtgui/dirpyrdenoise.h
+++ b/rtgui/dirpyrdenoise.h
@ -26,7 +26,6 @@
 #include "curveeditorgroup.h"
 #include "colorprovider.h"
 #include "guiutils.h"
-#include "options.h"

 class EditDataProvider;

--- a/rtgui/filebrowser.cc
+++ b/rtgui/filebrowser.cc
@ -37,8 +37,6 @@
 #include "../rtengine/ffmanager.h"
 #include "../rtengine/procparams.h"

-extern Options options;
-
 namespace
 {

--- a/rtgui/flatcurveeditorsubgroup.cc
+++ b/rtgui/flatcurveeditorsubgroup.cc
@ -32,6 +32,7 @@
 #include "curveeditor.h"
 #include "flatcurveeditorsubgroup.h"
 #include "rtimage.h"
+#include "options.h"

 #include "../rtengine/curves.h"

--- a/rtgui/histogrampanel.cc
+++ b/rtgui/histogrampanel.cc
@ -28,8 +28,6 @@

 using namespace rtengine;

-extern Options options;
-

 //
 //
--- a/rtgui/hsvequalizer.cc
+++ b/rtgui/hsvequalizer.cc
@ -18,6 +18,8 @@
 */
 #include "hsvequalizer.h"

+#include "options.h"
+
 #include "../rtengine/color.h"
 #include "../rtengine/procparams.h"

--- a/rtgui/iccprofilecreator.cc
+++ b/rtgui/iccprofilecreator.cc
@ -29,8 +29,6 @@
 #include <omp.h>
 #endif

-extern Options options;
-
 namespace rtengine
 {

--- a/rtgui/iccprofilecreator.h
+++ b/rtgui/iccprofilecreator.h
@ -21,7 +21,6 @@

 #include <gtkmm.h>
 #include "adjuster.h"
-#include "options.h"
 #include <vector>
 #include "rtwindow.h"

--- a/rtgui/icmpanel.cc
+++ b/rtgui/icmpanel.cc
@ -32,8 +32,6 @@
 using namespace rtengine;
 using namespace rtengine::procparams;

-extern Options options;
-
 ICMPanel::ICMPanel() : FoldableToolPanel(this, "icm", M("TP_ICM_LABEL")), iunchanged(nullptr), icmplistener(nullptr)
 {
    auto m = ProcEventMapper::getInstance();
--- a/rtgui/inspector.cc
+++ b/rtgui/inspector.cc
@ -24,8 +24,6 @@
 #include "options.h"
 #include "../rtengine/previewimage.h"

-extern Options options;
-
 InspectorBuffer::InspectorBuffer(const Glib::ustring &imagePath) : currTransform(0), fromRaw(false)
 {
    if (!imagePath.empty() && Glib::file_test(imagePath, Glib::FILE_TEST_EXISTS) && !Glib::file_test(imagePath, Glib::FILE_TEST_IS_DIR)) {
--- a/rtgui/labcurve.cc
+++ b/rtgui/labcurve.cc
@ -20,6 +20,8 @@

 #include "labcurve.h"

+#include "options.h"
+
 #include "../rtengine/improcfun.h"
 #include "../rtengine/procparams.h"
 #include "editcallbacks.h"
--- a/rtgui/lockablecolorpicker.cc
+++ b/rtgui/lockablecolorpicker.cc
@ -25,8 +25,6 @@
 #include "multilangmgr.h"
 #include "navigator.h"

-extern Options options;
-
 LockableColorPicker::LockableColorPicker (CropWindow* cropWindow, Glib::ustring *oProfile, Glib::ustring *wProfile)
 : cropWindow(cropWindow), displayedValues(ColorPickerType::RGB), position(0, 0), size(Size::S15),
  outputProfile(oProfile), workingProfile(wProfile), validity(Validity::OUTSIDE),
--- a/rtgui/main-cli.cc
+++ b/rtgui/main-cli.cc
@ -55,8 +55,6 @@
 // Set this to 1 to make RT work when started with Eclipse and arguments, at least on Windows platform
 #define ECLIPSE_ARGS 0

-extern Options options;
-
 // stores path to data files
 Glib::ustring argv0;
 Glib::ustring creditsPath;
--- a/rtgui/main.cc
+++ b/rtgui/main.cc
@ -53,8 +53,6 @@
 // Set this to 1 to make RT work when started with Eclipse and arguments, at least on Windows platform
 #define ECLIPSE_ARGS 0

-extern Options options;
-
 // stores path to data files
 Glib::ustring argv0;
 Glib::ustring creditsPath;
--- a/rtgui/mycurve.h
+++ b/rtgui/mycurve.h
@ -26,7 +26,6 @@
 #include "coloredbar.h"
 #include "coordinateadjuster.h"
 #include "../rtengine/LUT.h"
-#include "options.h"
 #include "../rtengine/noncopyable.h"

 #define RADIUS          3.5 /** radius of the control points ; must be x.5 to target the center of a pixel */
--- a/rtgui/navigator.cc
+++ b/rtgui/navigator.cc
@ -23,8 +23,6 @@
 #include "../rtengine/rt_math.h"
 #include "options.h"

-extern Options options;
-
 using namespace rtengine;

 Navigator::Navigator () : currentRGBUnit(options.navRGBUnit), currentHSVUnit(options.navHSVUnit)
--- a/rtgui/options.cc
+++ b/rtgui/options.cc
@ -19,6 +19,7 @@
 #include "options.h"
 #include <cstdio>
 #include <glib/gstdio.h>
+#include <glibmm/keyfile.h>
 #include <iostream>
 #include <sstream>
 #include "multilangmgr.h"
--- a/rtgui/options.h
+++ b/rtgui/options.h
@ -16,12 +16,11 @@
 *  You should have received a copy of the GNU General Public License
 *  along with RawTherapee.  If not, see <https://www.gnu.org/licenses/>.
 */
-#ifndef _OPTIONS_
-#define _OPTIONS_
+#pragma once

 #include <set>
 #include <gtkmm/enums.h>
-#include "../rtengine/rtengine.h"
+#include "../rtengine/settings.h"
 #include <exception>

 #define STARTUPDIR_CURRENT 0
@ -103,6 +102,11 @@ enum PPLoadLocation {PLL_Cache = 0, PLL_Input = 1};
 enum CPBKeyType {CPBKT_TID = 0, CPBKT_NAME = 1, CPBKT_TID_NAME = 2};
 enum prevdemo_t {PD_Sidecar = 1, PD_Fast = 0};

+namespace Glib {
+
+class KeyFile;
+
+}
 class Options
 {
 public:
@ -447,5 +451,3 @@ extern bool gimpPlugin;
 extern bool remote;
 extern Glib::ustring versionString;
 extern Glib::ustring paramFileExtension;
-
-#endif
--- a/rtgui/preferences.cc
+++ b/rtgui/preferences.cc
@ -50,7 +50,6 @@ void placeSpinBox(Gtk::Container* where, Gtk::SpinButton* &spin, const std::stri
 }
 }

-extern Options options;
 extern Glib::ustring argv0;
 Glib::RefPtr<Gtk::CssProvider> themecss;
 Glib::RefPtr<Gtk::CssProvider> fontcss;
--- a/rtgui/renamedlg.cc
+++ b/rtgui/renamedlg.cc
@ -18,7 +18,6 @@
 */
 #include "renamedlg.h"
 #include "multilangmgr.h"
-#include "options.h"
 #include "rtimage.h"

 RenameDialog::RenameDialog (Gtk::Window* parent)
--- a/rtgui/retinex.cc
+++ b/rtgui/retinex.cc
@ -4,6 +4,7 @@
 #include "retinex.h"
 #include "mycurve.h"
 #include "rtimage.h"
+#include "options.h"

 using namespace rtengine;
 using namespace rtengine::procparams;
--- a/rtgui/rgbcurves.cc
+++ b/rtgui/rgbcurves.cc
@ -18,6 +18,8 @@
 */
 #include "rgbcurves.h"

+#include "options.h"
+
 #include "../rtengine/procparams.h"

 using namespace rtengine;
--- a/rtgui/rtimage.cc
+++ b/rtgui/rtimage.cc
@ -20,6 +20,7 @@

 #include "rtimage.h"

+#include <cassert>
 #include <iostream>

 #include "options.h"
--- a/rtgui/rtscalable.cc
+++ b/rtgui/rtscalable.cc
@ -25,11 +25,12 @@
 #include <librsvg/rsvg.h>
 #include "options.h"

+#include "../rtengine/rt_math.h"
+
 double RTScalable::dpi = 0.;
 int RTScalable::scale = 0;

 extern Glib::ustring argv0;
-extern Options options;
 extern unsigned char initialGdkScale;
 extern float fontScale;
 Gtk::TextDirection RTScalable::direction = Gtk::TextDirection::TEXT_DIR_NONE;
--- a/rtgui/saveasdlg.cc
+++ b/rtgui/saveasdlg.cc
@ -26,8 +26,6 @@

 #include "../rtengine/utils.h"

-extern Options options;
-
 namespace
 {

--- a/rtgui/saveasdlg.h
+++ b/rtgui/saveasdlg.h
@ -22,7 +22,6 @@
 #include <gtkmm.h>
 #include "adjuster.h"
 #include "saveformatpanel.h"
-#include "options.h"

 class SaveAsDialog : public Gtk::Dialog, public FormatChangeListener
 {
--- a/rtgui/thumbnail.h
+++ b/rtgui/thumbnail.h
@ -24,7 +24,6 @@

 #include <glibmm/ustring.h>
 #include "cachemanager.h"
-#include "options.h"
 #include "../rtengine/rtengine.h"
 #include "../rtengine/rtthumbnail.h"
 #include "cacheimagedata.h"
--- a/rtgui/tonecurve.cc
+++ b/rtgui/tonecurve.cc
@ -25,6 +25,7 @@
 #include "adjuster.h"
 #include "eventmapper.h"
 #include "ppversion.h"
+#include "options.h"

 #include "../rtengine/procparams.h"
 #include "editcallbacks.h"
--- a/rtgui/vibrance.cc
+++ b/rtgui/vibrance.cc
@ -18,6 +18,7 @@
 */

 #include "vibrance.h"
+#include "options.h"
 #include "../rtengine/color.h"

 using namespace rtengine;
--- a/rtgui/wavelet.cc
+++ b/rtgui/wavelet.cc
@ -23,10 +23,10 @@
 #include "editcallbacks.h"
 #include "guiutils.h"
 #include "rtimage.h"
+#include "options.h"

 using namespace rtengine;
 using namespace rtengine::procparams;
-extern Options options;

 namespace
 {
--- a/rtgui/wavelet.h
+++ b/rtgui/wavelet.h
@ -27,7 +27,6 @@
 #include "thresholdadjuster.h"
 #include "colorprovider.h"
 #include "guiutils.h"
-#include "options.h"

 class EditDataProvider;