Merge pull request #7255 from digitalcarp/cleanup-includes

Get rid of relative include paths

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}

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 <omp.h>

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"

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"

rtengine/cache.h

@@ -26,7 +26,7 @@
 #include <type_traits>
 #include <unordered_map>
 
-#include "../rtgui/threadutils.h"
+#include "rtgui/threadutils.h"
 
 namespace rtengine
 {

rtengine/capturesharpening.cc

@@ -29,7 +29,7 @@
 //#define BENCHMARK
 #include "StopWatch.h"
 #include "opthelper.h"
-#include "../rtgui/multilangmgr.h"
+#include "rtgui/multilangmgr.h"
 
 namespace {
 

rtengine/clutstore.cc

@@ -13,7 +13,7 @@
 #include "rt_math.h"
 #include "stdimagesource.h"
 
-#include "../rtgui/options.h"
+#include "rtgui/options.h"
 
 namespace
 {

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;
 

rtengine/dcp.h

@@ -26,7 +26,7 @@
 
 #include <glibmm/ustring.h>
 
-#include "../rtgui/threadutils.h"
+#include "rtgui/threadutils.h"
 
 #include "curves.h"
 #include "noncopyable.h"

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"

rtengine/dcrop.h

@@ -20,7 +20,7 @@
 
 #include "rtengine.h"
 #include "pipettebuffer.h"
-#include "../rtgui/threadutils.h"
+#include "rtgui/threadutils.h"
 
 namespace rtengine
 {

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

rtengine/dfmanager.cc

@@ -36,7 +36,7 @@
 #include "rawimage.h"
 #include "utils.h"
 
-#include "../rtgui/options.h"
+#include "rtgui/options.h"
 
 namespace
 {

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;
 

rtengine/dynamicprofile.cc

@@ -27,7 +27,7 @@
 #include <glibmm/fileutils.h>
 
 #include "rtengine.h"
-#include "../rtgui/options.h"
+#include "rtgui/options.h"
 
 using namespace rtengine;
 using namespace rtengine::procparams;

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"
 

rtengine/fast_demo.cc

@@ -24,7 +24,7 @@
 
 #include <cmath>
 #include "rawimagesource.h"
-#include "../rtgui/multilangmgr.h"
+#include "rtgui/multilangmgr.h"
 #include "opthelper.h"
 
 using namespace std;

rtengine/ffmanager.cc

@@ -21,7 +21,7 @@
 #include <glibmm/miscutils.h>
 
 #include "ffmanager.h"
-#include "../rtgui/options.h"
+#include "rtgui/options.h"
 #include "rawimage.h"
 #include "imagedata.h"
 #include "median.h"

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"

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"

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

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;

rtengine/improccoordinator.cc

@@ -41,7 +41,7 @@
 #include "refreshmap.h"
 #include "utils.h"
 
-#include "../rtgui/options.h"
+#include "rtgui/options.h"
 
 #ifdef _OPENMP
 #include <omp.h>

rtengine/improccoordinator.h

@@ -29,7 +29,7 @@
 #include "LUT.h"
 #include "rtengine.h"
 
-#include "../rtgui/threadutils.h"
+#include "rtgui/threadutils.h"
 
 namespace Glib
 {

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"

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"

rtengine/ipdehaze.cc

@@ -44,7 +44,7 @@
 //#define BENCHMARK
 #include "StopWatch.h"
 
-#include "../rtgui/options.h"
+#include "rtgui/options.h"
 
 namespace rtengine
 {

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 <omp.h>
 #endif
-#include "../rtgui/thresholdselector.h"
+#include "rtgui/thresholdselector.h"
 #include "imagesource.h"
 
 #include "cplx_wavelet_dec.h"

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 <omp.h>

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"

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 <ctime>
 
 

rtengine/perspectivecorrection.cc

@@ -55,7 +55,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "../rtgui/threadutils.h"
+#include "rtgui/threadutils.h"
 #include "colortemp.h"
 #include "imagefloat.h"
 #include "settings.h"

rtengine/pipettebuffer.cc

@@ -22,7 +22,7 @@
 #include "imagefloat.h"
 #include "labimage.h"
 
-#include "../rtgui/editcallbacks.h"
+#include "rtgui/editcallbacks.h"
 
 namespace rtengine
 {

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"

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;
 

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;

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

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"

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;

rtengine/rtengine.h

@@ -34,7 +34,7 @@
 #include "procevents.h"
 #include "settings.h"
 
-#include "../rtgui/threadutils.h"
+#include "rtgui/threadutils.h"
 
 
 /**

rtengine/rtthumbnail.h

@@ -25,7 +25,7 @@
 #include "imagefloat.h"
 #include "LUT.h"
 
-#include "../rtgui/threadutils.h"
+#include "rtgui/threadutils.h"
 
 namespace Glib
 {

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
 

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"
 

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"
 

rtgui/CMakeLists.txt

@@ -179,8 +179,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/...
@@ -260,17 +258,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)

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 {
 

rtgui/batchqueue.cc

@@ -20,9 +20,9 @@
 #include <glib/gstdio.h>
 #include <cstring>
 #include <functional>
-#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 <fstream>
 #include <iomanip>

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;
 

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<RTSurface> BatchQueueEntry::savedAsIcon(std::shared_ptr<RTSurface>(nullptr));

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;

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;

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;

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;

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;

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;

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
 {

rtgui/cacheimagedata.cc

@@ -24,8 +24,8 @@
 #include "version.h"
 #include <locale.h>
 
-#include "../rtengine/procparams.h"
-#include "../rtengine/settings.h"
+#include "rtengine/procparams.h"
+#include "rtengine/settings.h"
 
 
 namespace

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

rtgui/cachemanager.h

@@ -25,7 +25,7 @@
 
 #include "threadutils.h"
 
-#include "../rtengine/noncopyable.h"
+#include "rtengine/noncopyable.h"
 
 class CacheImageData;
 class Thumbnail;

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;

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;

rtgui/clipboard.cc

@@ -19,7 +19,7 @@
 #include "clipboard.h"
 
 #include "paramsedited.h"
-#include "../rtengine/procparams.h"
+#include "rtengine/procparams.h"
 
 Clipboard clipboard;
 

rtgui/clipboard.h

@@ -21,8 +21,8 @@
 #include <memory>
 #include <vector>
 
-#include "../rtengine/diagonalcurvetypes.h"
-#include "../rtengine/flatcurvetypes.h"
+#include "rtengine/diagonalcurvetypes.h"
+#include "rtengine/flatcurvetypes.h"
 
 struct ParamsEdited;
 

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;

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

rtgui/coloredbar.cc

@@ -18,7 +18,7 @@
  */
 
 #include "coloredbar.h"
-#include "../rtengine/utils.h"
+#include "rtengine/utils.h"
 
 ColoredBar::ColoredBar (eRTOrientation orient)
 {

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;

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;

rtgui/controllines.cc

@@ -24,7 +24,7 @@
 #include "editwidgets.h"
 #include "rtsurface.h"
 
-#include "../rtengine/perspectivecorrection.h"
+#include "rtengine/perspectivecorrection.h"
 
 using namespace rtengine;
 

rtgui/controllines.h

@@ -21,7 +21,7 @@
 #include <memory>
 
 #include "editcallbacks.h"
-#include "../rtengine/perspectivecorrection.h"
+#include "rtengine/perspectivecorrection.h"
 
 class Circle;
 class Line;

rtgui/controlspotpanel.cc

@@ -18,11 +18,11 @@
  *  2018 Pierre Cabrera <pierre.cab@gmail.com>
  */
 
-#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"
 

rtgui/controlspotpanel.h

@@ -23,7 +23,7 @@
 
 #include <memory>
 
-#include "../rtengine/coord.h"
+#include "rtengine/coord.h"
 #include "editcallbacks.h"
 #include "threadutils.h"
 #include "toolpanel.h"

rtgui/crop.cc

@@ -24,8 +24,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;

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;
 

rtgui/crophandler.h

@@ -27,7 +27,7 @@
 #include "lockablecolorpicker.h"
 #include "threadutils.h"
 
-#include "../rtengine/rtengine.h"
+#include "rtengine/rtengine.h"
 
 class EditSubscriber;
 

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;
 

rtgui/cropwindow.h

@@ -31,7 +31,7 @@
 #include "lwbutton.h"
 #include "lwbuttonset.h"
 
-#include "../rtengine/noncopyable.h"
+#include "rtengine/noncopyable.h"
 
 namespace rtengine
 {

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 <cstring>
 

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;

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;

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;

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;

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;

rtgui/delayed.h

@@ -26,7 +26,7 @@
 #include <glibmm/main.h>
 #include <glibmm/signalproxy.h>
 
-#include "../rtengine/noncopyable.h"
+#include "rtengine/noncopyable.h"
 
 namespace delayed_helper
 {

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)
 {

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;

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;

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;

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;

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 <sstream>
 #include <iomanip>
 

rtgui/dynamicprofilepanel.h

@@ -22,7 +22,7 @@
 
 #include "profilestorecombobox.h"
 
-#include "../rtengine/dynamicprofile.h"
+#include "rtengine/dynamicprofile.h"
 
 class DynamicProfilePanel :
     public Gtk::Box

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;

rtgui/editorpanel.cc

@@ -21,9 +21,9 @@
 
 #include <iostream>
 
-#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;

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
 {

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;
 

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"

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;

rtgui/eventmapper.h

@@ -22,7 +22,7 @@
 #include <string>
 #include <map>
 #include <unordered_map>
-#include "../rtengine/refreshmap.h"
+#include "rtengine/refreshmap.h"
 
 
 class ProcEventMapper {

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 <glibmm/regex.h>
 

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;