diff --git a/rtengine/PF_correct_RT.cc b/rtengine/PF_correct_RT.cc index 40b4933ae..e1d6ef808 100644 --- a/rtengine/PF_correct_RT.cc +++ b/rtengine/PF_correct_RT.cc @@ -33,7 +33,7 @@ #include "curves.h" #include "labimage.h" #include "sleef.c" -#include "../rtgui/myflatcurve.h" +#include "curves.h" #include "rt_math.h" #include "opthelper.h" #include "median.h" diff --git a/rtengine/curves.h b/rtengine/curves.h index ef25ff8d7..4d38e9cce 100644 --- a/rtengine/curves.h +++ b/rtengine/curves.h @@ -25,10 +25,9 @@ #include #include "rt_math.h" -#include "../rtgui/mycurve.h" -#include "../rtgui/myflatcurve.h" -#include "../rtgui/mydiagonalcurve.h" #include "color.h" +#include "flatcurvetypes.h" +#include "diagonalcurvetypes.h" #include "pipettebuffer.h" #include "noncopyable.h" #include "LUT.h" diff --git a/rtengine/dcp.cc b/rtengine/dcp.cc index ea4e40514..f15ae902f 100644 --- a/rtengine/dcp.cc +++ b/rtengine/dcp.cc @@ -22,6 +22,8 @@ #include #include #include +#include +#include #include "dcp.h" @@ -31,6 +33,7 @@ #include "imagefloat.h" #include "rawimagesource.h" #include "rt_math.h" +#include "utils.h" #include "../rtgui/options.h" using namespace rtengine; diff --git a/rtengine/dfmanager.cc b/rtengine/dfmanager.cc index 798836edf..1fb1d2e1b 100644 --- a/rtengine/dfmanager.cc +++ b/rtengine/dfmanager.cc @@ -27,6 +27,7 @@ #include "../rtgui/options.h" #include "rawimage.h" #include "imagedata.h" +#include "utils.h" namespace rtengine { @@ -34,9 +35,7 @@ namespace rtengine // *********************** class dfInfo ************************************** dfInfo::~dfInfo() { - if( ri ) { - delete ri; - } + delete ri; } inline dfInfo& dfInfo::operator =(const dfInfo &o) diff --git a/rtengine/diagonalcurvetypes.h b/rtengine/diagonalcurvetypes.h new file mode 100644 index 000000000..0d304957a --- /dev/null +++ b/rtengine/diagonalcurvetypes.h @@ -0,0 +1,31 @@ +/* + * This file is part of RawTherapee. + * + * Copyright (c) 2004-2019 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 + +// For compatibility and simplicity reason, order shouldn't change, and must be identical to the order specified in the curveType widget +enum DiagonalCurveType { + DCT_Empty = -1, // Also used for identity curves + DCT_Linear, // 0 + DCT_Spline, // 1 + DCT_Parametric, // 2 + DCT_NURBS, // 3 + DCT_CatumullRom, // 4 + // Insert new curve type above this line + DCT_Unchanged // Must remain the last of the enum +}; diff --git a/rtengine/dynamicprofile.cc b/rtengine/dynamicprofile.cc index 402610ed1..0e3d75b43 100644 --- a/rtengine/dynamicprofile.cc +++ b/rtengine/dynamicprofile.cc @@ -22,6 +22,7 @@ #include #include #include +#include #include "../rtgui/options.h" diff --git a/rtengine/ffmanager.cc b/rtengine/ffmanager.cc index d8b082dd1..ce60277e1 100644 --- a/rtengine/ffmanager.cc +++ b/rtengine/ffmanager.cc @@ -54,9 +54,7 @@ inline ffInfo& ffInfo::operator =(const ffInfo &o) ffInfo::~ffInfo() { - if( ri ) { - delete ri; - } + delete ri; } bool ffInfo::operator <(const ffInfo &e2) const diff --git a/rtengine/flatcurvetypes.h b/rtengine/flatcurvetypes.h new file mode 100644 index 000000000..9efe0d259 --- /dev/null +++ b/rtengine/flatcurvetypes.h @@ -0,0 +1,29 @@ +/* + * This file is part of RawTherapee. + * + * Copyright (c) 2004-2019 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 + +// For compatibility and simplicity reason, order shouldn't change, and must be identical to the order specified in the curveType widget +enum FlatCurveType { + FCT_Empty = -1, // Also used for identity curves + FCT_Linear, // 0 + FCT_MinMaxCPoints, // 1 + //FCT_Parametric, // 2 + // Insert new curve type above this line + FCT_Unchanged // Must remain the last of the enum +}; diff --git a/rtengine/histmatching.cc b/rtengine/histmatching.cc index 622933149..f5d16866e 100644 --- a/rtengine/histmatching.cc +++ b/rtengine/histmatching.cc @@ -32,8 +32,6 @@ //#define BENCHMARK #include "StopWatch.h" -#include "../rtgui/mydiagonalcurve.h" - namespace rtengine { diff --git a/rtengine/imagedata.cc b/rtengine/imagedata.cc index 184e288e9..d952dc8ba 100644 --- a/rtengine/imagedata.cc +++ b/rtengine/imagedata.cc @@ -31,6 +31,7 @@ #include "iptcpairs.h" #include "procparams.h" #include "rt_math.h" +#include "utils.h" #pragma GCC diagnostic warning "-Wextra" #define PRINT_HDR_PS_DETECTION 0 diff --git a/rtengine/imageio.cc b/rtengine/imageio.cc index c586aabaf..5927a23be 100644 --- a/rtengine/imageio.cc +++ b/rtengine/imageio.cc @@ -27,6 +27,7 @@ #include #include "rt_math.h" #include "procparams.h" +#include "utils.h" #include "../rtgui/options.h" #include "../rtgui/version.h" diff --git a/rtengine/improccoordinator.cc b/rtengine/improccoordinator.cc index c61b37341..729682b0f 100644 --- a/rtengine/improccoordinator.cc +++ b/rtengine/improccoordinator.cc @@ -19,6 +19,7 @@ #include #include #include +#include #include "improccoordinator.h" diff --git a/rtengine/improccoordinator.h b/rtengine/improccoordinator.h index c416ebe67..c27cfe76e 100644 --- a/rtengine/improccoordinator.h +++ b/rtengine/improccoordinator.h @@ -32,6 +32,11 @@ #include "../rtgui/threadutils.h" +namespace Glib +{ +class Thread; +} + namespace rtengine { diff --git a/rtengine/ipvibrance.cc b/rtengine/ipvibrance.cc index 365dff587..1c5c6c4d5 100644 --- a/rtengine/ipvibrance.cc +++ b/rtengine/ipvibrance.cc @@ -25,7 +25,6 @@ #include "iccstore.h" #include "labimage.h" #include "mytime.h" -#include "../rtgui/thresholdselector.h" #include "curves.h" #include "color.h" #include "procparams.h" diff --git a/rtengine/myfile.h b/rtengine/myfile.h index 88b9fa62a..7c498e556 100644 --- a/rtengine/myfile.h +++ b/rtengine/myfile.h @@ -25,7 +25,8 @@ #include "opthelper.h" -namespace rtengine { +namespace rtengine +{ class ProgressListener; diff --git a/rtengine/procparams.cc b/rtengine/procparams.cc index 8de7e2b55..df5ac40a9 100644 --- a/rtengine/procparams.cc +++ b/rtengine/procparams.cc @@ -22,9 +22,13 @@ #include #include +#include +#include +#include #include "curves.h" #include "procparams.h" +#include "utils.h" #include "../rtgui/multilangmgr.h" #include "../rtgui/options.h" diff --git a/rtengine/rtengine.h b/rtengine/rtengine.h index 389fe8355..d1300f023 100644 --- a/rtengine/rtengine.h +++ b/rtengine/rtengine.h @@ -33,7 +33,6 @@ #include "rawmetadatalocation.h" #include "rt_math.h" #include "settings.h" -#include "utils.h" #include "../rtexif/rtexif.h" diff --git a/rtengine/rtthumbnail.cc b/rtengine/rtthumbnail.cc index 3b6046b4e..d6ff53750 100644 --- a/rtengine/rtthumbnail.cc +++ b/rtengine/rtthumbnail.cc @@ -23,6 +23,8 @@ #include #include +#include +#include #include "cieimage.h" #include "colortemp.h" diff --git a/rtengine/simpleprocess.cc b/rtengine/simpleprocess.cc index 2953fc34b..3c89fe48d 100644 --- a/rtengine/simpleprocess.cc +++ b/rtengine/simpleprocess.cc @@ -30,6 +30,7 @@ #include "processingjob.h" #include "procparams.h" #include +#include #include "../rtgui/options.h" #include "rawimagesource.h" #include "../rtgui/multilangmgr.h" diff --git a/rtengine/stdimagesource.cc b/rtengine/stdimagesource.cc index 2e8846412..1cb11e94d 100644 --- a/rtengine/stdimagesource.cc +++ b/rtengine/stdimagesource.cc @@ -26,6 +26,7 @@ #include "imageio.h" #include "mytime.h" #include "procparams.h" +#include "utils.h" #undef THREAD_PRIORITY_NORMAL diff --git a/rtexif/rtexif.cc b/rtexif/rtexif.cc index 4e3be8486..b2edc2842 100644 --- a/rtexif/rtexif.cc +++ b/rtexif/rtexif.cc @@ -29,6 +29,7 @@ #include #include +#include #include "rtexif.h" diff --git a/rtexif/rtexif.h b/rtexif/rtexif.h index 515c7569d..4c5a6cafe 100644 --- a/rtexif/rtexif.h +++ b/rtexif/rtexif.h @@ -29,12 +29,15 @@ #include #include -#include #include #include "../rtengine/noncopyable.h" #include "../rtengine/rawmetadatalocation.h" +namespace Glib +{ + class KeyFile; +} namespace rtengine { diff --git a/rtgui/adjuster.cc b/rtgui/adjuster.cc index 91394e18d..302a2de00 100644 --- a/rtgui/adjuster.cc +++ b/rtgui/adjuster.cc @@ -17,14 +17,14 @@ * along with RawTherapee. If not, see . */ #include "adjuster.h" + #include #include -#include "multilangmgr.h" -#include "../rtengine/rt_math.h" -#include "options.h" -#include "guiutils.h" -#include "rtimage.h" +#include "multilangmgr.h" +#include "options.h" +#include "rtimage.h" +#include "../rtengine/rt_math.h" namespace { diff --git a/rtgui/adjuster.h b/rtgui/adjuster.h index 1583bab69..9800dbac8 100644 --- a/rtgui/adjuster.h +++ b/rtgui/adjuster.h @@ -18,8 +18,6 @@ */ #pragma once -#include - #include "editedstate.h" #include "guiutils.h" diff --git a/rtgui/batchqueue.cc b/rtgui/batchqueue.cc index ed9861ad6..9fcaa28d1 100644 --- a/rtgui/batchqueue.cc +++ b/rtgui/batchqueue.cc @@ -34,6 +34,7 @@ #include "filecatalog.h" #include "batchqueuebuttonset.h" #include "guiutils.h" +#include "pathutils.h" #include "rtimage.h" #include diff --git a/rtgui/bayerprocess.cc b/rtgui/bayerprocess.cc index aa09067e4..4a57177e1 100644 --- a/rtgui/bayerprocess.cc +++ b/rtgui/bayerprocess.cc @@ -23,6 +23,7 @@ #include "options.h" #include "../rtengine/procparams.h" +#include "../rtengine/utils.h" using namespace rtengine; using namespace rtengine::procparams; diff --git a/rtgui/blackwhite.cc b/rtgui/blackwhite.cc index 482bf437f..b3ebea28a 100644 --- a/rtgui/blackwhite.cc +++ b/rtgui/blackwhite.cc @@ -27,6 +27,7 @@ #include "../rtengine/color.h" #include "../rtengine/procparams.h" +#include "../rtengine/utils.h" using namespace rtengine; using namespace rtengine::procparams; diff --git a/rtgui/cacheimagedata.cc b/rtgui/cacheimagedata.cc index 114508a95..d44ca28ec 100644 --- a/rtgui/cacheimagedata.cc +++ b/rtgui/cacheimagedata.cc @@ -19,6 +19,7 @@ #include "cacheimagedata.h" #include #include +#include #include "version.h" #include diff --git a/rtgui/clipboard.h b/rtgui/clipboard.h index d142808e9..7d25dd0d5 100644 --- a/rtgui/clipboard.h +++ b/rtgui/clipboard.h @@ -21,10 +21,10 @@ #include #include -#include "mydiagonalcurve.h" -#include "myflatcurve.h" #include "paramsedited.h" +#include "../rtengine/diagonalcurvetypes.h" +#include "../rtengine/flatcurvetypes.h" #include "../rtengine/rtengine.h" namespace rtengine diff --git a/rtgui/colorappearance.cc b/rtgui/colorappearance.cc index 450589fe9..094ffec2f 100644 --- a/rtgui/colorappearance.cc +++ b/rtgui/colorappearance.cc @@ -26,6 +26,7 @@ #include "../rtengine/color.h" #include "../rtengine/procparams.h" +#include "../rtengine/utils.h" #define MINTEMP0 2000 //1200 #define MAXTEMP0 12000 //12000 diff --git a/rtgui/colorprovider.h b/rtgui/colorprovider.h index a84b1be27..988b080bd 100644 --- a/rtgui/colorprovider.h +++ b/rtgui/colorprovider.h @@ -18,8 +18,6 @@ */ #pragma once -#include - class ColorProvider; /* diff --git a/rtgui/curveeditor.h b/rtgui/curveeditor.h index dd61bc910..535c1a86d 100644 --- a/rtgui/curveeditor.h +++ b/rtgui/curveeditor.h @@ -20,10 +20,10 @@ #include "coloredbar.h" #include "editcallbacks.h" -#include "mydiagonalcurve.h" -#include "myflatcurve.h" #include "popuptogglebutton.h" +#include "../rtengine/diagonalcurvetypes.h" +#include "../rtengine/flatcurvetypes.h" #include "../rtengine/LUT.h" #include "../rtengine/noncopyable.h" diff --git a/rtgui/curveeditorgroup.cc b/rtgui/curveeditorgroup.cc index edad0349d..06def0a8e 100644 --- a/rtgui/curveeditorgroup.cc +++ b/rtgui/curveeditorgroup.cc @@ -26,6 +26,7 @@ #include "multilangmgr.h" #include "rtimage.h" #include "options.h" +#include "pathutils.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) diff --git a/rtgui/curveeditorgroup.h b/rtgui/curveeditorgroup.h index 7c39ab186..e3412546f 100644 --- a/rtgui/curveeditorgroup.h +++ b/rtgui/curveeditorgroup.h @@ -26,10 +26,11 @@ #include "adjuster.h" #include "guiutils.h" #include "mycurve.h" -#include "mydiagonalcurve.h" -#include "myflatcurve.h" #include "shcselector.h" +#include "../rtengine/diagonalcurvetypes.h" +#include "../rtengine/flatcurvetypes.h" + class CurveEditor; class DiagonalCurveEditorSubGroup; class FlatCurveEditorSubGroup; diff --git a/rtgui/darkframe.h b/rtgui/darkframe.h index 7bb6ed507..779caf16f 100644 --- a/rtgui/darkframe.h +++ b/rtgui/darkframe.h @@ -25,11 +25,13 @@ #include "guiutils.h" #include "toolpanel.h" -namespace rtengine { +namespace rtengine +{ class RawImage; } + class DFProvider { public: diff --git a/rtgui/diagonalcurveeditorsubgroup.h b/rtgui/diagonalcurveeditorsubgroup.h index 21784578e..184fa576f 100644 --- a/rtgui/diagonalcurveeditorsubgroup.h +++ b/rtgui/diagonalcurveeditorsubgroup.h @@ -25,6 +25,7 @@ #include "../rtengine/noncopyable.h" class DiagonalCurveEditor; +class MyDiagonalCurve; class DiagonalCurveEditorSubGroup : public CurveEditorSubGroup, diff --git a/rtgui/editorpanel.cc b/rtgui/editorpanel.cc index 6aab153a1..3c5182938 100644 --- a/rtgui/editorpanel.cc +++ b/rtgui/editorpanel.cc @@ -32,6 +32,7 @@ #include "progressconnector.h" #include "procparamchangers.h" #include "placesbrowser.h" +#include "pathutils.h" using namespace rtengine::procparams; diff --git a/rtgui/filecatalog.cc b/rtgui/filecatalog.cc index 8e8bcc216..fb8bd4923 100644 --- a/rtgui/filecatalog.cc +++ b/rtgui/filecatalog.cc @@ -36,6 +36,7 @@ #include "thumbimageupdater.h" #include "batchqueue.h" #include "placesbrowser.h" +#include "pathutils.h" using namespace std; diff --git a/rtgui/flatcurveeditorsubgroup.h b/rtgui/flatcurveeditorsubgroup.h index 5b14f752a..c358dde3b 100644 --- a/rtgui/flatcurveeditorsubgroup.h +++ b/rtgui/flatcurveeditorsubgroup.h @@ -25,6 +25,7 @@ #include "../rtengine/noncopyable.h" class FlatCurveEditor; +class MyFlatCurve; class FlatCurveEditorSubGroup: public CurveEditorSubGroup, diff --git a/rtgui/flatfield.h b/rtgui/flatfield.h index 8b04a7948..4308e938a 100644 --- a/rtgui/flatfield.h +++ b/rtgui/flatfield.h @@ -26,11 +26,13 @@ #include "guiutils.h" #include "toolpanel.h" -namespace rtengine { +namespace rtengine +{ class RawImage; } + class FFProvider { public: diff --git a/rtgui/guiutils.h b/rtgui/guiutils.h index 18b650b82..8764f4c6a 100644 --- a/rtgui/guiutils.h +++ b/rtgui/guiutils.h @@ -25,7 +25,6 @@ #include -#include "pathutils.h" #include "threadutils.h" #include "../rtengine/coord.h" diff --git a/rtgui/iccprofilecreator.cc b/rtgui/iccprofilecreator.cc index e3e1eadb4..d7f9499f6 100644 --- a/rtgui/iccprofilecreator.cc +++ b/rtgui/iccprofilecreator.cc @@ -24,6 +24,7 @@ #include "cachemanager.h" #include "addsetids.h" #include "../rtengine/color.h" +#include "pathutils.h" #include "rtimage.h" #ifdef _OPENMP #include diff --git a/rtgui/icmpanel.cc b/rtgui/icmpanel.cc index 99bd6cfca..3e3c0508c 100644 --- a/rtgui/icmpanel.cc +++ b/rtgui/icmpanel.cc @@ -23,6 +23,7 @@ #include "eventmapper.h" #include "guiutils.h" #include "options.h" +#include "pathutils.h" #include "rtimage.h" #include "../rtengine/dcp.h" diff --git a/rtgui/inspector.cc b/rtgui/inspector.cc index 50fa933e1..d38239cde 100644 --- a/rtgui/inspector.cc +++ b/rtgui/inspector.cc @@ -22,6 +22,7 @@ #include "cursormanager.h" #include "guiutils.h" #include "options.h" +#include "pathutils.h" #include "rtscalable.h" #include "../rtengine/previewimage.h" diff --git a/rtgui/lockablecolorpicker.cc b/rtgui/lockablecolorpicker.cc index a4f3dbdab..cb334c7e4 100644 --- a/rtgui/lockablecolorpicker.cc +++ b/rtgui/lockablecolorpicker.cc @@ -21,6 +21,7 @@ #include "options.h" #include "../rtengine/color.h" #include "../rtengine/rt_math.h" +#include "../rtengine/utils.h" #include "imagearea.h" #include "multilangmgr.h" #include "navigator.h" diff --git a/rtgui/mydiagonalcurve.h b/rtgui/mydiagonalcurve.h index 058c11e5a..d9f2518fb 100644 --- a/rtgui/mydiagonalcurve.h +++ b/rtgui/mydiagonalcurve.h @@ -27,18 +27,8 @@ #include "mycurve.h" #include "../rtengine/LUT.h" +#include "../rtengine/diagonalcurvetypes.h" -// For compatibility and simplicity reason, order shouldn't change, and must be identical to the order specified in the curveType widget -enum DiagonalCurveType { - DCT_Empty = -1, // Also used for identity curves - DCT_Linear, // 0 - DCT_Spline, // 1 - DCT_Parametric, // 2 - DCT_NURBS, // 3 - DCT_CatumullRom, // 4 - // Insert new curve type above this line - DCT_Unchanged // Must remain the last of the enum -}; class DiagonalCurveDescr { diff --git a/rtgui/myflatcurve.h b/rtgui/myflatcurve.h index c4cbfa291..88d651a05 100644 --- a/rtgui/myflatcurve.h +++ b/rtgui/myflatcurve.h @@ -25,16 +25,7 @@ #include "cursormanager.h" #include "curvelistener.h" #include "mycurve.h" - -// For compatibility and simplicity reason, order shouldn't change, and must be identical to the order specified in the curveType widget -enum FlatCurveType { - FCT_Empty = -1, // Also used for identity curves - FCT_Linear, // 0 - FCT_MinMaxCPoints, // 1 - //FCT_Parametric, // 2 - // Insert new curve type above this line - FCT_Unchanged // Must remain the last of the enum -}; +#include "../rtengine/flatcurvetypes.h" enum MouseOverAreas { FCT_Area_None = 1 << 0, // over a zone that don't have any diff --git a/rtgui/options.cc b/rtgui/options.cc index 164637eb2..f5b6b5b60 100644 --- a/rtgui/options.cc +++ b/rtgui/options.cc @@ -25,10 +25,12 @@ #include "multilangmgr.h" #include "addsetids.h" #include "guiutils.h" +#include "pathutils.h" #include "version.h" #include "../rtengine/procparams.h" #include "../rtengine/rtengine.h" +#include "../rtengine/utils.h" #ifdef _OPENMP #include diff --git a/rtgui/options.h b/rtgui/options.h index 33d6b6f90..c0ed2138b 100644 --- a/rtgui/options.h +++ b/rtgui/options.h @@ -103,11 +103,13 @@ 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 { +namespace Glib +{ class KeyFile; } + class Options { public: diff --git a/rtgui/profilepanel.cc b/rtgui/profilepanel.cc index fc418e5b7..723bbfd61 100644 --- a/rtgui/profilepanel.cc +++ b/rtgui/profilepanel.cc @@ -22,6 +22,7 @@ #include "multilangmgr.h" #include "options.h" #include "profilestorecombobox.h" +#include "pathutils.h" #include "rtimage.h" #include "../rtengine/procparams.h" diff --git a/rtgui/saveasdlg.cc b/rtgui/saveasdlg.cc index 5516bdf7c..ebf2f5b4a 100644 --- a/rtgui/saveasdlg.cc +++ b/rtgui/saveasdlg.cc @@ -22,6 +22,7 @@ #include "guiutils.h" #include "multilangmgr.h" +#include "pathutils.h" #include "rtimage.h" #include "../rtengine/utils.h" diff --git a/rtgui/thumbnail.cc b/rtgui/thumbnail.cc index 09ffd11f7..7464244f7 100644 --- a/rtgui/thumbnail.cc +++ b/rtgui/thumbnail.cc @@ -32,6 +32,7 @@ #include "guiutils.h" #include "batchqueue.h" #include "extprog.h" +#include "pathutils.h" #include "profilestorecombobox.h" #include "procparamchangers.h" diff --git a/rtgui/tonecurve.cc b/rtgui/tonecurve.cc index 1f660f72a..68f3ee4de 100644 --- a/rtgui/tonecurve.cc +++ b/rtgui/tonecurve.cc @@ -28,6 +28,7 @@ #include "options.h" #include "../rtengine/procparams.h" +#include "../rtengine/utils.h" #include "editcallbacks.h" using namespace rtengine; diff --git a/rtgui/whitebalance.h b/rtgui/whitebalance.h index 5c0500b92..528c81d17 100644 --- a/rtgui/whitebalance.h +++ b/rtgui/whitebalance.h @@ -26,6 +26,7 @@ #include "wbprovider.h" #include "../rtengine/procparams.h" +#include "../rtengine/utils.h" class SpotWBListener {