From 711f274403dea27d39e34b6938980affce05e6ca Mon Sep 17 00:00:00 2001 From: Daniel Gao Date: Sat, 16 Nov 2024 17:20:02 -0500 Subject: [PATCH] Get rid of relative include paths * Use target_include_directories to specify include paths * Specify project root (parent of rtgui and rtengine) as include path * Replace relative includes with normal includes --- rtengine/CMakeLists.txt | 14 ++++++++++++-- rtengine/FTblockDN.cc | 4 ++-- rtengine/ahd_demosaic_RT.cc | 2 +- rtengine/amaze_demosaic_RT.cc | 2 +- rtengine/cache.h | 2 +- rtengine/capturesharpening.cc | 2 +- rtengine/clutstore.cc | 2 +- rtengine/dcp.cc | 2 +- rtengine/dcp.h | 2 +- rtengine/dcrop.cc | 2 +- rtengine/dcrop.h | 2 +- rtengine/demosaic_algos.cc | 2 +- rtengine/dfmanager.cc | 2 +- rtengine/dual_demosaic_RT.cc | 2 +- rtengine/dynamicprofile.cc | 2 +- rtengine/eahd_demosaic.cc | 2 +- rtengine/fast_demo.cc | 2 +- rtengine/ffmanager.cc | 2 +- rtengine/hphd_demosaic_RT.cc | 2 +- rtengine/iccstore.cc | 4 ++-- rtengine/iimage.h | 2 +- rtengine/imageio.cc | 4 ++-- rtengine/improccoordinator.cc | 2 +- rtengine/improccoordinator.h | 2 +- rtengine/improcfun.cc | 2 +- rtengine/init.cc | 2 +- rtengine/ipdehaze.cc | 2 +- rtengine/iplocallab.cc | 4 ++-- rtengine/ipwavelet.cc | 2 +- rtengine/lmmse_demosaic.cc | 2 +- rtengine/metadata.cc | 4 ++-- rtengine/perspectivecorrection.cc | 2 +- rtengine/pipettebuffer.cc | 2 +- rtengine/pixelshift.cc | 4 ++-- rtengine/procparams.cc | 10 +++++----- rtengine/profilestore.cc | 4 ++-- rtengine/profilestore.h | 2 +- rtengine/rawimagesource.cc | 2 +- rtengine/rcd_demosaic.cc | 2 +- rtengine/rtengine.h | 2 +- rtengine/rtthumbnail.h | 2 +- rtengine/simpleprocess.cc | 4 ++-- rtengine/vng4_demosaic_RT.cc | 2 +- rtengine/xtrans_demosaic.cc | 2 +- rtgui/CMakeLists.txt | 16 +++++++++++----- rtgui/adjuster.cc | 2 +- rtgui/batchqueue.cc | 6 +++--- rtgui/batchqueue.h | 4 ++-- rtgui/batchqueueentry.cc | 4 ++-- rtgui/batchqueueentry.h | 2 +- rtgui/batchtoolpanelcoord.h | 4 ++-- rtgui/bayerpreprocess.cc | 2 +- rtgui/bayerprocess.cc | 4 ++-- rtgui/bayerrawexposure.cc | 2 +- rtgui/blackwhite.cc | 6 +++--- rtgui/bqentryupdater.cc | 2 +- rtgui/cacheimagedata.cc | 4 ++-- rtgui/cacheimagedata.h | 6 +++--- rtgui/cachemanager.h | 2 +- rtgui/cacorrection.cc | 2 +- rtgui/chmixer.cc | 2 +- rtgui/clipboard.cc | 2 +- rtgui/clipboard.h | 4 ++-- rtgui/coarsepanel.cc | 2 +- rtgui/colorappearance.cc | 6 +++--- rtgui/coloredbar.cc | 2 +- rtgui/colortoning.cc | 2 +- rtgui/colortoning.h | 2 +- rtgui/controllines.cc | 2 +- rtgui/controllines.h | 2 +- rtgui/controlspotpanel.cc | 4 ++-- rtgui/controlspotpanel.h | 2 +- rtgui/crop.cc | 4 ++-- rtgui/crophandler.cc | 8 ++++---- rtgui/crophandler.h | 2 +- rtgui/cropwindow.cc | 8 ++++---- rtgui/cropwindow.h | 2 +- rtgui/curveeditor.cc | 2 +- rtgui/curveeditor.h | 8 ++++---- rtgui/curveeditorgroup.h | 4 ++-- rtgui/darkframe.cc | 4 ++-- rtgui/defringe.cc | 4 ++-- rtgui/dehaze.cc | 2 +- rtgui/delayed.h | 2 +- rtgui/diagonalcurveeditorsubgroup.cc | 2 +- rtgui/diagonalcurveeditorsubgroup.h | 2 +- rtgui/dirpyrdenoise.cc | 6 +++--- rtgui/dirpyrequalizer.cc | 2 +- rtgui/distortion.cc | 4 ++-- rtgui/dynamicprofilepanel.cc | 8 ++++---- rtgui/dynamicprofilepanel.h | 2 +- rtgui/editcallbacks.h | 2 +- rtgui/editorpanel.cc | 8 ++++---- rtgui/editorpanel.h | 4 ++-- rtgui/editwidgets.h | 4 ++-- rtgui/editwindow.cc | 2 +- rtgui/epd.cc | 2 +- rtgui/eventmapper.h | 2 +- rtgui/exifpanel.cc | 6 +++--- rtgui/exportpanel.cc | 2 +- rtgui/fattaltonemap.cc | 2 +- rtgui/filebrowser.cc | 6 +++--- rtgui/filebrowser.h | 4 ++-- rtgui/filebrowserentry.cc | 2 +- rtgui/filebrowserentry.h | 4 ++-- rtgui/filecatalog.cc | 4 ++-- rtgui/filecatalog.h | 2 +- rtgui/filepanel.h | 2 +- rtgui/filmnegative.cc | 4 ++-- rtgui/filmnegative.h | 2 +- rtgui/filmsimulation.cc | 4 ++-- rtgui/filterpanel.cc | 2 +- rtgui/flatcurveeditorsubgroup.cc | 2 +- rtgui/flatcurveeditorsubgroup.h | 2 +- rtgui/flatfield.cc | 4 ++-- rtgui/gradient.cc | 4 ++-- rtgui/guiutils.cc | 6 +++--- rtgui/guiutils.h | 4 ++-- rtgui/histogrampanel.cc | 8 ++++---- rtgui/histogrampanel.h | 6 +++--- rtgui/history.cc | 2 +- rtgui/history.h | 2 +- rtgui/hsvequalizer.cc | 4 ++-- rtgui/iccprofilecreator.cc | 4 ++-- rtgui/icmpanel.cc | 8 ++++---- rtgui/icmpanel.h | 2 +- rtgui/imagearea.cc | 4 ++-- rtgui/impulsedenoise.cc | 2 +- rtgui/inspector.cc | 4 ++-- rtgui/inspector.h | 2 +- rtgui/iptcpanel.cc | 6 +++--- rtgui/labcurve.cc | 6 +++--- rtgui/labgrid.cc | 2 +- rtgui/lensgeom.cc | 2 +- rtgui/lensprofile.cc | 8 ++++---- rtgui/lensprofile.h | 2 +- rtgui/localcontrast.cc | 2 +- rtgui/locallab.cc | 2 +- rtgui/locallabtools.cc | 4 ++-- rtgui/locallabtools2.cc | 6 +++--- rtgui/lockablecolorpicker.cc | 8 ++++---- rtgui/lockablecolorpicker.h | 2 +- rtgui/main-cli.cc | 6 +++--- rtgui/main.cc | 4 ++-- rtgui/metadatapanel.cc | 2 +- rtgui/multilangmgr.cc | 2 +- rtgui/mycurve.cc | 2 +- rtgui/mycurve.h | 4 ++-- rtgui/mydiagonalcurve.cc | 2 +- rtgui/mydiagonalcurve.h | 2 +- rtgui/myflatcurve.cc | 2 +- rtgui/myflatcurve.h | 2 +- rtgui/navigator.cc | 6 +++--- rtgui/options.cc | 6 +++--- rtgui/options.h | 2 +- rtgui/paramsedited.cc | 2 +- rtgui/partialpastedlg.cc | 2 +- rtgui/pcvignette.cc | 2 +- rtgui/pdsharpening.cc | 2 +- rtgui/perspective.cc | 2 +- rtgui/perspective.h | 2 +- rtgui/preferences.cc | 8 ++++---- rtgui/preferences.h | 2 +- rtgui/preprocess.cc | 2 +- rtgui/preprocesswb.cc | 2 +- rtgui/previewhandler.cc | 4 ++-- rtgui/previewhandler.h | 4 ++-- rtgui/previewloader.h | 2 +- rtgui/previewwindow.cc | 2 +- rtgui/profilepanel.cc | 4 ++-- rtgui/profilepanel.h | 4 ++-- rtgui/profilestorecombobox.cc | 4 ++-- rtgui/progressconnector.h | 2 +- rtgui/rawcacorrection.cc | 2 +- rtgui/rawexposure.cc | 2 +- rtgui/resize.cc | 2 +- rtgui/retinex.cc | 2 +- rtgui/rgbcurves.cc | 2 +- rtgui/rotate.cc | 2 +- rtgui/rtscalable.cc | 2 +- rtgui/rtwindow.cc | 2 +- rtgui/rtwindow.h | 2 +- rtgui/saveasdlg.cc | 2 +- rtgui/saveformatpanel.h | 2 +- rtgui/shadowshighlights.cc | 2 +- rtgui/sharpenedge.cc | 2 +- rtgui/sharpenmicro.cc | 2 +- rtgui/softlight.cc | 2 +- rtgui/spot.cc | 4 ++-- rtgui/spot.h | 4 ++-- rtgui/threadutils.h | 2 +- rtgui/thresholdadjuster.cc | 2 +- rtgui/thresholdselector.cc | 2 +- rtgui/thresholdselector.h | 2 +- rtgui/thumbbrowserbase.cc | 2 +- rtgui/thumbbrowserentrybase.cc | 2 +- rtgui/thumbbrowserentrybase.h | 2 +- rtgui/thumbimageupdater.cc | 2 +- rtgui/thumbimageupdater.h | 2 +- rtgui/thumbnail.cc | 16 ++++++++-------- rtgui/tonecurve.cc | 4 ++-- rtgui/toolpanel.cc | 2 +- rtgui/toolpanel.h | 4 ++-- rtgui/toolpanelcoord.cc | 14 +++++++------- rtgui/toolpanelcoord.h | 4 ++-- rtgui/vibrance.cc | 2 +- rtgui/vignetting.cc | 2 +- rtgui/wavelet.cc | 2 +- rtgui/whitebalance.cc | 2 +- rtgui/whitebalance.h | 4 ++-- rtgui/xtransprocess.cc | 2 +- rtgui/xtransrawexposure.cc | 2 +- 212 files changed, 358 insertions(+), 342 deletions(-) diff --git a/rtengine/CMakeLists.txt b/rtengine/CMakeLists.txt index d3a137959..6b388ced4 100644 --- a/rtengine/CMakeLists.txt +++ b/rtengine/CMakeLists.txt @@ -224,8 +224,6 @@ if(NOT WITH_SYSTEM_KLT) set(KLT_LIBRARIES) endif() -include_directories(BEFORE "${CMAKE_CURRENT_BINARY_DIR}") - add_library(rtengine STATIC "${RTENGINESOURCEFILES}") add_dependencies(rtengine UpdateInfo) @@ -237,6 +235,18 @@ endif() set_target_properties(rtengine PROPERTIES COMPILE_FLAGS "${RTENGINE_CXX_FLAGS}") +target_include_directories(rtengine + PUBLIC + # Other libraries should use #include "rtengine/header.h" + ${PROJECT_SOURCE_DIR} + PRIVATE + # Subdirectories that are not libraries themselves should be included + # like #include "your_subdirectory/header.h" + ${CMAKE_CURRENT_SOURCE_DIR} +) +# UpdateInfo creates "rtgui/version.h" +target_include_directories(rtengine BEFORE PRIVATE ${CMAKE_BINARY_DIR}) + target_link_libraries(rtengine ${EXPAT_LIBRARIES} ${EXTRA_LIB} diff --git a/rtengine/FTblockDN.cc b/rtengine/FTblockDN.cc index 4d8750929..ad0382bea 100644 --- a/rtengine/FTblockDN.cc +++ b/rtengine/FTblockDN.cc @@ -43,8 +43,8 @@ #include "procparams.h" #include "rt_math.h" #include "sleef.h" -#include "../rtgui/threadutils.h" -#include "../rtgui/options.h" +#include "rtgui/threadutils.h" +#include "rtgui/options.h" #ifdef _OPENMP #include diff --git a/rtengine/ahd_demosaic_RT.cc b/rtengine/ahd_demosaic_RT.cc index 536726925..17ab81869 100644 --- a/rtengine/ahd_demosaic_RT.cc +++ b/rtengine/ahd_demosaic_RT.cc @@ -27,7 +27,7 @@ #include "rtengine.h" #include "rawimagesource.h" #include "rt_math.h" -#include "../rtgui/multilangmgr.h" +#include "rtgui/multilangmgr.h" #include "median.h" //#define BENCHMARK #include "StopWatch.h" diff --git a/rtengine/amaze_demosaic_RT.cc b/rtengine/amaze_demosaic_RT.cc index 2041f3130..061cd4534 100644 --- a/rtengine/amaze_demosaic_RT.cc +++ b/rtengine/amaze_demosaic_RT.cc @@ -29,7 +29,7 @@ #include "rtengine.h" #include "rawimagesource.h" #include "rt_math.h" -#include "../rtgui/multilangmgr.h" +#include "rtgui/multilangmgr.h" #include "sleef.h" #include "opthelper.h" #include "median.h" diff --git a/rtengine/cache.h b/rtengine/cache.h index 77a2017f3..e5f8704b6 100644 --- a/rtengine/cache.h +++ b/rtengine/cache.h @@ -26,7 +26,7 @@ #include #include -#include "../rtgui/threadutils.h" +#include "rtgui/threadutils.h" namespace rtengine { diff --git a/rtengine/capturesharpening.cc b/rtengine/capturesharpening.cc index 83c44aa18..131ce8c2a 100644 --- a/rtengine/capturesharpening.cc +++ b/rtengine/capturesharpening.cc @@ -29,7 +29,7 @@ //#define BENCHMARK #include "StopWatch.h" #include "opthelper.h" -#include "../rtgui/multilangmgr.h" +#include "rtgui/multilangmgr.h" namespace { diff --git a/rtengine/clutstore.cc b/rtengine/clutstore.cc index e3bd9c988..db2216a8c 100644 --- a/rtengine/clutstore.cc +++ b/rtengine/clutstore.cc @@ -13,7 +13,7 @@ #include "rt_math.h" #include "stdimagesource.h" -#include "../rtgui/options.h" +#include "rtgui/options.h" namespace { diff --git a/rtengine/dcp.cc b/rtengine/dcp.cc index 96ade2e36..c6eab3b2a 100644 --- a/rtengine/dcp.cc +++ b/rtengine/dcp.cc @@ -36,7 +36,7 @@ #include "rawimagesource.h" #include "rt_math.h" #include "utils.h" -#include "../rtgui/options.h" +#include "rtgui/options.h" using namespace rtengine; diff --git a/rtengine/dcp.h b/rtengine/dcp.h index 2aec6da12..43ea07d8c 100644 --- a/rtengine/dcp.h +++ b/rtengine/dcp.h @@ -26,7 +26,7 @@ #include -#include "../rtgui/threadutils.h" +#include "rtgui/threadutils.h" #include "curves.h" #include "noncopyable.h" diff --git a/rtengine/dcrop.cc b/rtengine/dcrop.cc index bbb2d4bfa..ec88a50a3 100644 --- a/rtengine/dcrop.cc +++ b/rtengine/dcrop.cc @@ -37,7 +37,7 @@ #include "rt_math.h" #include "utils.h" -#include "../rtgui/editcallbacks.h" +#include "rtgui/editcallbacks.h" #pragma GCC diagnostic warning "-Wall" #pragma GCC diagnostic warning "-Wextra" diff --git a/rtengine/dcrop.h b/rtengine/dcrop.h index 19d84c3f3..08032f49f 100644 --- a/rtengine/dcrop.h +++ b/rtengine/dcrop.h @@ -20,7 +20,7 @@ #include "rtengine.h" #include "pipettebuffer.h" -#include "../rtgui/threadutils.h" +#include "rtgui/threadutils.h" namespace rtengine { diff --git a/rtengine/demosaic_algos.cc b/rtengine/demosaic_algos.cc index e5eb5a5aa..8e63b9522 100644 --- a/rtengine/demosaic_algos.cc +++ b/rtengine/demosaic_algos.cc @@ -23,7 +23,7 @@ #include "rawimage.h" #include "rt_math.h" #include "color.h" -#include "../rtgui/multilangmgr.h" +#include "rtgui/multilangmgr.h" #include "opthelper.h" #include "median.h" //#define BENCHMARK diff --git a/rtengine/dfmanager.cc b/rtengine/dfmanager.cc index 5ad664b52..875517b24 100644 --- a/rtengine/dfmanager.cc +++ b/rtengine/dfmanager.cc @@ -36,7 +36,7 @@ #include "rawimage.h" #include "utils.h" -#include "../rtgui/options.h" +#include "rtgui/options.h" namespace { diff --git a/rtengine/dual_demosaic_RT.cc b/rtengine/dual_demosaic_RT.cc index 558d9095b..749d07ed7 100644 --- a/rtengine/dual_demosaic_RT.cc +++ b/rtengine/dual_demosaic_RT.cc @@ -31,7 +31,7 @@ #include "rt_math.h" #include "rtengine.h" -#include "../rtgui/options.h" +#include "rtgui/options.h" using namespace std; diff --git a/rtengine/dynamicprofile.cc b/rtengine/dynamicprofile.cc index 3ae009537..4ee342d8b 100644 --- a/rtengine/dynamicprofile.cc +++ b/rtengine/dynamicprofile.cc @@ -27,7 +27,7 @@ #include #include "rtengine.h" -#include "../rtgui/options.h" +#include "rtgui/options.h" using namespace rtengine; using namespace rtengine::procparams; diff --git a/rtengine/eahd_demosaic.cc b/rtengine/eahd_demosaic.cc index 009be0714..effd47f19 100644 --- a/rtengine/eahd_demosaic.cc +++ b/rtengine/eahd_demosaic.cc @@ -26,7 +26,7 @@ #include "jaggedarray.h" #include "iccmatrices.h" #include "rt_math.h" -#include "../rtgui/multilangmgr.h" +#include "rtgui/multilangmgr.h" //#define BENCHMARK #include "StopWatch.h" diff --git a/rtengine/fast_demo.cc b/rtengine/fast_demo.cc index ca8fb4cc4..1748b0ede 100644 --- a/rtengine/fast_demo.cc +++ b/rtengine/fast_demo.cc @@ -24,7 +24,7 @@ #include #include "rawimagesource.h" -#include "../rtgui/multilangmgr.h" +#include "rtgui/multilangmgr.h" #include "opthelper.h" using namespace std; diff --git a/rtengine/ffmanager.cc b/rtengine/ffmanager.cc index 8a7d6a524..984af1e82 100644 --- a/rtengine/ffmanager.cc +++ b/rtengine/ffmanager.cc @@ -21,7 +21,7 @@ #include #include "ffmanager.h" -#include "../rtgui/options.h" +#include "rtgui/options.h" #include "rawimage.h" #include "imagedata.h" #include "median.h" diff --git a/rtengine/hphd_demosaic_RT.cc b/rtengine/hphd_demosaic_RT.cc index 936c8fa4f..88f17eaf6 100644 --- a/rtengine/hphd_demosaic_RT.cc +++ b/rtengine/hphd_demosaic_RT.cc @@ -23,7 +23,7 @@ #include "rawimagesource_i.h" #include "jaggedarray.h" #include "rt_math.h" -#include "../rtgui/multilangmgr.h" +#include "rtgui/multilangmgr.h" #include "opthelper.h" //#define BENCHMARK #include "StopWatch.h" diff --git a/rtengine/iccstore.cc b/rtengine/iccstore.cc index 86a9c214b..96962e772 100644 --- a/rtengine/iccstore.cc +++ b/rtengine/iccstore.cc @@ -38,8 +38,8 @@ #include "iccmatrices.h" #include "utils.h" -#include "../rtgui/options.h" -#include "../rtgui/threadutils.h" +#include "rtgui/options.h" +#include "rtgui/threadutils.h" #include "lcms2_plugin.h" #include "color.h" diff --git a/rtengine/iimage.h b/rtengine/iimage.h index 3e865bb2b..9a5525e7f 100644 --- a/rtengine/iimage.h +++ b/rtengine/iimage.h @@ -29,7 +29,7 @@ #include "LUT.h" #include "rt_math.h" #include "procparams.h" -#include "../rtgui/threadutils.h" +#include "rtgui/threadutils.h" #define TR_NONE 0 #define TR_R90 1 diff --git a/rtengine/imageio.cc b/rtengine/imageio.cc index 36c16f0d2..d85df23a6 100644 --- a/rtengine/imageio.cc +++ b/rtengine/imageio.cc @@ -52,8 +52,8 @@ #include "settings.h" #include "utils.h" -#include "../rtgui/options.h" -#include "../rtgui/version.h" +#include "rtgui/options.h" +#include "rtgui/version.h" using namespace std; diff --git a/rtengine/improccoordinator.cc b/rtengine/improccoordinator.cc index 4949699fe..8ee66d619 100644 --- a/rtengine/improccoordinator.cc +++ b/rtengine/improccoordinator.cc @@ -41,7 +41,7 @@ #include "refreshmap.h" #include "utils.h" -#include "../rtgui/options.h" +#include "rtgui/options.h" #ifdef _OPENMP #include diff --git a/rtengine/improccoordinator.h b/rtengine/improccoordinator.h index f8d4424f1..79e565bbc 100644 --- a/rtengine/improccoordinator.h +++ b/rtengine/improccoordinator.h @@ -29,7 +29,7 @@ #include "LUT.h" #include "rtengine.h" -#include "../rtgui/threadutils.h" +#include "rtgui/threadutils.h" namespace Glib { diff --git a/rtengine/improcfun.cc b/rtengine/improcfun.cc index 79bd81c65..aced925f6 100644 --- a/rtengine/improcfun.cc +++ b/rtengine/improcfun.cc @@ -49,7 +49,7 @@ #include "StopWatch.h" #include "utils.h" -#include "../rtgui/editcallbacks.h" +#include "rtgui/editcallbacks.h" #pragma GCC diagnostic warning "-Wextra" #pragma GCC diagnostic warning "-Wdouble-promotion" diff --git a/rtengine/init.cc b/rtengine/init.cc index 731c26a20..034f91beb 100644 --- a/rtengine/init.cc +++ b/rtengine/init.cc @@ -32,7 +32,7 @@ #include "ffmanager.h" #include "rtthumbnail.h" #include "profilestore.h" -#include "../rtgui/threadutils.h" +#include "rtgui/threadutils.h" #include "rtlensfun.h" #include "metadata.h" #include "procparams.h" diff --git a/rtengine/ipdehaze.cc b/rtengine/ipdehaze.cc index b5403080e..fdcf3e528 100644 --- a/rtengine/ipdehaze.cc +++ b/rtengine/ipdehaze.cc @@ -44,7 +44,7 @@ //#define BENCHMARK #include "StopWatch.h" -#include "../rtgui/options.h" +#include "rtgui/options.h" namespace rtengine { diff --git a/rtengine/iplocallab.cc b/rtengine/iplocallab.cc index 13f974d1a..2ed944cbb 100644 --- a/rtengine/iplocallab.cc +++ b/rtengine/iplocallab.cc @@ -35,13 +35,13 @@ #include "jaggedarray.h" #include "rt_algo.h" #include "settings.h" -#include "../rtgui/options.h" +#include "rtgui/options.h" #include "utils.h" #include "iccmatrices.h" #ifdef _OPENMP #include #endif -#include "../rtgui/thresholdselector.h" +#include "rtgui/thresholdselector.h" #include "imagesource.h" #include "cplx_wavelet_dec.h" diff --git a/rtengine/ipwavelet.cc b/rtengine/ipwavelet.cc index 536b89295..81ddfe2ed 100644 --- a/rtengine/ipwavelet.cc +++ b/rtengine/ipwavelet.cc @@ -43,7 +43,7 @@ #include "rt_math.h" #include "rtengine.h" #include "sleef.h" -#include "../rtgui/options.h" +#include "rtgui/options.h" #include "guidedfilter.h" #ifdef _OPENMP #include diff --git a/rtengine/lmmse_demosaic.cc b/rtengine/lmmse_demosaic.cc index c2d5bffbf..52ba17f45 100644 --- a/rtengine/lmmse_demosaic.cc +++ b/rtengine/lmmse_demosaic.cc @@ -21,7 +21,7 @@ #include "rawimagesource.h" #include "rt_math.h" #include "color.h" -#include "../rtgui/multilangmgr.h" +#include "rtgui/multilangmgr.h" #include "sleef.h" #include "opthelper.h" #include "median.h" diff --git a/rtengine/metadata.cc b/rtengine/metadata.cc index add935899..9ca3538dd 100644 --- a/rtengine/metadata.cc +++ b/rtengine/metadata.cc @@ -27,8 +27,8 @@ #include "metadata.h" #include "settings.h" #include "imagedata.h" -#include "../rtgui/version.h" -#include "../rtgui/pathutils.h" +#include "rtgui/version.h" +#include "rtgui/pathutils.h" #include diff --git a/rtengine/perspectivecorrection.cc b/rtengine/perspectivecorrection.cc index 5494d9ac8..e341ebd24 100644 --- a/rtengine/perspectivecorrection.cc +++ b/rtengine/perspectivecorrection.cc @@ -55,7 +55,7 @@ #include #include -#include "../rtgui/threadutils.h" +#include "rtgui/threadutils.h" #include "colortemp.h" #include "imagefloat.h" #include "settings.h" diff --git a/rtengine/pipettebuffer.cc b/rtengine/pipettebuffer.cc index 11cf50ae9..cbbbe3550 100644 --- a/rtengine/pipettebuffer.cc +++ b/rtengine/pipettebuffer.cc @@ -22,7 +22,7 @@ #include "imagefloat.h" #include "labimage.h" -#include "../rtgui/editcallbacks.h" +#include "rtgui/editcallbacks.h" namespace rtengine { diff --git a/rtengine/pixelshift.cc b/rtengine/pixelshift.cc index 2df07f074..bf17b9740 100644 --- a/rtengine/pixelshift.cc +++ b/rtengine/pixelshift.cc @@ -29,8 +29,8 @@ #include "procparams.h" #include "rawimagesource.h" #include "sleef.h" -#include "../rtgui/multilangmgr.h" -#include "../rtgui/options.h" +#include "rtgui/multilangmgr.h" +#include "rtgui/options.h" //#define BENCHMARK #include "StopWatch.h" diff --git a/rtengine/procparams.cc b/rtengine/procparams.cc index 9398af56b..af0f3fad2 100644 --- a/rtengine/procparams.cc +++ b/rtengine/procparams.cc @@ -32,11 +32,11 @@ #include "procparams.h" #include "utils.h" -#include "../rtgui/multilangmgr.h" -#include "../rtgui/options.h" -#include "../rtgui/paramsedited.h" -#include "../rtgui/ppversion.h" -#include "../rtgui/version.h" +#include "rtgui/multilangmgr.h" +#include "rtgui/options.h" +#include "rtgui/paramsedited.h" +#include "rtgui/ppversion.h" +#include "rtgui/version.h" using namespace std; diff --git a/rtengine/profilestore.cc b/rtengine/profilestore.cc index 5cc039187..849e78165 100644 --- a/rtengine/profilestore.cc +++ b/rtengine/profilestore.cc @@ -28,8 +28,8 @@ #include "dynamicprofile.h" #include "procparams.h" -#include "../rtgui/options.h" -#include "../rtgui/multilangmgr.h" +#include "rtgui/options.h" +#include "rtgui/multilangmgr.h" using namespace rtengine; using namespace rtengine::procparams; diff --git a/rtengine/profilestore.h b/rtengine/profilestore.h index d65c01751..d637ac958 100644 --- a/rtengine/profilestore.h +++ b/rtengine/profilestore.h @@ -26,7 +26,7 @@ #include "dynamicprofile.h" #include "noncopyable.h" -#include "../rtgui/threadutils.h" +#include "rtgui/threadutils.h" // forward decl namespace rtengine diff --git a/rtengine/rawimagesource.cc b/rtengine/rawimagesource.cc index bc39211d2..6909d2e1f 100644 --- a/rtengine/rawimagesource.cc +++ b/rtengine/rawimagesource.cc @@ -45,7 +45,7 @@ #include "rtengine.h" #include "rtlensfun.h" #include "lensmetadata.h" -#include "../rtgui/options.h" +#include "rtgui/options.h" #define BENCHMARK #include "StopWatch.h" diff --git a/rtengine/rcd_demosaic.cc b/rtengine/rcd_demosaic.cc index 3a88e1a9a..21b40b8fa 100644 --- a/rtengine/rcd_demosaic.cc +++ b/rtengine/rcd_demosaic.cc @@ -20,7 +20,7 @@ #include "rawimagesource.h" #include "rt_math.h" -#include "../rtgui/multilangmgr.h" +#include "rtgui/multilangmgr.h" #include "StopWatch.h" using namespace std; diff --git a/rtengine/rtengine.h b/rtengine/rtengine.h index cb4dc36c5..64321a5a8 100644 --- a/rtengine/rtengine.h +++ b/rtengine/rtengine.h @@ -34,7 +34,7 @@ #include "procevents.h" #include "settings.h" -#include "../rtgui/threadutils.h" +#include "rtgui/threadutils.h" /** diff --git a/rtengine/rtthumbnail.h b/rtengine/rtthumbnail.h index d9a637e2d..49b74f9fa 100644 --- a/rtengine/rtthumbnail.h +++ b/rtengine/rtthumbnail.h @@ -25,7 +25,7 @@ #include "imagefloat.h" #include "LUT.h" -#include "../rtgui/threadutils.h" +#include "rtgui/threadutils.h" namespace Glib { diff --git a/rtengine/simpleprocess.cc b/rtengine/simpleprocess.cc index 4850863f8..59c4331ec 100644 --- a/rtengine/simpleprocess.cc +++ b/rtengine/simpleprocess.cc @@ -40,8 +40,8 @@ #include "rtengine.h" #include "utils.h" -#include "../rtgui/multilangmgr.h" -#include "../rtgui/options.h" +#include "rtgui/multilangmgr.h" +#include "rtgui/options.h" #undef THREAD_PRIORITY_NORMAL diff --git a/rtengine/vng4_demosaic_RT.cc b/rtengine/vng4_demosaic_RT.cc index 34cab71d1..480e547d2 100644 --- a/rtengine/vng4_demosaic_RT.cc +++ b/rtengine/vng4_demosaic_RT.cc @@ -23,7 +23,7 @@ #include "rtengine.h" #include "rawimage.h" #include "rawimagesource.h" -#include "../rtgui/multilangmgr.h" +#include "rtgui/multilangmgr.h" //#define BENCHMARK #include "StopWatch.h" diff --git a/rtengine/xtrans_demosaic.cc b/rtengine/xtrans_demosaic.cc index bcad4d7d3..627ff4ca4 100644 --- a/rtengine/xtrans_demosaic.cc +++ b/rtengine/xtrans_demosaic.cc @@ -25,7 +25,7 @@ #include "rawimagesource.h" #include "rt_algo.h" #include "rt_math.h" -#include "../rtgui/multilangmgr.h" +#include "rtgui/multilangmgr.h" #include "opthelper.h" #include "StopWatch.h" diff --git a/rtgui/CMakeLists.txt b/rtgui/CMakeLists.txt index 592b816a0..5d103ba5d 100644 --- a/rtgui/CMakeLists.txt +++ b/rtgui/CMakeLists.txt @@ -175,8 +175,6 @@ set(NONCLISOURCEFILES zoompanel.cc ) -include_directories(BEFORE ${CMAKE_CURRENT_BINARY_DIR}) - if(APPLE) find_package(MacIntegration REQUIRED) # At the time of writing CMake has no module finder for gtkmacintegration so here we have it hard-coded, if installed via macports it should be in /opt/local/... @@ -256,17 +254,25 @@ endif() # set(EXTRA_LIB_RTGUI "${EXTRA_LIB_RTGUI}" "atomic") # endif() -# Create config.h which defines where data are stored -configure_file("${CMAKE_CURRENT_SOURCE_DIR}/config.h.in" "${CMAKE_CURRENT_BINARY_DIR}/config.h") - # Create new executables targets add_executable(rth "${EXTRA_SRC_NONCLI}" "${NONCLISOURCEFILES}") add_executable(rth-cli "${EXTRA_SRC_CLI}" "${CLISOURCEFILES}") +# Subdirectories that are not libraries themselves should be included +# like #include "your_subdirectory/header.h" +target_include_directories(rth PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}) +target_include_directories(rth-cli PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}) + # Add dependencies to executables targets add_dependencies(rth UpdateInfo) add_dependencies(rth-cli UpdateInfo) +# Create config.h which defines where data are stored +configure_file("${CMAKE_CURRENT_SOURCE_DIR}/config.h.in" "${CMAKE_CURRENT_BINARY_DIR}/config.h") +# UpdateInfo and above creates new headers in build directory +target_include_directories(rth BEFORE PRIVATE ${CMAKE_BINARY_DIR}/rtgui) +target_include_directories(rth-cli BEFORE PRIVATE ${CMAKE_BINARY_DIR}/rtgui) + #Define a target specific definition to use in code target_compile_definitions(rth PUBLIC GUIVERSION) target_compile_definitions(rth-cli PUBLIC CLIVERSION) diff --git a/rtgui/adjuster.cc b/rtgui/adjuster.cc index b94bc459f..b126d91d9 100644 --- a/rtgui/adjuster.cc +++ b/rtgui/adjuster.cc @@ -25,7 +25,7 @@ #include "options.h" #include "rtimage.h" #include "rtscalable.h" -#include "../rtengine/rt_math.h" +#include "rtengine/rt_math.h" namespace { diff --git a/rtgui/batchqueue.cc b/rtgui/batchqueue.cc index 32f6a9430..a62d150f0 100644 --- a/rtgui/batchqueue.cc +++ b/rtgui/batchqueue.cc @@ -20,9 +20,9 @@ #include #include #include -#include "../rtengine/imagedata.h" -#include "../rtengine/rt_math.h" -#include "../rtengine/procparams.h" +#include "rtengine/imagedata.h" +#include "rtengine/rt_math.h" +#include "rtengine/procparams.h" #include #include diff --git a/rtgui/batchqueue.h b/rtgui/batchqueue.h index f8f1cf255..843063a98 100644 --- a/rtgui/batchqueue.h +++ b/rtgui/batchqueue.h @@ -26,8 +26,8 @@ #include "threadutils.h" #include "thumbbrowserbase.h" -#include "../rtengine/rtengine.h" -#include "../rtengine/noncopyable.h" +#include "rtengine/rtengine.h" +#include "rtengine/noncopyable.h" class BatchQueueEntry; diff --git a/rtgui/batchqueueentry.cc b/rtgui/batchqueueentry.cc index 0948a311f..81f7176b3 100644 --- a/rtgui/batchqueueentry.cc +++ b/rtgui/batchqueueentry.cc @@ -28,8 +28,8 @@ #include "thumbnail.h" #include "rtsurface.h" -#include "../rtengine/procparams.h" -#include "../rtengine/rtengine.h" +#include "rtengine/procparams.h" +#include "rtengine/rtengine.h" bool BatchQueueEntry::iconsLoaded(false); std::shared_ptr BatchQueueEntry::savedAsIcon(std::shared_ptr(nullptr)); diff --git a/rtgui/batchqueueentry.h b/rtgui/batchqueueentry.h index 5d17939fb..37d5ef90a 100644 --- a/rtgui/batchqueueentry.h +++ b/rtgui/batchqueueentry.h @@ -26,7 +26,7 @@ #include "options.h" #include "thumbbrowserentrybase.h" -#include "../rtengine/noncopyable.h" +#include "rtengine/noncopyable.h" class Thumbnail; class RTSurface; diff --git a/rtgui/batchtoolpanelcoord.h b/rtgui/batchtoolpanelcoord.h index 687aa98bd..7d738e17a 100644 --- a/rtgui/batchtoolpanelcoord.h +++ b/rtgui/batchtoolpanelcoord.h @@ -23,8 +23,8 @@ #include "thumbnaillistener.h" #include "toolpanelcoord.h" -#include "../rtengine/procevents.h" -#include "../rtengine/procparams.h" +#include "rtengine/procevents.h" +#include "rtengine/procparams.h" class FilePanel; class Thumbnail; diff --git a/rtgui/bayerpreprocess.cc b/rtgui/bayerpreprocess.cc index e8b965736..ac2faf58f 100644 --- a/rtgui/bayerpreprocess.cc +++ b/rtgui/bayerpreprocess.cc @@ -23,7 +23,7 @@ #include "guiutils.h" #include "options.h" -#include "../rtengine/procparams.h" +#include "rtengine/procparams.h" using namespace rtengine; using namespace rtengine::procparams; diff --git a/rtgui/bayerprocess.cc b/rtgui/bayerprocess.cc index f89e11510..4d5d0fa5c 100644 --- a/rtgui/bayerprocess.cc +++ b/rtgui/bayerprocess.cc @@ -22,8 +22,8 @@ #include "guiutils.h" #include "options.h" -#include "../rtengine/procparams.h" -#include "../rtengine/utils.h" +#include "rtengine/procparams.h" +#include "rtengine/utils.h" using namespace rtengine; using namespace rtengine::procparams; diff --git a/rtgui/bayerrawexposure.cc b/rtgui/bayerrawexposure.cc index 7a21d3408..db6ceea41 100644 --- a/rtgui/bayerrawexposure.cc +++ b/rtgui/bayerrawexposure.cc @@ -21,7 +21,7 @@ #include "guiutils.h" #include "options.h" -#include "../rtengine/procparams.h" +#include "rtengine/procparams.h" using namespace rtengine; using namespace rtengine::procparams; diff --git a/rtgui/blackwhite.cc b/rtgui/blackwhite.cc index 2d3c35a54..f67ee9b7f 100644 --- a/rtgui/blackwhite.cc +++ b/rtgui/blackwhite.cc @@ -27,9 +27,9 @@ #include "rtimage.h" #include "options.h" -#include "../rtengine/color.h" -#include "../rtengine/procparams.h" -#include "../rtengine/utils.h" +#include "rtengine/color.h" +#include "rtengine/procparams.h" +#include "rtengine/utils.h" using namespace rtengine; using namespace rtengine::procparams; diff --git a/rtgui/bqentryupdater.cc b/rtgui/bqentryupdater.cc index 7115447c2..e0b887eaa 100644 --- a/rtgui/bqentryupdater.cc +++ b/rtgui/bqentryupdater.cc @@ -21,7 +21,7 @@ #include "guiutils.h" #include "options.h" #include "thumbnail.h" -#include "../rtengine/utils.h" +#include "rtengine/utils.h" namespace { diff --git a/rtgui/cacheimagedata.cc b/rtgui/cacheimagedata.cc index fa71d5d44..d5662e05e 100644 --- a/rtgui/cacheimagedata.cc +++ b/rtgui/cacheimagedata.cc @@ -24,8 +24,8 @@ #include "version.h" #include -#include "../rtengine/procparams.h" -#include "../rtengine/settings.h" +#include "rtengine/procparams.h" +#include "rtengine/settings.h" namespace diff --git a/rtgui/cacheimagedata.h b/rtgui/cacheimagedata.h index bb37acf2f..f77b11737 100644 --- a/rtgui/cacheimagedata.h +++ b/rtgui/cacheimagedata.h @@ -22,9 +22,9 @@ #include "options.h" -#include "../rtengine/dnggainmap.h" -#include "../rtengine/imageformat.h" -#include "../rtengine/rtengine.h" +#include "rtengine/dnggainmap.h" +#include "rtengine/imageformat.h" +#include "rtengine/rtengine.h" class CacheImageData : public rtengine::FramesMetaData diff --git a/rtgui/cachemanager.h b/rtgui/cachemanager.h index a7ab14f0a..6fed204a7 100644 --- a/rtgui/cachemanager.h +++ b/rtgui/cachemanager.h @@ -25,7 +25,7 @@ #include "threadutils.h" -#include "../rtengine/noncopyable.h" +#include "rtengine/noncopyable.h" class CacheImageData; class Thumbnail; diff --git a/rtgui/cacorrection.cc b/rtgui/cacorrection.cc index b61c6e9e1..6ebd84d0c 100644 --- a/rtgui/cacorrection.cc +++ b/rtgui/cacorrection.cc @@ -22,7 +22,7 @@ #include "rtimage.h" -#include "../rtengine/procparams.h" +#include "rtengine/procparams.h" using namespace rtengine; using namespace rtengine::procparams; diff --git a/rtgui/chmixer.cc b/rtgui/chmixer.cc index 7cd924dd5..51b9fb2c8 100644 --- a/rtgui/chmixer.cc +++ b/rtgui/chmixer.cc @@ -20,7 +20,7 @@ #include "rtimage.h" -#include "../rtengine/procparams.h" +#include "rtengine/procparams.h" using namespace rtengine; using namespace rtengine::procparams; diff --git a/rtgui/clipboard.cc b/rtgui/clipboard.cc index f64f2ed07..91357e07c 100644 --- a/rtgui/clipboard.cc +++ b/rtgui/clipboard.cc @@ -19,7 +19,7 @@ #include "clipboard.h" #include "paramsedited.h" -#include "../rtengine/procparams.h" +#include "rtengine/procparams.h" Clipboard clipboard; diff --git a/rtgui/clipboard.h b/rtgui/clipboard.h index 0a1c8e2fa..dd33a396a 100644 --- a/rtgui/clipboard.h +++ b/rtgui/clipboard.h @@ -21,8 +21,8 @@ #include #include -#include "../rtengine/diagonalcurvetypes.h" -#include "../rtengine/flatcurvetypes.h" +#include "rtengine/diagonalcurvetypes.h" +#include "rtengine/flatcurvetypes.h" struct ParamsEdited; diff --git a/rtgui/coarsepanel.cc b/rtgui/coarsepanel.cc index 48f8041df..844c1efc6 100644 --- a/rtgui/coarsepanel.cc +++ b/rtgui/coarsepanel.cc @@ -20,7 +20,7 @@ #include "rtimage.h" -#include "../rtengine/procparams.h" +#include "rtengine/procparams.h" using namespace rtengine; using namespace rtengine::procparams; diff --git a/rtgui/colorappearance.cc b/rtgui/colorappearance.cc index d18cddcad..4104ce66e 100644 --- a/rtgui/colorappearance.cc +++ b/rtgui/colorappearance.cc @@ -27,9 +27,9 @@ #include "rtimage.h" #include "eventmapper.h" -#include "../rtengine/color.h" -#include "../rtengine/procparams.h" -#include "../rtengine/utils.h" +#include "rtengine/color.h" +#include "rtengine/procparams.h" +#include "rtengine/utils.h" #define MINTEMP0 2000 //1200 #define MAXTEMP0 12000 //12000 diff --git a/rtgui/coloredbar.cc b/rtgui/coloredbar.cc index 0d28c335a..03b9027e6 100644 --- a/rtgui/coloredbar.cc +++ b/rtgui/coloredbar.cc @@ -18,7 +18,7 @@ */ #include "coloredbar.h" -#include "../rtengine/utils.h" +#include "rtengine/utils.h" ColoredBar::ColoredBar (eRTOrientation orient) { diff --git a/rtgui/colortoning.cc b/rtgui/colortoning.cc index d5e570994..88e874fb6 100644 --- a/rtgui/colortoning.cc +++ b/rtgui/colortoning.cc @@ -9,7 +9,7 @@ #include "eventmapper.h" #include "labgrid.h" #include "options.h" -#include "../rtengine/color.h" +#include "rtengine/color.h" using namespace rtengine; using namespace rtengine::procparams; diff --git a/rtgui/colortoning.h b/rtgui/colortoning.h index e763a069c..6f4dc4ff4 100644 --- a/rtgui/colortoning.h +++ b/rtgui/colortoning.h @@ -12,7 +12,7 @@ #include "thresholdadjuster.h" #include "toolpanel.h" -#include "../rtengine/procparams.h" +#include "rtengine/procparams.h" class CurveEditor; class CurveEditorGroup; diff --git a/rtgui/controllines.cc b/rtgui/controllines.cc index 179001812..054c11f6c 100644 --- a/rtgui/controllines.cc +++ b/rtgui/controllines.cc @@ -24,7 +24,7 @@ #include "editwidgets.h" #include "rtsurface.h" -#include "../rtengine/perspectivecorrection.h" +#include "rtengine/perspectivecorrection.h" using namespace rtengine; diff --git a/rtgui/controllines.h b/rtgui/controllines.h index ba05e006c..4958037bd 100644 --- a/rtgui/controllines.h +++ b/rtgui/controllines.h @@ -21,7 +21,7 @@ #include #include "editcallbacks.h" -#include "../rtengine/perspectivecorrection.h" +#include "rtengine/perspectivecorrection.h" class Circle; class Line; diff --git a/rtgui/controlspotpanel.cc b/rtgui/controlspotpanel.cc index 783f253c7..3cb5c82d2 100644 --- a/rtgui/controlspotpanel.cc +++ b/rtgui/controlspotpanel.cc @@ -18,11 +18,11 @@ * 2018 Pierre Cabrera */ -#include "../rtengine/rt_math.h" +#include "rtengine/rt_math.h" #include "controlspotpanel.h" #include "editwidgets.h" #include "options.h" -#include "../rtengine/procparams.h" +#include "rtengine/procparams.h" #include "rtimage.h" #include "eventmapper.h" diff --git a/rtgui/controlspotpanel.h b/rtgui/controlspotpanel.h index 855f2d94a..cf80a1888 100644 --- a/rtgui/controlspotpanel.h +++ b/rtgui/controlspotpanel.h @@ -23,7 +23,7 @@ #include -#include "../rtengine/coord.h" +#include "rtengine/coord.h" #include "editcallbacks.h" #include "threadutils.h" #include "toolpanel.h" diff --git a/rtgui/crop.cc b/rtgui/crop.cc index 0bbbdbf1f..a8f7d7f0e 100644 --- a/rtgui/crop.cc +++ b/rtgui/crop.cc @@ -23,8 +23,8 @@ #include "options.h" #include "rtimage.h" -#include "../rtengine/procparams.h" -#include "../rtengine/utils.h" +#include "rtengine/procparams.h" +#include "rtengine/utils.h" using namespace rtengine; using namespace rtengine::procparams; diff --git a/rtgui/crophandler.cc b/rtgui/crophandler.cc index c6ecde027..95dcfc37b 100644 --- a/rtgui/crophandler.cc +++ b/rtgui/crophandler.cc @@ -24,10 +24,10 @@ #include "cropwindow.h" #include "imagearea.h" -#include "../rtengine/dcrop.h" -#include "../rtengine/procparams.h" -#include "../rtengine/refreshmap.h" -#include "../rtengine/rt_math.h" +#include "rtengine/dcrop.h" +#include "rtengine/procparams.h" +#include "rtengine/refreshmap.h" +#include "rtengine/rt_math.h" using namespace rtengine; diff --git a/rtgui/crophandler.h b/rtgui/crophandler.h index 98c925b67..4b02aaf97 100644 --- a/rtgui/crophandler.h +++ b/rtgui/crophandler.h @@ -27,7 +27,7 @@ #include "lockablecolorpicker.h" #include "threadutils.h" -#include "../rtengine/rtengine.h" +#include "rtengine/rtengine.h" class EditSubscriber; diff --git a/rtgui/cropwindow.cc b/rtgui/cropwindow.cc index ddb38f16a..e3f511295 100644 --- a/rtgui/cropwindow.cc +++ b/rtgui/cropwindow.cc @@ -36,10 +36,10 @@ #include "pointermotionlistener.h" #include "rtsurface.h" -#include "../rtengine/dcrop.h" -#include "../rtengine/imagesource.h" -#include "../rtengine/procparams.h" -#include "../rtengine/rt_math.h" +#include "rtengine/dcrop.h" +#include "rtengine/imagesource.h" +#include "rtengine/procparams.h" +#include "rtengine/rt_math.h" using namespace rtengine; diff --git a/rtgui/cropwindow.h b/rtgui/cropwindow.h index 623653d2d..2925ac893 100644 --- a/rtgui/cropwindow.h +++ b/rtgui/cropwindow.h @@ -31,7 +31,7 @@ #include "lwbutton.h" #include "lwbuttonset.h" -#include "../rtengine/noncopyable.h" +#include "rtengine/noncopyable.h" namespace rtengine { diff --git a/rtgui/curveeditor.cc b/rtgui/curveeditor.cc index efe2ef200..dafe74ed8 100644 --- a/rtgui/curveeditor.cc +++ b/rtgui/curveeditor.cc @@ -22,7 +22,7 @@ #include "guiutils.h" #include "multilangmgr.h" #include "popuptogglebutton.h" -#include "../rtengine/LUT.h" +#include "rtengine/LUT.h" #include diff --git a/rtgui/curveeditor.h b/rtgui/curveeditor.h index 398c63603..96e97a663 100644 --- a/rtgui/curveeditor.h +++ b/rtgui/curveeditor.h @@ -21,10 +21,10 @@ #include "editcallbacks.h" #include "guiutils.h" -#include "../rtengine/diagonalcurvetypes.h" -#include "../rtengine/flatcurvetypes.h" -#include "../rtengine/LUT.h" -#include "../rtengine/noncopyable.h" +#include "rtengine/diagonalcurvetypes.h" +#include "rtengine/flatcurvetypes.h" +#include "rtengine/LUT.h" +#include "rtengine/noncopyable.h" class CurveEditorGroup; class CurveEditorSubGroup; diff --git a/rtgui/curveeditorgroup.h b/rtgui/curveeditorgroup.h index 55d438b2d..aa9765926 100644 --- a/rtgui/curveeditorgroup.h +++ b/rtgui/curveeditorgroup.h @@ -27,8 +27,8 @@ #include "mycurve.h" #include "shcselector.h" -#include "../rtengine/diagonalcurvetypes.h" -#include "../rtengine/flatcurvetypes.h" +#include "rtengine/diagonalcurvetypes.h" +#include "rtengine/flatcurvetypes.h" class CurveEditor; class DiagonalCurveEditorSubGroup; diff --git a/rtgui/darkframe.cc b/rtgui/darkframe.cc index 648f96718..ec628da64 100644 --- a/rtgui/darkframe.cc +++ b/rtgui/darkframe.cc @@ -24,8 +24,8 @@ #include "options.h" #include "rtimage.h" -#include "../rtengine/procparams.h" -#include "../rtengine/rawimage.h" +#include "rtengine/procparams.h" +#include "rtengine/rawimage.h" using namespace rtengine; using namespace rtengine::procparams; diff --git a/rtgui/defringe.cc b/rtgui/defringe.cc index 72388ac8c..162538db0 100644 --- a/rtgui/defringe.cc +++ b/rtgui/defringe.cc @@ -24,8 +24,8 @@ #include "curveeditorgroup.h" #include "options.h" -#include "../rtengine/color.h" -#include "../rtengine/procparams.h" +#include "rtengine/color.h" +#include "rtengine/procparams.h" using namespace rtengine; using namespace rtengine::procparams; diff --git a/rtgui/dehaze.cc b/rtgui/dehaze.cc index b77b76945..43dd58b86 100644 --- a/rtgui/dehaze.cc +++ b/rtgui/dehaze.cc @@ -24,7 +24,7 @@ #include "eventmapper.h" -#include "../rtengine/procparams.h" +#include "rtengine/procparams.h" using namespace rtengine; using namespace rtengine::procparams; diff --git a/rtgui/delayed.h b/rtgui/delayed.h index 80d91a3be..4432465a5 100644 --- a/rtgui/delayed.h +++ b/rtgui/delayed.h @@ -26,7 +26,7 @@ #include #include -#include "../rtengine/noncopyable.h" +#include "rtengine/noncopyable.h" namespace delayed_helper { diff --git a/rtgui/diagonalcurveeditorsubgroup.cc b/rtgui/diagonalcurveeditorsubgroup.cc index 88d9a14c5..c30aa599a 100644 --- a/rtgui/diagonalcurveeditorsubgroup.cc +++ b/rtgui/diagonalcurveeditorsubgroup.cc @@ -34,7 +34,7 @@ #include "options.h" #include "popuptogglebutton.h" -#include "../rtengine/curves.h" +#include "rtengine/curves.h" DiagonalCurveEditorSubGroup::DiagonalCurveEditorSubGroup (CurveEditorGroup* prt, Glib::ustring& curveDir) : CurveEditorSubGroup(curveDir) { diff --git a/rtgui/diagonalcurveeditorsubgroup.h b/rtgui/diagonalcurveeditorsubgroup.h index 08e0828f5..14d697416 100644 --- a/rtgui/diagonalcurveeditorsubgroup.h +++ b/rtgui/diagonalcurveeditorsubgroup.h @@ -22,7 +22,7 @@ #include "curveeditorgroup.h" #include "adjuster.h" -#include "../rtengine/noncopyable.h" +#include "rtengine/noncopyable.h" class DiagonalCurveEditor; class MyDiagonalCurve; diff --git a/rtgui/dirpyrdenoise.cc b/rtgui/dirpyrdenoise.cc index e1200ac20..760cb57ce 100644 --- a/rtgui/dirpyrdenoise.cc +++ b/rtgui/dirpyrdenoise.cc @@ -28,9 +28,9 @@ #include "options.h" #include "eventmapper.h" -#include "../rtengine/color.h" -#include "../rtengine/procparams.h" -#include "../rtengine/refreshmap.h" +#include "rtengine/color.h" +#include "rtengine/procparams.h" +#include "rtengine/refreshmap.h" using namespace rtengine; using namespace rtengine::procparams; diff --git a/rtgui/dirpyrequalizer.cc b/rtgui/dirpyrequalizer.cc index 46966ea45..a5f3d8a2a 100644 --- a/rtgui/dirpyrequalizer.cc +++ b/rtgui/dirpyrequalizer.cc @@ -19,7 +19,7 @@ #include "dirpyrequalizer.h" -#include "../rtengine/color.h" +#include "rtengine/color.h" using namespace rtengine; using namespace rtengine::procparams; diff --git a/rtgui/distortion.cc b/rtgui/distortion.cc index 0f0144b58..128354aa7 100644 --- a/rtgui/distortion.cc +++ b/rtgui/distortion.cc @@ -24,8 +24,8 @@ #include "eventmapper.h" -#include "../rtengine/procparams.h" -#include "../rtengine/refreshmap.h" +#include "rtengine/procparams.h" +#include "rtengine/refreshmap.h" using namespace rtengine; using namespace rtengine::procparams; diff --git a/rtgui/dynamicprofilepanel.cc b/rtgui/dynamicprofilepanel.cc index feb6aea70..5f462c680 100644 --- a/rtgui/dynamicprofilepanel.cc +++ b/rtgui/dynamicprofilepanel.cc @@ -19,10 +19,10 @@ #include "dynamicprofilepanel.h" #include "multilangmgr.h" -#include "../rtengine/profilestore.h" -#include "../rtengine/rtengine.h" -#include "../rtengine/dynamicprofile.h" -#include "../rtengine/settings.h" +#include "rtengine/profilestore.h" +#include "rtengine/rtengine.h" +#include "rtengine/dynamicprofile.h" +#include "rtengine/settings.h" #include #include diff --git a/rtgui/dynamicprofilepanel.h b/rtgui/dynamicprofilepanel.h index 03b9e7c62..364755356 100644 --- a/rtgui/dynamicprofilepanel.h +++ b/rtgui/dynamicprofilepanel.h @@ -22,7 +22,7 @@ #include "profilestorecombobox.h" -#include "../rtengine/dynamicprofile.h" +#include "rtengine/dynamicprofile.h" class DynamicProfilePanel : public Gtk::Box diff --git a/rtgui/editcallbacks.h b/rtgui/editcallbacks.h index 61d392de5..32b2e28c1 100644 --- a/rtgui/editcallbacks.h +++ b/rtgui/editcallbacks.h @@ -22,7 +22,7 @@ #include "editid.h" #include "cursormanager.h" -#include "../rtengine/coord.h" +#include "rtengine/coord.h" class Geometry; class EditDataProvider; diff --git a/rtgui/editorpanel.cc b/rtgui/editorpanel.cc index b03dab5e8..961ada0d2 100644 --- a/rtgui/editorpanel.cc +++ b/rtgui/editorpanel.cc @@ -21,9 +21,9 @@ #include -#include "../rtengine/array2D.h" -#include "../rtengine/imagesource.h" -#include "../rtengine/iccstore.h" +#include "rtengine/array2D.h" +#include "rtengine/imagesource.h" +#include "rtengine/iccstore.h" #include "batchqueue.h" #include "batchqueueentry.h" #include "soundman.h" @@ -46,7 +46,7 @@ #ifdef _WIN32 #include "windows.h" -#include "../rtengine/winutils.h" +#include "rtengine/winutils.h" #endif using namespace rtengine::procparams; diff --git a/rtgui/editorpanel.h b/rtgui/editorpanel.h index 0c6d15e37..63af532e3 100644 --- a/rtgui/editorpanel.h +++ b/rtgui/editorpanel.h @@ -30,8 +30,8 @@ #include "saveasdlg.h" #include "thumbnaillistener.h" -#include "../rtengine/noncopyable.h" -#include "../rtengine/rtengine.h" +#include "rtengine/noncopyable.h" +#include "rtengine/rtengine.h" namespace rtengine { diff --git a/rtgui/editwidgets.h b/rtgui/editwidgets.h index b22ba175e..9bc1bd647 100644 --- a/rtgui/editwidgets.h +++ b/rtgui/editwidgets.h @@ -25,8 +25,8 @@ #include "editcoordsys.h" #include "rtsurface.h" -#include "../rtengine/coord.h" -#include "../rtengine/rt_math.h" +#include "rtengine/coord.h" +#include "rtengine/rt_math.h" class ObjectMOBuffer; diff --git a/rtgui/editwindow.cc b/rtgui/editwindow.cc index d2ea0f8a2..ce39f5d6f 100644 --- a/rtgui/editwindow.cc +++ b/rtgui/editwindow.cc @@ -18,7 +18,7 @@ #include "editwindow.h" #include "editorpanel.h" #include "filepanel.h" -#include "../rtengine/procparams.h" +#include "rtengine/procparams.h" #include "options.h" #include "preferences.h" #include "cursormanager.h" diff --git a/rtgui/epd.cc b/rtgui/epd.cc index 073c5ecdd..5a77084aa 100644 --- a/rtgui/epd.cc +++ b/rtgui/epd.cc @@ -21,7 +21,7 @@ #include "epd.h" -#include "../rtengine/procparams.h" +#include "rtengine/procparams.h" using namespace rtengine; using namespace rtengine::procparams; diff --git a/rtgui/eventmapper.h b/rtgui/eventmapper.h index 5cbb45388..4d790ce31 100644 --- a/rtgui/eventmapper.h +++ b/rtgui/eventmapper.h @@ -22,7 +22,7 @@ #include #include #include -#include "../rtengine/refreshmap.h" +#include "rtengine/refreshmap.h" class ProcEventMapper { diff --git a/rtgui/exifpanel.cc b/rtgui/exifpanel.cc index 88a081c01..e830e4563 100644 --- a/rtgui/exifpanel.cc +++ b/rtgui/exifpanel.cc @@ -24,9 +24,9 @@ #include "rtimage.h" #include "options.h" -#include "../rtengine/imagedata.h" -#include "../rtengine/metadata.h" -#include "../rtengine/procparams.h" +#include "rtengine/imagedata.h" +#include "rtengine/metadata.h" +#include "rtengine/procparams.h" #include diff --git a/rtgui/exportpanel.cc b/rtgui/exportpanel.cc index 573055650..6e9c13fc8 100644 --- a/rtgui/exportpanel.cc +++ b/rtgui/exportpanel.cc @@ -23,7 +23,7 @@ #include "rtimage.h" #include "rtsurface.h" -#include "../rtengine/procparams.h" +#include "rtengine/procparams.h" using namespace rtengine; using namespace rtengine::procparams; diff --git a/rtgui/fattaltonemap.cc b/rtgui/fattaltonemap.cc index 23a3a4ddf..ef79b4f4e 100644 --- a/rtgui/fattaltonemap.cc +++ b/rtgui/fattaltonemap.cc @@ -25,7 +25,7 @@ #include "eventmapper.h" #include "rtimage.h" -#include "../rtengine/procparams.h" +#include "rtengine/procparams.h" using namespace rtengine; diff --git a/rtgui/filebrowser.cc b/rtgui/filebrowser.cc index 661b6051a..a1043d661 100644 --- a/rtgui/filebrowser.cc +++ b/rtgui/filebrowser.cc @@ -37,9 +37,9 @@ #include "threadutils.h" #include "thumbnail.h" -#include "../rtengine/dfmanager.h" -#include "../rtengine/ffmanager.h" -#include "../rtengine/procparams.h" +#include "rtengine/dfmanager.h" +#include "rtengine/ffmanager.h" +#include "rtengine/procparams.h" namespace { diff --git a/rtgui/filebrowser.h b/rtgui/filebrowser.h index e8935b5c3..8844d81fe 100644 --- a/rtgui/filebrowser.h +++ b/rtgui/filebrowser.h @@ -29,10 +29,10 @@ #include "lwbutton.h" #include "partialpastedlg.h" #include "pparamschangelistener.h" -#include "../rtengine/profilestore.h" +#include "rtengine/profilestore.h" #include "thumbbrowserbase.h" -#include "../rtengine/noncopyable.h" +#include "rtengine/noncopyable.h" class FileBrowser; class FileBrowserEntry; diff --git a/rtgui/filebrowserentry.cc b/rtgui/filebrowserentry.cc index 23b66b3cc..85ec0fad3 100644 --- a/rtgui/filebrowserentry.cc +++ b/rtgui/filebrowserentry.cc @@ -31,7 +31,7 @@ #include "thumbnail.h" #include "toolbar.h" -#include "../rtengine/procparams.h" +#include "rtengine/procparams.h" #define CROPRESIZEBORDER 4 diff --git a/rtgui/filebrowserentry.h b/rtgui/filebrowserentry.h index 1b1c4e73c..c109d25ef 100644 --- a/rtgui/filebrowserentry.h +++ b/rtgui/filebrowserentry.h @@ -30,8 +30,8 @@ #include "thumbimageupdater.h" #include "thumbnaillistener.h" -#include "../rtengine/noncopyable.h" -#include "../rtengine/rtengine.h" +#include "rtengine/noncopyable.h" +#include "rtengine/rtengine.h" class FileBrowserEntry; class Thumbnail; diff --git a/rtgui/filecatalog.cc b/rtgui/filecatalog.cc index 8c5a70628..ce22bbfd8 100644 --- a/rtgui/filecatalog.cc +++ b/rtgui/filecatalog.cc @@ -26,8 +26,8 @@ #include -#include "../rtengine/rt_math.h" -#include "../rtengine/procparams.h" +#include "rtengine/rt_math.h" +#include "rtengine/procparams.h" #include "guiutils.h" #include "options.h" diff --git a/rtgui/filecatalog.h b/rtgui/filecatalog.h index f41c42475..c1f113ade 100644 --- a/rtgui/filecatalog.h +++ b/rtgui/filecatalog.h @@ -31,7 +31,7 @@ #include "previewloader.h" #include "threadutils.h" -#include "../rtengine/noncopyable.h" +#include "rtengine/noncopyable.h" class FilePanel; class CoarsePanel; diff --git a/rtgui/filepanel.h b/rtgui/filepanel.h index 4a006f002..3761e45a1 100644 --- a/rtgui/filepanel.h +++ b/rtgui/filepanel.h @@ -30,7 +30,7 @@ #include "progressconnector.h" #include "recentbrowser.h" -#include "../rtengine/noncopyable.h" +#include "rtengine/noncopyable.h" class BatchToolPanelCoordinator; class RTWindow; diff --git a/rtgui/filmnegative.cc b/rtgui/filmnegative.cc index 8d894bece..73b940da2 100644 --- a/rtgui/filmnegative.cc +++ b/rtgui/filmnegative.cc @@ -25,8 +25,8 @@ #include "options.h" #include "rtimage.h" -#include "../rtengine/procparams.h" -#include "../rtengine/color.h" +#include "rtengine/procparams.h" +#include "rtengine/color.h" const Glib::ustring FilmNegative::TOOL_NAME = "filmnegative"; diff --git a/rtgui/filmnegative.h b/rtgui/filmnegative.h index 87e91af8c..f262804d0 100644 --- a/rtgui/filmnegative.h +++ b/rtgui/filmnegative.h @@ -27,7 +27,7 @@ #include "guiutils.h" #include "toolpanel.h" -#include "../rtengine/colortemp.h" +#include "rtengine/colortemp.h" namespace { diff --git a/rtgui/filmsimulation.cc b/rtgui/filmsimulation.cc index fb38f87dc..a4a7e9bb7 100644 --- a/rtgui/filmsimulation.cc +++ b/rtgui/filmsimulation.cc @@ -6,8 +6,8 @@ #include "options.h" -#include "../rtengine/clutstore.h" -#include "../rtengine/procparams.h" +#include "rtengine/clutstore.h" +#include "rtengine/procparams.h" using namespace rtengine; using namespace rtengine::procparams; diff --git a/rtgui/filterpanel.cc b/rtgui/filterpanel.cc index 186dd68ce..3d3f69507 100644 --- a/rtgui/filterpanel.cc +++ b/rtgui/filterpanel.cc @@ -18,7 +18,7 @@ */ #include "filterpanel.h" #include "multilangmgr.h" -#include "../rtengine/rtengine.h" +#include "rtengine/rtengine.h" #include "rtsurface.h" using namespace rtengine; diff --git a/rtgui/flatcurveeditorsubgroup.cc b/rtgui/flatcurveeditorsubgroup.cc index 0cf522c55..afd9d8bd6 100644 --- a/rtgui/flatcurveeditorsubgroup.cc +++ b/rtgui/flatcurveeditorsubgroup.cc @@ -35,7 +35,7 @@ #include "options.h" #include "popuptogglebutton.h" -#include "../rtengine/curves.h" +#include "rtengine/curves.h" FlatCurveEditorSubGroup::FlatCurveEditorSubGroup (CurveEditorGroup* prt, Glib::ustring& curveDir) : CurveEditorSubGroup(curveDir) { diff --git a/rtgui/flatcurveeditorsubgroup.h b/rtgui/flatcurveeditorsubgroup.h index 79dd5e7d0..e76c0f74a 100644 --- a/rtgui/flatcurveeditorsubgroup.h +++ b/rtgui/flatcurveeditorsubgroup.h @@ -22,7 +22,7 @@ #include "curveeditorgroup.h" -#include "../rtengine/noncopyable.h" +#include "rtengine/noncopyable.h" class FlatCurveEditor; class MyFlatCurve; diff --git a/rtgui/flatfield.cc b/rtgui/flatfield.cc index 74f313080..d12e39730 100644 --- a/rtgui/flatfield.cc +++ b/rtgui/flatfield.cc @@ -25,8 +25,8 @@ #include "options.h" #include "rtimage.h" -#include "../rtengine/procparams.h" -#include "../rtengine/rawimage.h" +#include "rtengine/procparams.h" +#include "rtengine/rawimage.h" using namespace rtengine; using namespace rtengine::procparams; diff --git a/rtgui/gradient.cc b/rtgui/gradient.cc index 98d5eb8d6..214e1b519 100644 --- a/rtgui/gradient.cc +++ b/rtgui/gradient.cc @@ -6,8 +6,8 @@ #include "editwidgets.h" #include "rtimage.h" -#include "../rtengine/procparams.h" -#include "../rtengine/rt_math.h" +#include "rtengine/procparams.h" +#include "rtengine/rt_math.h" using namespace rtengine; using namespace rtengine::procparams; diff --git a/rtgui/guiutils.cc b/rtgui/guiutils.cc index 2bbdcd8cd..a71ffdfea 100644 --- a/rtgui/guiutils.cc +++ b/rtgui/guiutils.cc @@ -16,12 +16,12 @@ * along with RawTherapee. If not, see . */ #include -#include "../rtengine/rt_math.h" +#include "rtengine/rt_math.h" #include "guiutils.h" #include "options.h" -#include "../rtengine/utils.h" -#include "../rtengine/procparams.h" +#include "rtengine/utils.h" +#include "rtengine/procparams.h" #include "rtimage.h" #include "rtscalable.h" #include "multilangmgr.h" diff --git a/rtgui/guiutils.h b/rtgui/guiutils.h index 169d0ae11..530fb4726 100644 --- a/rtgui/guiutils.h +++ b/rtgui/guiutils.h @@ -28,8 +28,8 @@ #include "threadutils.h" -#include "../rtengine/coord.h" -#include "../rtengine/noncopyable.h" +#include "rtengine/coord.h" +#include "rtengine/noncopyable.h" namespace rtengine { diff --git a/rtgui/histogrampanel.cc b/rtgui/histogrampanel.cc index 6d866bdb7..97c782677 100644 --- a/rtgui/histogrampanel.cc +++ b/rtgui/histogrampanel.cc @@ -24,10 +24,10 @@ #include #include "rtimage.h" #include "rtscalable.h" -#include "../rtengine/array2D.h" -#include "../rtengine/color.h" -#include "../rtengine/improcfun.h" -#include "../rtengine/LUT.h" +#include "rtengine/array2D.h" +#include "rtengine/color.h" +#include "rtengine/improcfun.h" +#include "rtengine/LUT.h" using namespace rtengine; diff --git a/rtgui/histogrampanel.h b/rtgui/histogrampanel.h index 2ead05340..181c1f871 100644 --- a/rtgui/histogrampanel.h +++ b/rtgui/histogrampanel.h @@ -31,9 +31,9 @@ #include "options.h" #include "pointermotionlistener.h" -#include "../rtengine/array2D.h" -#include "../rtengine/LUT.h" -#include "../rtengine/noncopyable.h" +#include "rtengine/array2D.h" +#include "rtengine/LUT.h" +#include "rtengine/noncopyable.h" class HistogramScaling diff --git a/rtgui/history.cc b/rtgui/history.cc index 9cd9173a8..e130c9462 100644 --- a/rtgui/history.cc +++ b/rtgui/history.cc @@ -23,7 +23,7 @@ #include "multilangmgr.h" #include "rtimage.h" -#include "../rtengine/procparams.h" +#include "rtengine/procparams.h" using namespace rtengine; using namespace rtengine::procparams; diff --git a/rtgui/history.h b/rtgui/history.h index 197e5690b..122ff9d0e 100644 --- a/rtgui/history.h +++ b/rtgui/history.h @@ -24,7 +24,7 @@ #include "pparamschangelistener.h" #include "profilechangelistener.h" -#include "../rtengine/rtengine.h" +#include "rtengine/rtengine.h" class HistoryBeforeLineListener { diff --git a/rtgui/hsvequalizer.cc b/rtgui/hsvequalizer.cc index ddb1d2fb5..2c6066442 100644 --- a/rtgui/hsvequalizer.cc +++ b/rtgui/hsvequalizer.cc @@ -22,8 +22,8 @@ #include "curveeditorgroup.h" #include "options.h" -#include "../rtengine/color.h" -#include "../rtengine/procparams.h" +#include "rtengine/color.h" +#include "rtengine/procparams.h" using namespace rtengine; using namespace rtengine::procparams; diff --git a/rtgui/iccprofilecreator.cc b/rtgui/iccprofilecreator.cc index eeca55265..b7d3a1b2d 100644 --- a/rtgui/iccprofilecreator.cc +++ b/rtgui/iccprofilecreator.cc @@ -23,10 +23,10 @@ #include #include "iccprofilecreator.h" -#include "../rtengine/iccstore.h" +#include "rtengine/iccstore.h" #include "multilangmgr.h" #include "cachemanager.h" -#include "../rtengine/color.h" +#include "rtengine/color.h" #include "options.h" #include "pathutils.h" #include "rtimage.h" diff --git a/rtgui/icmpanel.cc b/rtgui/icmpanel.cc index 649978cf9..42a3d1412 100644 --- a/rtgui/icmpanel.cc +++ b/rtgui/icmpanel.cc @@ -27,10 +27,10 @@ #include "pathutils.h" #include "rtimage.h" -#include "../rtengine/dcp.h" -#include "../rtengine/iccstore.h" -#include "../rtengine/procparams.h" -#include "../rtengine/utils.h" +#include "rtengine/dcp.h" +#include "rtengine/iccstore.h" +#include "rtengine/procparams.h" +#include "rtengine/utils.h" using namespace rtengine; using namespace rtengine::procparams; diff --git a/rtgui/icmpanel.h b/rtgui/icmpanel.h index 0f05da2bb..821379ef8 100644 --- a/rtgui/icmpanel.h +++ b/rtgui/icmpanel.h @@ -27,7 +27,7 @@ #include "popupbutton.h" #include "toolpanel.h" -#include "../rtengine/imagedata.h" +#include "rtengine/imagedata.h" class ICMPanelListener { diff --git a/rtgui/imagearea.cc b/rtgui/imagearea.cc index a1387db02..c56a396f0 100644 --- a/rtgui/imagearea.cc +++ b/rtgui/imagearea.cc @@ -22,8 +22,8 @@ #include "options.h" #include "multilangmgr.h" #include "cropwindow.h" -#include "../rtengine/refreshmap.h" -#include "../rtengine/procparams.h" +#include "rtengine/refreshmap.h" +#include "rtengine/procparams.h" #include "options.h" #include "rtscalable.h" diff --git a/rtgui/impulsedenoise.cc b/rtgui/impulsedenoise.cc index 1df662aad..43a59678c 100644 --- a/rtgui/impulsedenoise.cc +++ b/rtgui/impulsedenoise.cc @@ -23,7 +23,7 @@ #include "guiutils.h" -#include "../rtengine/procparams.h" +#include "rtengine/procparams.h" using namespace rtengine; using namespace rtengine::procparams; diff --git a/rtgui/inspector.cc b/rtgui/inspector.cc index e2f9df35b..a01a6ce77 100644 --- a/rtgui/inspector.cc +++ b/rtgui/inspector.cc @@ -25,8 +25,8 @@ #include "options.h" #include "pathutils.h" #include "rtscalable.h" -#include "../rtengine/previewimage.h" -#include "../rtengine/rt_math.h" +#include "rtengine/previewimage.h" +#include "rtengine/rt_math.h" InspectorBuffer::InspectorBuffer(const Glib::ustring &imagePath) : currTransform(0), fromRaw(false) { diff --git a/rtgui/inspector.h b/rtgui/inspector.h index 5577bfb45..56bf95896 100644 --- a/rtgui/inspector.h +++ b/rtgui/inspector.h @@ -22,7 +22,7 @@ #include "guiutils.h" -#include "../rtengine/coord2d.h" +#include "rtengine/coord2d.h" class InspectorBuffer { diff --git a/rtgui/iptcpanel.cc b/rtgui/iptcpanel.cc index b6cf84fcb..e21b08ff5 100644 --- a/rtgui/iptcpanel.cc +++ b/rtgui/iptcpanel.cc @@ -23,9 +23,9 @@ #include "clipboard.h" #include "rtimage.h" -#include "../rtengine/imagedata.h" -#include "../rtengine/metadata.h" -#include "../rtengine/procparams.h" +#include "rtengine/imagedata.h" +#include "rtengine/metadata.h" +#include "rtengine/procparams.h" using namespace rtengine; using namespace rtengine::procparams; diff --git a/rtgui/labcurve.cc b/rtgui/labcurve.cc index e29733cac..d45b71e07 100644 --- a/rtgui/labcurve.cc +++ b/rtgui/labcurve.cc @@ -25,9 +25,9 @@ #include "curveeditorgroup.h" #include "options.h" -#include "../rtengine/color.h" -#include "../rtengine/improcfun.h" -#include "../rtengine/procparams.h" +#include "rtengine/color.h" +#include "rtengine/improcfun.h" +#include "rtengine/procparams.h" #include "editcallbacks.h" using namespace rtengine; diff --git a/rtgui/labgrid.cc b/rtgui/labgrid.cc index 9babe17ca..135ecedfe 100644 --- a/rtgui/labgrid.cc +++ b/rtgui/labgrid.cc @@ -40,7 +40,7 @@ #include "labgrid.h" -#include "../rtengine/color.h" +#include "rtengine/color.h" #include "options.h" #include "rtimage.h" #include "rtscalable.h" diff --git a/rtgui/lensgeom.cc b/rtgui/lensgeom.cc index 2f4306cd8..7366ef05d 100644 --- a/rtgui/lensgeom.cc +++ b/rtgui/lensgeom.cc @@ -24,7 +24,7 @@ #include "guiutils.h" #include "rtimage.h" -#include "../rtengine/procparams.h" +#include "rtengine/procparams.h" using namespace rtengine; using namespace rtengine::procparams; diff --git a/rtgui/lensprofile.cc b/rtgui/lensprofile.cc index 4410b2fe0..79f6313c9 100644 --- a/rtgui/lensprofile.cc +++ b/rtgui/lensprofile.cc @@ -29,10 +29,10 @@ #include "rtimage.h" #include "options.h" -#include "../rtengine/lcp.h" -#include "../rtengine/procparams.h" -#include "../rtengine/rtlensfun.h" -#include "../rtengine/lensmetadata.h" +#include "rtengine/lcp.h" +#include "rtengine/procparams.h" +#include "rtengine/rtlensfun.h" +#include "rtengine/lensmetadata.h" using namespace rtengine; using namespace rtengine::procparams; diff --git a/rtgui/lensprofile.h b/rtgui/lensprofile.h index cdf7bd6e4..31065f3c2 100644 --- a/rtgui/lensprofile.h +++ b/rtgui/lensprofile.h @@ -22,7 +22,7 @@ #include "guiutils.h" #include "toolpanel.h" -#include "../rtengine/lensmetadata.h" +#include "rtengine/lensmetadata.h" class LensProfilePanel final : public ToolParamBlock, diff --git a/rtgui/localcontrast.cc b/rtgui/localcontrast.cc index a56f9cb15..c2a17eb4f 100644 --- a/rtgui/localcontrast.cc +++ b/rtgui/localcontrast.cc @@ -24,7 +24,7 @@ #include "eventmapper.h" -#include "../rtengine/procparams.h" +#include "rtengine/procparams.h" using namespace rtengine; using namespace rtengine::procparams; diff --git a/rtgui/locallab.cc b/rtgui/locallab.cc index 13b68ba6d..a167cb5e1 100644 --- a/rtgui/locallab.cc +++ b/rtgui/locallab.cc @@ -22,7 +22,7 @@ #include "locallab.h" #include "options.h" -#include "../rtengine/procparams.h" +#include "rtengine/procparams.h" using namespace rtengine; using namespace procparams; diff --git a/rtgui/locallabtools.cc b/rtgui/locallabtools.cc index c7ae99269..790dbe26a 100644 --- a/rtgui/locallabtools.cc +++ b/rtgui/locallabtools.cc @@ -21,11 +21,11 @@ fft * #include "locallabtools.h" #include "options.h" -#include "../rtengine/procparams.h" +#include "rtengine/procparams.h" #include "locallab.h" #include "thresholdadjuster.h" #include "rtimage.h" -#include "../rtengine/color.h" +#include "rtengine/color.h" #define MINRAD 1.5 #define MAXRAD 10000 diff --git a/rtgui/locallabtools2.cc b/rtgui/locallabtools2.cc index 1ef6d7202..650e56582 100644 --- a/rtgui/locallabtools2.cc +++ b/rtgui/locallabtools2.cc @@ -21,12 +21,12 @@ #include "locallabtools.h" #include "options.h" -#include "../rtengine/procparams.h" +#include "rtengine/procparams.h" #include "locallab.h" #include "rtimage.h" -#include "../rtengine/color.h" +#include "rtengine/color.h" #include "eventmapper.h" -#include "../rtengine/utils.h" +#include "rtengine/utils.h" #define MINNEIGH 0.1 #define MAXNEIGH 1500 diff --git a/rtgui/lockablecolorpicker.cc b/rtgui/lockablecolorpicker.cc index 4a8529c38..8c8d73418 100644 --- a/rtgui/lockablecolorpicker.cc +++ b/rtgui/lockablecolorpicker.cc @@ -19,10 +19,10 @@ #include "lockablecolorpicker.h" #include "options.h" -#include "../rtengine/color.h" -#include "../rtengine/improcfun.h" -#include "../rtengine/rt_math.h" -#include "../rtengine/utils.h" +#include "rtengine/color.h" +#include "rtengine/improcfun.h" +#include "rtengine/rt_math.h" +#include "rtengine/utils.h" #include "imagearea.h" #include "multilangmgr.h" #include "navigator.h" diff --git a/rtgui/lockablecolorpicker.h b/rtgui/lockablecolorpicker.h index 3de6256e9..9cff24e1c 100644 --- a/rtgui/lockablecolorpicker.h +++ b/rtgui/lockablecolorpicker.h @@ -20,7 +20,7 @@ #include "guiutils.h" -#include "../rtengine/coord.h" +#include "rtengine/coord.h" class CropWindow; diff --git a/rtgui/main-cli.cc b/rtgui/main-cli.cc index 6d63d194a..20f989bb7 100644 --- a/rtgui/main-cli.cc +++ b/rtgui/main-cli.cc @@ -31,9 +31,9 @@ #include #include #include -#include "../rtengine/procparams.h" -#include "../rtengine/profilestore.h" -#include "../rtengine/rtengine.h" +#include "rtengine/procparams.h" +#include "rtengine/profilestore.h" +#include "rtengine/rtengine.h" #include "options.h" #include "soundman.h" #include "rtimage.h" diff --git a/rtgui/main.cc b/rtgui/main.cc index fb29e9c4c..914fe364b 100644 --- a/rtgui/main.cc +++ b/rtgui/main.cc @@ -42,8 +42,8 @@ #include "rtimage.h" #include "version.h" #include "extprog.h" -#include "../rtengine/dynamicprofile.h" -#include "../rtengine/procparams.h" +#include "rtengine/dynamicprofile.h" +#include "rtengine/procparams.h" #include "pathutils.h" #ifndef _WIN32 diff --git a/rtgui/metadatapanel.cc b/rtgui/metadatapanel.cc index 4e6252da4..50220af37 100644 --- a/rtgui/metadatapanel.cc +++ b/rtgui/metadatapanel.cc @@ -20,7 +20,7 @@ #include "metadatapanel.h" #include "eventmapper.h" -#include "../rtengine/procparams.h" +#include "rtengine/procparams.h" using namespace rtengine; using namespace rtengine::procparams; diff --git a/rtgui/multilangmgr.cc b/rtgui/multilangmgr.cc index 2f467a415..171dc20fa 100644 --- a/rtgui/multilangmgr.cc +++ b/rtgui/multilangmgr.cc @@ -30,7 +30,7 @@ #include #endif -#include "../rtengine/settings.h" +#include "rtengine/settings.h" namespace { diff --git a/rtgui/mycurve.cc b/rtgui/mycurve.cc index 6fd689e32..181cf2fa2 100644 --- a/rtgui/mycurve.cc +++ b/rtgui/mycurve.cc @@ -17,7 +17,7 @@ * along with RawTherapee. If not, see . */ #include "mycurve.h" -#include "../rtengine/curves.h" +#include "rtengine/curves.h" #include #include #include "rtscalable.h" diff --git a/rtgui/mycurve.h b/rtgui/mycurve.h index a6e375aac..294bed8a7 100644 --- a/rtgui/mycurve.h +++ b/rtgui/mycurve.h @@ -27,8 +27,8 @@ #include "cursormanager.h" #include "curvelistener.h" -#include "../rtengine/LUT.h" -#include "../rtengine/noncopyable.h" +#include "rtengine/LUT.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 */ #define CBAR_WIDTH 10 /** inner width of the colored bar (border excluded) */ diff --git a/rtgui/mydiagonalcurve.cc b/rtgui/mydiagonalcurve.cc index 4bf8580b5..f7cb5880a 100644 --- a/rtgui/mydiagonalcurve.cc +++ b/rtgui/mydiagonalcurve.cc @@ -24,7 +24,7 @@ #include "editcallbacks.h" -#include "../rtengine/curves.h" +#include "rtengine/curves.h" MyDiagonalCurve::MyDiagonalCurve () : MyCurve(), diff --git a/rtgui/mydiagonalcurve.h b/rtgui/mydiagonalcurve.h index 76c9c1ec0..7da18d16f 100644 --- a/rtgui/mydiagonalcurve.h +++ b/rtgui/mydiagonalcurve.h @@ -26,7 +26,7 @@ #include "curvelistener.h" #include "mycurve.h" -#include "../rtengine/diagonalcurvetypes.h" +#include "rtengine/diagonalcurvetypes.h" template class LUT; diff --git a/rtgui/myflatcurve.cc b/rtgui/myflatcurve.cc index dc79a400b..06b2840bf 100644 --- a/rtgui/myflatcurve.cc +++ b/rtgui/myflatcurve.cc @@ -24,7 +24,7 @@ #include "editcallbacks.h" -#include "../rtengine/curves.h" +#include "rtengine/curves.h" MyFlatCurve::MyFlatCurve () : MyCurve(), diff --git a/rtgui/myflatcurve.h b/rtgui/myflatcurve.h index 18d284e7e..14889ca6c 100644 --- a/rtgui/myflatcurve.h +++ b/rtgui/myflatcurve.h @@ -25,7 +25,7 @@ #include "cursormanager.h" #include "curvelistener.h" #include "mycurve.h" -#include "../rtengine/flatcurvetypes.h" +#include "rtengine/flatcurvetypes.h" enum MouseOverAreas { FCT_Area_None = 1 << 0, // over a zone that don't have any diff --git a/rtgui/navigator.cc b/rtgui/navigator.cc index a02e0aff8..cdff5f70b 100644 --- a/rtgui/navigator.cc +++ b/rtgui/navigator.cc @@ -20,9 +20,9 @@ #include "navigator.h" #include "previewwindow.h" #include "toolpanel.h" -#include "../rtengine/color.h" -#include "../rtengine/improcfun.h" -#include "../rtengine/rt_math.h" +#include "rtengine/color.h" +#include "rtengine/improcfun.h" +#include "rtengine/rt_math.h" #include "options.h" using namespace rtengine; diff --git a/rtgui/options.cc b/rtgui/options.cc index bdc595f5c..56cbf9859 100644 --- a/rtgui/options.cc +++ b/rtgui/options.cc @@ -32,9 +32,9 @@ #include "pathutils.h" #include "version.h" -#include "../rtengine/procparams.h" -#include "../rtengine/rtengine.h" -#include "../rtengine/utils.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 6a2b0c35d..9c34383a5 100644 --- a/rtgui/options.h +++ b/rtgui/options.h @@ -29,7 +29,7 @@ #else #include #endif -#include "../rtengine/settings.h" +#include "rtengine/settings.h" #include #define STARTUPDIR_CURRENT 0 diff --git a/rtgui/paramsedited.cc b/rtgui/paramsedited.cc index 27f36f46a..a5d6b2013 100644 --- a/rtgui/paramsedited.cc +++ b/rtgui/paramsedited.cc @@ -23,7 +23,7 @@ #include "addsetids.h" #include "options.h" -#include "../rtengine/procparams.h" +#include "rtengine/procparams.h" ParamsEdited::ParamsEdited(bool value) { diff --git a/rtgui/partialpastedlg.cc b/rtgui/partialpastedlg.cc index 3f03d81f6..7902b3acb 100644 --- a/rtgui/partialpastedlg.cc +++ b/rtgui/partialpastedlg.cc @@ -22,7 +22,7 @@ #include "multilangmgr.h" #include "paramsedited.h" -#include "../rtengine/procparams.h" +#include "rtengine/procparams.h" using namespace rtengine::procparams; diff --git a/rtgui/pcvignette.cc b/rtgui/pcvignette.cc index 1ed7446b1..d9cfedcbf 100644 --- a/rtgui/pcvignette.cc +++ b/rtgui/pcvignette.cc @@ -3,7 +3,7 @@ */ #include "pcvignette.h" -#include "../rtengine/procparams.h" +#include "rtengine/procparams.h" using namespace rtengine; using namespace rtengine::procparams; diff --git a/rtgui/pdsharpening.cc b/rtgui/pdsharpening.cc index 57133048c..504644378 100644 --- a/rtgui/pdsharpening.cc +++ b/rtgui/pdsharpening.cc @@ -26,7 +26,7 @@ #include "options.h" #include "rtimage.h" -#include "../rtengine/procparams.h" +#include "rtengine/procparams.h" using namespace rtengine; using namespace rtengine::procparams; diff --git a/rtgui/perspective.cc b/rtgui/perspective.cc index 55c100e12..04a79e983 100644 --- a/rtgui/perspective.cc +++ b/rtgui/perspective.cc @@ -22,7 +22,7 @@ #include "rtimage.h" #include "rtsurface.h" -#include "../rtengine/procparams.h" +#include "rtengine/procparams.h" using namespace rtengine; using namespace rtengine::procparams; diff --git a/rtgui/perspective.h b/rtgui/perspective.h index 5f13cf683..97c266a5b 100644 --- a/rtgui/perspective.h +++ b/rtgui/perspective.h @@ -24,7 +24,7 @@ #include "controllines.h" #include "lensgeomlistener.h" #include "toolpanel.h" -#include "../rtengine/tweakoperator.h" +#include "rtengine/tweakoperator.h" class PerspCorrectionPanelListener { diff --git a/rtgui/preferences.cc b/rtgui/preferences.cc index 6c9756051..96cc29708 100644 --- a/rtgui/preferences.cc +++ b/rtgui/preferences.cc @@ -32,10 +32,10 @@ #include "splash.h" #include "toollocationpref.h" -#include "../rtengine/dfmanager.h" -#include "../rtengine/ffmanager.h" -#include "../rtengine/iccstore.h" -#include "../rtengine/procparams.h" +#include "rtengine/dfmanager.h" +#include "rtengine/ffmanager.h" +#include "rtengine/iccstore.h" +#include "rtengine/procparams.h" #ifdef _OPENMP #include diff --git a/rtgui/preferences.h b/rtgui/preferences.h index 9b5707be3..30cd118e0 100644 --- a/rtgui/preferences.h +++ b/rtgui/preferences.h @@ -24,7 +24,7 @@ #include "dynamicprofilepanel.h" #include "options.h" -#include "../rtengine/profilestore.h" +#include "rtengine/profilestore.h" class ExternalEditorPreferences; class RTWindow; diff --git a/rtgui/preprocess.cc b/rtgui/preprocess.cc index 4d7df213c..507ce6681 100644 --- a/rtgui/preprocess.cc +++ b/rtgui/preprocess.cc @@ -23,7 +23,7 @@ #include "guiutils.h" #include "options.h" -#include "../rtengine/procparams.h" +#include "rtengine/procparams.h" using namespace rtengine; using namespace rtengine::procparams; diff --git a/rtgui/preprocesswb.cc b/rtgui/preprocesswb.cc index 9251f9440..9f1334ea1 100644 --- a/rtgui/preprocesswb.cc +++ b/rtgui/preprocesswb.cc @@ -24,7 +24,7 @@ #include "guiutils.h" #include "options.h" -#include "../rtengine/procparams.h" +#include "rtengine/procparams.h" using namespace rtengine; using namespace rtengine::procparams; diff --git a/rtgui/previewhandler.cc b/rtgui/previewhandler.cc index 76def26b4..e10444be7 100644 --- a/rtgui/previewhandler.cc +++ b/rtgui/previewhandler.cc @@ -18,8 +18,8 @@ */ #include "previewhandler.h" #include -#include "../rtengine/rtengine.h" -#include "../rtengine/procparams.h" +#include "rtengine/rtengine.h" +#include "rtengine/procparams.h" using namespace rtengine; using namespace rtengine::procparams; diff --git a/rtgui/previewhandler.h b/rtgui/previewhandler.h index 4fd9a1e82..52c80c1c5 100644 --- a/rtgui/previewhandler.h +++ b/rtgui/previewhandler.h @@ -26,8 +26,8 @@ #include "guiutils.h" #include "threadutils.h" -#include "../rtengine/noncopyable.h" -#include "../rtengine/rtengine.h" +#include "rtengine/noncopyable.h" +#include "rtengine/rtengine.h" class PreviewListener { diff --git a/rtgui/previewloader.h b/rtgui/previewloader.h index a8032fcaf..21b969bf2 100644 --- a/rtgui/previewloader.h +++ b/rtgui/previewloader.h @@ -20,7 +20,7 @@ #include -#include "../rtengine/noncopyable.h" +#include "rtengine/noncopyable.h" namespace Glib { diff --git a/rtgui/previewwindow.cc b/rtgui/previewwindow.cc index cc239ed26..92bb71a78 100644 --- a/rtgui/previewwindow.cc +++ b/rtgui/previewwindow.cc @@ -23,7 +23,7 @@ #include "options.h" #include "rtscalable.h" -#include "../rtengine/procparams.h" +#include "rtengine/procparams.h" PreviewWindow::PreviewWindow () : previewHandler(nullptr), mainCropWin(nullptr), imageArea(nullptr), imgX(0), imgY(0), imgW(0), imgH(0), zoom(0.0), press_x(0), press_y(0), isMoving(false), needsUpdate(false), cursor_type(CSUndefined) diff --git a/rtgui/profilepanel.cc b/rtgui/profilepanel.cc index 7c3948f42..0b8fb5fd9 100644 --- a/rtgui/profilepanel.cc +++ b/rtgui/profilepanel.cc @@ -26,8 +26,8 @@ #include "pathutils.h" #include "rtimage.h" -#include "../rtengine/procparams.h" -#include "../rtengine/procevents.h" +#include "rtengine/procparams.h" +#include "rtengine/procevents.h" using namespace rtengine; using namespace rtengine::procparams; diff --git a/rtgui/profilepanel.h b/rtgui/profilepanel.h index e1d1f4067..e38305c63 100644 --- a/rtgui/profilepanel.h +++ b/rtgui/profilepanel.h @@ -27,8 +27,8 @@ #include "pparamschangelistener.h" #include "profilechangelistener.h" -#include "../rtengine/profilestore.h" -#include "../rtengine/noncopyable.h" +#include "rtengine/profilestore.h" +#include "rtengine/noncopyable.h" class ProfileStoreComboBox; diff --git a/rtgui/profilestorecombobox.cc b/rtgui/profilestorecombobox.cc index a6085e7a9..e7e163f3b 100644 --- a/rtgui/profilestorecombobox.cc +++ b/rtgui/profilestorecombobox.cc @@ -16,10 +16,10 @@ * You should have received a copy of the GNU General Public License * along with RawTherapee. If not, see . */ -#include "../rtengine/profilestore.h" +#include "rtengine/profilestore.h" #include "profilestorecombobox.h" -#include "../rtengine/dynamicprofile.h" +#include "rtengine/dynamicprofile.h" #include "options.h" #include "toolpanel.h" #include "guiutils.h" diff --git a/rtgui/progressconnector.h b/rtgui/progressconnector.h index 90c9f67f0..c3a58deb7 100644 --- a/rtgui/progressconnector.h +++ b/rtgui/progressconnector.h @@ -24,7 +24,7 @@ #include "guiutils.h" #include "multilangmgr.h" -#include "../rtengine/rtengine.h" +#include "rtengine/rtengine.h" #undef THREAD_PRIORITY_NORMAL diff --git a/rtgui/rawcacorrection.cc b/rtgui/rawcacorrection.cc index 3bcd3d03a..2288c1b2f 100644 --- a/rtgui/rawcacorrection.cc +++ b/rtgui/rawcacorrection.cc @@ -23,7 +23,7 @@ #include "rtimage.h" #include "options.h" -#include "../rtengine/procparams.h" +#include "rtengine/procparams.h" using namespace rtengine; using namespace rtengine::procparams; diff --git a/rtgui/rawexposure.cc b/rtgui/rawexposure.cc index 778283b75..26f2dba74 100644 --- a/rtgui/rawexposure.cc +++ b/rtgui/rawexposure.cc @@ -23,7 +23,7 @@ #include "guiutils.h" #include "options.h" -#include "../rtengine/procparams.h" +#include "rtengine/procparams.h" using namespace rtengine; using namespace rtengine::procparams; diff --git a/rtgui/resize.cc b/rtgui/resize.cc index de9f6b4d1..1559f40b3 100644 --- a/rtgui/resize.cc +++ b/rtgui/resize.cc @@ -24,7 +24,7 @@ #include "eventmapper.h" #include "guiutils.h" -#include "../rtengine/procparams.h" +#include "rtengine/procparams.h" using namespace rtengine; using namespace rtengine::procparams; diff --git a/rtgui/retinex.cc b/rtgui/retinex.cc index 11bcc74fb..73b5e819c 100644 --- a/rtgui/retinex.cc +++ b/rtgui/retinex.cc @@ -8,7 +8,7 @@ #include "mycurve.h" #include "rtimage.h" #include "options.h" -#include "../rtengine/color.h" +#include "rtengine/color.h" #include "eventmapper.h" using namespace rtengine; diff --git a/rtgui/rgbcurves.cc b/rtgui/rgbcurves.cc index 0dd6805fe..c8b51b70b 100644 --- a/rtgui/rgbcurves.cc +++ b/rtgui/rgbcurves.cc @@ -22,7 +22,7 @@ #include "curveeditorgroup.h" #include "options.h" -#include "../rtengine/procparams.h" +#include "rtengine/procparams.h" using namespace rtengine; using namespace rtengine::procparams; diff --git a/rtgui/rotate.cc b/rtgui/rotate.cc index 81dd9267c..93d44e77f 100644 --- a/rtgui/rotate.cc +++ b/rtgui/rotate.cc @@ -24,7 +24,7 @@ #include "lensgeomlistener.h" #include "rtimage.h" -#include "../rtengine/procparams.h" +#include "rtengine/procparams.h" using namespace rtengine; using namespace rtengine::procparams; diff --git a/rtgui/rtscalable.cc b/rtgui/rtscalable.cc index 58b67ed52..a855cb806 100644 --- a/rtgui/rtscalable.cc +++ b/rtgui/rtscalable.cc @@ -23,7 +23,7 @@ #include #include -#include "../rtengine/settings.h" +#include "rtengine/settings.h" #include "guiutils.h" extern Glib::ustring argv0; diff --git a/rtgui/rtwindow.cc b/rtgui/rtwindow.cc index b95625a80..8ecaa1184 100755 --- a/rtgui/rtwindow.cc +++ b/rtgui/rtwindow.cc @@ -27,7 +27,7 @@ #include "rtimage.h" #include "thumbnail.h" #include "whitebalance.h" -#include "../rtengine/settings.h" +#include "rtengine/settings.h" #include "batchqueuepanel.h" #include "batchqueueentry.h" #include "editorpanel.h" diff --git a/rtgui/rtwindow.h b/rtgui/rtwindow.h index 4c3aa75ea..eb7c6e5bc 100755 --- a/rtgui/rtwindow.h +++ b/rtgui/rtwindow.h @@ -29,7 +29,7 @@ #include "progressconnector.h" #include "splash.h" -#include "../rtengine/noncopyable.h" +#include "rtengine/noncopyable.h" class BatchQueueEntry; class BatchQueuePanel; diff --git a/rtgui/saveasdlg.cc b/rtgui/saveasdlg.cc index 1e361411c..b1a217553 100644 --- a/rtgui/saveasdlg.cc +++ b/rtgui/saveasdlg.cc @@ -25,7 +25,7 @@ #include "pathutils.h" #include "rtimage.h" -#include "../rtengine/utils.h" +#include "rtengine/utils.h" namespace { diff --git a/rtgui/saveformatpanel.h b/rtgui/saveformatpanel.h index 9d9f6266e..ba08c98f6 100644 --- a/rtgui/saveformatpanel.h +++ b/rtgui/saveformatpanel.h @@ -24,7 +24,7 @@ #include "guiutils.h" #include "options.h" -#include "../rtengine/noncopyable.h" +#include "rtengine/noncopyable.h" class FormatChangeListener { diff --git a/rtgui/shadowshighlights.cc b/rtgui/shadowshighlights.cc index 3c821d863..cc9faf2ac 100644 --- a/rtgui/shadowshighlights.cc +++ b/rtgui/shadowshighlights.cc @@ -20,7 +20,7 @@ #include "eventmapper.h" -#include "../rtengine/procparams.h" +#include "rtengine/procparams.h" using namespace rtengine; using namespace rtengine::procparams; diff --git a/rtgui/sharpenedge.cc b/rtgui/sharpenedge.cc index 247a8a5d7..3104b641e 100644 --- a/rtgui/sharpenedge.cc +++ b/rtgui/sharpenedge.cc @@ -23,7 +23,7 @@ #include "guiutils.h" #include "options.h" -#include "../rtengine/procparams.h" +#include "rtengine/procparams.h" using namespace rtengine; using namespace rtengine::procparams; diff --git a/rtgui/sharpenmicro.cc b/rtgui/sharpenmicro.cc index 527d146d7..f87c5815f 100644 --- a/rtgui/sharpenmicro.cc +++ b/rtgui/sharpenmicro.cc @@ -24,7 +24,7 @@ #include "eventmapper.h" #include "guiutils.h" -#include "../rtengine/procparams.h" +#include "rtengine/procparams.h" using namespace rtengine; using namespace rtengine::procparams; diff --git a/rtgui/softlight.cc b/rtgui/softlight.cc index 3a7f84985..9fe8d40fa 100644 --- a/rtgui/softlight.cc +++ b/rtgui/softlight.cc @@ -24,7 +24,7 @@ #include "eventmapper.h" -#include "../rtengine/procparams.h" +#include "rtengine/procparams.h" using namespace rtengine; using namespace rtengine::procparams; diff --git a/rtgui/spot.cc b/rtgui/spot.cc index ad5fab63e..ec45a9bb0 100644 --- a/rtgui/spot.cc +++ b/rtgui/spot.cc @@ -21,10 +21,10 @@ #include "spot.h" #include "rtimage.h" #include -#include "../rtengine/rt_math.h" +#include "rtengine/rt_math.h" #include "guiutils.h" #include "eventmapper.h" -#include "../rtengine/refreshmap.h" +#include "rtengine/refreshmap.h" using namespace rtengine; using namespace rtengine::procparams; diff --git a/rtgui/spot.h b/rtgui/spot.h index 236cd36ad..fd523ba40 100644 --- a/rtgui/spot.h +++ b/rtgui/spot.h @@ -24,8 +24,8 @@ #include "toolpanel.h" #include "editwidgets.h" #include "adjuster.h" -#include "../rtengine/procparams.h" -#include "../rtengine/tweakoperator.h" +#include "rtengine/procparams.h" +#include "rtengine/tweakoperator.h" /** * @brief Let the user create/edit/delete points for Spot Removal tool diff --git a/rtgui/threadutils.h b/rtgui/threadutils.h index 71c57e347..5cf699ff2 100644 --- a/rtgui/threadutils.h +++ b/rtgui/threadutils.h @@ -27,7 +27,7 @@ #include #include #include -#include "../rtengine/noncopyable.h" +#include "rtengine/noncopyable.h" #if STRICT_MUTEX && NDEBUG using MyMutexBase = std::mutex; diff --git a/rtgui/thresholdadjuster.cc b/rtgui/thresholdadjuster.cc index 7f8aec508..5545a9f43 100644 --- a/rtgui/thresholdadjuster.cc +++ b/rtgui/thresholdadjuster.cc @@ -20,7 +20,7 @@ #include #include #include "multilangmgr.h" -#include "../rtengine/rtengine.h" +#include "rtengine/rtengine.h" #include "options.h" #include "guiutils.h" #include "rtimage.h" diff --git a/rtgui/thresholdselector.cc b/rtgui/thresholdselector.cc index 53c1b33af..0aa606f4c 100644 --- a/rtgui/thresholdselector.cc +++ b/rtgui/thresholdselector.cc @@ -26,7 +26,7 @@ #include "mycurve.h" #include "rtscalable.h" -#include "../rtengine/procparams.h" +#include "rtengine/procparams.h" ThresholdSelector::ThresholdSelector(double minValueBottom, double maxValueBottom, double defBottom, Glib::ustring labelBottom, unsigned int precisionBottom, double minValueTop, double maxValueTop, double defTop, Glib::ustring labelTop, unsigned int precisionTop, diff --git a/rtgui/thresholdselector.h b/rtgui/thresholdselector.h index 55ccce758..3e2fa099c 100644 --- a/rtgui/thresholdselector.h +++ b/rtgui/thresholdselector.h @@ -22,7 +22,7 @@ #include "coloredbar.h" -#include "../rtengine/procparams.h" +#include "rtengine/procparams.h" class ThresholdSelector; diff --git a/rtgui/thumbbrowserbase.cc b/rtgui/thumbbrowserbase.cc index f873c719d..15ad8831e 100644 --- a/rtgui/thumbbrowserbase.cc +++ b/rtgui/thumbbrowserbase.cc @@ -25,7 +25,7 @@ #include "thumbbrowserbase.h" #include "thumbbrowserentrybase.h" -#include "../rtengine/rt_math.h" +#include "rtengine/rt_math.h" using namespace std; diff --git a/rtgui/thumbbrowserentrybase.cc b/rtgui/thumbbrowserentrybase.cc index 2f9fb4b47..fd3f7d111 100644 --- a/rtgui/thumbbrowserentrybase.cc +++ b/rtgui/thumbbrowserentrybase.cc @@ -20,7 +20,7 @@ #include "options.h" #include "thumbbrowserbase.h" -#include "../rtengine/rt_math.h" +#include "rtengine/rt_math.h" #include "rtsurface.h" namespace diff --git a/rtgui/thumbbrowserentrybase.h b/rtgui/thumbbrowserentrybase.h index 41d33382d..fa9105184 100644 --- a/rtgui/thumbbrowserentrybase.h +++ b/rtgui/thumbbrowserentrybase.h @@ -29,7 +29,7 @@ #include "options.h" #include "thumbnail.h" -#include "../rtengine/coord2d.h" +#include "rtengine/coord2d.h" class Thumbnail; class ThumbBrowserBase; diff --git a/rtgui/thumbimageupdater.cc b/rtgui/thumbimageupdater.cc index 3afba13fb..4b46cbbf3 100644 --- a/rtgui/thumbimageupdater.cc +++ b/rtgui/thumbimageupdater.cc @@ -30,7 +30,7 @@ #include "threadutils.h" #include "thumbnail.h" -#include "../rtengine/procparams.h" +#include "rtengine/procparams.h" #ifdef _OPENMP #include diff --git a/rtgui/thumbimageupdater.h b/rtgui/thumbimageupdater.h index 4c890ee9b..0262e3374 100644 --- a/rtgui/thumbimageupdater.h +++ b/rtgui/thumbimageupdater.h @@ -21,7 +21,7 @@ #include -#include "../rtengine/noncopyable.h" +#include "rtengine/noncopyable.h" namespace rtengine { diff --git a/rtgui/thumbnail.cc b/rtgui/thumbnail.cc index f5098ae6d..5a187b42e 100644 --- a/rtgui/thumbnail.cc +++ b/rtgui/thumbnail.cc @@ -26,17 +26,17 @@ #include #include #include -#include "../rtengine/colortemp.h" -#include "../rtengine/imagedata.h" -#include "../rtengine/procparams.h" -#include "../rtengine/rtthumbnail.h" +#include "rtengine/colortemp.h" +#include "rtengine/imagedata.h" +#include "rtengine/procparams.h" +#include "rtengine/rtthumbnail.h" #include #include -#include "../rtengine/dynamicprofile.h" -#include "../rtengine/metadata.h" -#include "../rtengine/profilestore.h" -#include "../rtengine/settings.h" +#include "rtengine/dynamicprofile.h" +#include "rtengine/metadata.h" +#include "rtengine/profilestore.h" +#include "rtengine/settings.h" #include "guiutils.h" #include "batchqueue.h" #include "extprog.h" diff --git a/rtgui/tonecurve.cc b/rtgui/tonecurve.cc index bf81c6f22..9fb6e17e1 100644 --- a/rtgui/tonecurve.cc +++ b/rtgui/tonecurve.cc @@ -26,8 +26,8 @@ #include "eventmapper.h" #include "options.h" -#include "../rtengine/procparams.h" -#include "../rtengine/utils.h" +#include "rtengine/procparams.h" +#include "rtengine/utils.h" #include "editcallbacks.h" using namespace rtengine; diff --git a/rtgui/toolpanel.cc b/rtgui/toolpanel.cc index b2c14107d..7785ccfd0 100644 --- a/rtgui/toolpanel.cc +++ b/rtgui/toolpanel.cc @@ -21,7 +21,7 @@ #include "guiutils.h" #include "rtimage.h" -#include "../rtengine/procparams.h" +#include "rtengine/procparams.h" using namespace rtengine::procparams; diff --git a/rtgui/toolpanel.h b/rtgui/toolpanel.h index f22f6f771..8d8b08f89 100644 --- a/rtgui/toolpanel.h +++ b/rtgui/toolpanel.h @@ -26,8 +26,8 @@ #include "multilangmgr.h" #include "paramsedited.h" -#include "../rtengine/noncopyable.h" -#include "../rtengine/rtengine.h" +#include "rtengine/noncopyable.h" +#include "rtengine/rtengine.h" namespace rtengine { diff --git a/rtgui/toolpanelcoord.cc b/rtgui/toolpanelcoord.cc index 9b3bcf6ea..5416f1f2c 100644 --- a/rtgui/toolpanelcoord.cc +++ b/rtgui/toolpanelcoord.cc @@ -24,13 +24,13 @@ #include "options.h" #include "rtimage.h" -#include "../rtengine/imagesource.h" -#include "../rtengine/dfmanager.h" -#include "../rtengine/ffmanager.h" -#include "../rtengine/improcfun.h" -#include "../rtengine/perspectivecorrection.h" -#include "../rtengine/procevents.h" -#include "../rtengine/refreshmap.h" +#include "rtengine/imagesource.h" +#include "rtengine/dfmanager.h" +#include "rtengine/ffmanager.h" +#include "rtengine/improcfun.h" +#include "rtengine/perspectivecorrection.h" +#include "rtengine/procevents.h" +#include "rtengine/refreshmap.h" using namespace rtengine::procparams; diff --git a/rtgui/toolpanelcoord.h b/rtgui/toolpanelcoord.h index d34c9870d..c192ef90e 100644 --- a/rtgui/toolpanelcoord.h +++ b/rtgui/toolpanelcoord.h @@ -89,8 +89,8 @@ #include "xtransprocess.h" #include "xtransrawexposure.h" -#include "../rtengine/noncopyable.h" -#include "../rtengine/rtengine.h" +#include "rtengine/noncopyable.h" +#include "rtengine/rtengine.h" class ImageEditorCoordinator; class MetaDataPanel; diff --git a/rtgui/vibrance.cc b/rtgui/vibrance.cc index f2eb8fc4e..c928519c5 100644 --- a/rtgui/vibrance.cc +++ b/rtgui/vibrance.cc @@ -22,7 +22,7 @@ #include "curveeditor.h" #include "curveeditorgroup.h" #include "options.h" -#include "../rtengine/color.h" +#include "rtengine/color.h" using namespace rtengine; using namespace rtengine::procparams; diff --git a/rtgui/vignetting.cc b/rtgui/vignetting.cc index c2652de42..2a5d0718d 100644 --- a/rtgui/vignetting.cc +++ b/rtgui/vignetting.cc @@ -18,7 +18,7 @@ */ #include "vignetting.h" -#include "../rtengine/procparams.h" +#include "rtengine/procparams.h" using namespace rtengine; using namespace rtengine::procparams; diff --git a/rtgui/wavelet.cc b/rtgui/wavelet.cc index c807a1bd2..ac1b884b2 100644 --- a/rtgui/wavelet.cc +++ b/rtgui/wavelet.cc @@ -28,7 +28,7 @@ #include "options.h" #include "eventmapper.h" #include "labgrid.h" -#include "../rtengine/color.h" +#include "rtengine/color.h" #include using namespace rtengine; diff --git a/rtgui/whitebalance.cc b/rtgui/whitebalance.cc index d207ef7a2..c0a65f7f4 100644 --- a/rtgui/whitebalance.cc +++ b/rtgui/whitebalance.cc @@ -25,7 +25,7 @@ #include "options.h" #include "eventmapper.h" -#include "../rtengine/colortemp.h" +#include "rtengine/colortemp.h" #define MINTEMP 1500 //1200 #define MAXTEMP 60000 //12000 diff --git a/rtgui/whitebalance.h b/rtgui/whitebalance.h index 02706f7e5..fed3f92e3 100644 --- a/rtgui/whitebalance.h +++ b/rtgui/whitebalance.h @@ -26,8 +26,8 @@ #include "toolpanel.h" #include "wbprovider.h" -#include "../rtengine/procparams.h" -#include "../rtengine/utils.h" +#include "rtengine/procparams.h" +#include "rtengine/utils.h" class SpotWBListener { diff --git a/rtgui/xtransprocess.cc b/rtgui/xtransprocess.cc index d6850da63..de2e14725 100644 --- a/rtgui/xtransprocess.cc +++ b/rtgui/xtransprocess.cc @@ -22,7 +22,7 @@ #include "guiutils.h" #include "options.h" -#include "../rtengine/procparams.h" +#include "rtengine/procparams.h" using namespace rtengine; using namespace rtengine::procparams; diff --git a/rtgui/xtransrawexposure.cc b/rtgui/xtransrawexposure.cc index 52547d930..e4c1c55d0 100644 --- a/rtgui/xtransrawexposure.cc +++ b/rtgui/xtransrawexposure.cc @@ -22,7 +22,7 @@ #include "guiutils.h" #include "options.h" -#include "../rtengine/procparams.h" +#include "rtengine/procparams.h" using namespace rtengine; using namespace rtengine::procparams;