#pragma once for our headers plus drive-by formatting

rtengine/LUT.h

@@ -56,8 +56,7 @@
  *          LUTuc stands for LUT<unsigned char>
  */
 
-#ifndef LUT_H_
+#pragma once
-#define LUT_H_
 
 #include <cstring>
 #include <cstdint>
@@ -67,9 +66,9 @@
 #include <fstream>
 #endif
 
+#include "noncopyable.h"
 #include "opthelper.h"
 #include "rt_math.h"
-#include "noncopyable.h"
 
 // Bit representations of flags
 enum {
@@ -628,5 +627,3 @@ public:
 
 
 };
-
-#endif /* LUT_H_ */

rtengine/alignedbuffer.h

@@ -16,8 +16,7 @@
  *  You should have received a copy of the GNU General Public License
  *  along with RawTherapee.  If not, see <https://www.gnu.org/licenses/>.
  */
-#ifndef _ALIGNEDBUFFER_
+#pragma once
-#define _ALIGNEDBUFFER_
 
 #include <cstdint>
 #include <cstdlib>
@@ -142,5 +141,3 @@ public:
         return unitSize ? allocatedSize / unitSize : 0;
     }
 };
-
-#endif

rtengine/array2D.h

@@ -52,8 +52,8 @@
  *
  *          !! locked arrays cannot be resized and cannot be unlocked again !!
  */
-#ifndef ARRAY2D_H_
+#pragma once
-#define ARRAY2D_H_
+
 #include <csignal>  // for raise()
 #include <cassert>
 
@@ -313,4 +313,3 @@ public:
         return list[index];
     }
 };
-#endif /* array2D_H_ */

rtengine/calc_distort.h

@@ -1,4 +1,3 @@
-#ifndef CALC_DISTORTION__H
+#pragma once
-#define CALC_DISTORTION__H
+
 int calcDistortion (unsigned char* img1, unsigned char* img2, int ncols, int nrows, int nfactor, double &distortion);
-#endif

rtengine/camconst.h

@@ -1,8 +1,7 @@
 /*
  *  This file is part of RawTherapee.
  */
-#ifndef __CAMCONST__
+#pragma once
-#define __CAMCONST__
 
 #include <glibmm/ustring.h>
 #include <map>
@@ -73,5 +72,3 @@ public:
 };
 
 }
-
-#endif

rtengine/ciecam02.h

@@ -16,9 +16,10 @@
  *  You should have received a copy of the GNU General Public License
  *  along with RawTherapee.  If not, see <https://www.gnu.org/licenses/>.
  */
-#ifndef _CIECAM02_
+#pragma once
-#define _CIECAM02_
+
 #include <cmath>
+
 #include "LUT.h"
 #include "opthelper.h"
 
@@ -106,4 +107,3 @@ public:
 
 };
 }
-#endif

rtengine/coord.h

@@ -17,8 +17,7 @@
  *  along with RawTherapee.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-#ifndef __COORD__
+#pragma once
-#define __COORD__
 
 namespace rtengine
 {
@@ -253,5 +252,3 @@ inline const PolarCoord operator* (const double lhs, const PolarCoord& rhs)
 }
 
 }
-
-#endif

rtengine/coord2d.h

@@ -16,8 +16,7 @@
  *  You should have received a copy of the GNU General Public License
  *  along with RawTherapee.  If not, see <https://www.gnu.org/licenses/>.
  */
-#ifndef __COORD2D__
+#pragma once
-#define __COORD2D__
 
 namespace rtengine
 {
@@ -35,5 +34,5 @@ public:
         y = y_;
     }
 };
+
 }
-#endif

rtengine/dcraw.h

@@ -17,8 +17,7 @@
  *  along with RawTherapee.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-#ifndef DCRAW_H
+#pragma once
-#define DCRAW_H
 
 #include "myfile.h"
 #include <csetjmp>
@@ -529,6 +528,3 @@ void shiftXtransMatrix( const int offsy, const int offsx) {
 void nikon_14bit_load_raw(); // ported from LibRaw
 
 };
-
-
-#endif //DCRAW_H

rtengine/dynamicprofile.h

@@ -16,8 +16,7 @@
  *  You should have received a copy of the GNU General Public License
  *  along with RawTherapee.  If not, see <https://www.gnu.org/licenses/>.
  */
-#ifndef _DYNAMICPROFILE_H_
+#pragma once
-#define _DYNAMICPROFILE_H_
 
 #include <glibmm/ustring.h>
 #include <vector>
@@ -76,5 +75,3 @@ public:
     const std::vector<DynamicProfileRule> &getRules();
     void setRules (const std::vector<DynamicProfileRule> &r);
 };
-
-#endif // _DYNAMICPROFILE_H_

rtengine/gauss.h

@@ -16,11 +16,8 @@
  *  You should have received a copy of the GNU General Public License
  *  along with RawTherapee.  If not, see <https://www.gnu.org/licenses/>.
  */
-#ifndef _GAUSS_H_
+#pragma once
-#define _GAUSS_H_
 
 enum eGaussType {GAUSS_STANDARD, GAUSS_MULT, GAUSS_DIV};
 
 void gaussianBlur(float** src, float** dst, const int W, const int H, const double sigma, bool useBoxBlur = false, eGaussType gausstype = GAUSS_STANDARD, float** buffer2 = nullptr);
-
-#endif

rtengine/iccmatrices.h

@@ -16,8 +16,7 @@
  *  You should have received a copy of the GNU General Public License
  *  along with RawTherapee.  If not, see <https://www.gnu.org/licenses/>.
  */
-#ifndef _ICCMATRICES_
+#pragma once
-#define _ICCMATRICES_
 
 // Bradford transform between illuminants
 constexpr double d65_d50[3][3] =  {
@@ -296,4 +295,3 @@ constexpr double d50_best[3][3] = {
     {-0.253000840399762,  0.0215532098817316,1.22569552576991}
 };
  */
-#endif

rtengine/iimage.h

@@ -16,17 +16,19 @@
  *  You should have received a copy of the GNU General Public License
  *  along with RawTherapee.  If not, see <https://www.gnu.org/licenses/>.
  */
-#ifndef _IIMAGE_
+#pragma once
-#define _IIMAGE_
+
+#include <vector>
 
 #include <glibmm/ustring.h>
-#include <vector>
+
-#include "rt_math.h"
 #include "alignedbuffer.h"
+#include "color.h"
+#include "coord2d.h"
 #include "imagedimensions.h"
 #include "LUT.h"
-#include "coord2d.h"
+#include "rt_math.h"
-#include "color.h"
+
 #include "../rtgui/threadutils.h"
 
 #define TR_NONE     0
@@ -1808,5 +1810,3 @@ public:
 };
 
 }
-
-#endif

rtengine/imagedata.h

@@ -16,17 +16,21 @@
  *  You should have received a copy of the GNU General Public License
  *  along with RawTherapee.  If not, see <https://www.gnu.org/licenses/>.
  */
-#ifndef __IMAGEDATA_H__
+#pragma once
-#define __IMAGEDATA_H__
 
 #include <cstdio>
 #include <memory>
 #include <string>
+#include <vector>
+
 #include <glibmm/ustring.h>
-#include "imageio.h"
+
-#include "../rtexif/rtexif.h"
 #include <libiptcdata/iptc-data.h>
 
+#include "imageio.h"
+
+#include "../rtexif/rtexif.h"
+
 namespace rtengine
 {
 
@@ -132,4 +136,3 @@ public:
 
 
 }
-#endif

rtengine/imageformat.h

@@ -16,8 +16,7 @@
  *  You should have received a copy of the GNU General Public License
  *  along with RawTherapee.  If not, see <https://www.gnu.org/licenses/>.
  */
-#ifndef _IMAGEFORMAT_
+#pragma once
-#define _IMAGEFORMAT_
 
 namespace rtengine
 {
@@ -51,5 +50,3 @@ typedef enum SensorType {
 } eSensorType;
 
 }
-
-#endif

rtengine/imageio.h

@@ -16,27 +16,31 @@
  *  You should have received a copy of the GNU General Public License
  *  along with RawTherapee.  If not, see <https://www.gnu.org/licenses/>.
  */
-#ifndef _IMAGEIO_
+#pragma once
-#define _IMAGEIO_
-
-#define IMIO_SUCCESS               0
-#define IMIO_CANNOTREADFILE        1
-#define IMIO_INVALIDHEADER         2
-#define IMIO_HEADERERROR           3
-#define IMIO_READERROR             4
-#define IMIO_VARIANTNOTSUPPORTED   5
-#define IMIO_FILETYPENOTSUPPORTED  6
-#define IMIO_CANNOTWRITEFILE       7
 
 #include <memory>
 
 #include <glibmm/ustring.h>
+
 #include <libiptcdata/iptc-data.h>
-#include "rtengine.h"
+
-#include "imageformat.h"
-#include "../rtexif/rtexif.h"
-#include "imagedimensions.h"
 #include "iimage.h"
+#include "imagedimensions.h"
+#include "imageformat.h"
+#include "rtengine.h"
+
+#include "../rtexif/rtexif.h"
+
+enum {
+    IMIO_SUCCESS,
+    IMIO_CANNOTREADFILE,
+    IMIO_INVALIDHEADER,
+    IMIO_HEADERERROR,
+    IMIO_READERROR,
+    IMIO_VARIANTNOTSUPPORTED,
+    IMIO_FILETYPENOTSUPPORTED,
+    IMIO_CANNOTWRITEFILE
+};
 
 namespace rtengine
 {
@@ -111,4 +115,3 @@ public:
 };
 
 }
-#endif

rtengine/improccoordinator.h

@@ -16,8 +16,7 @@
  *  You should have received a copy of the GNU General Public License
  *  along with RawTherapee.  If not, see <https://www.gnu.org/licenses/>.
  */
-#ifndef _IMPROCCOORDINATOR_H_
+#pragma once
-#define _IMPROCCOORDINATOR_H_
 
 #include <memory>
 
@@ -410,5 +409,5 @@ public:
     } denoiseInfoStore;
 
 };
+
 }
-#endif

rtengine/improcfun.h

@@ -16,16 +16,15 @@
  *  You should have received a copy of the GNU General Public License
  *  along with RawTherapee.  If not, see <https://www.gnu.org/licenses/>.
  */
-#ifndef _IMPROCFUN_H_
+#pragma once
-#define _IMPROCFUN_H_
 
-#include "shmap.h"
-#include "coord2d.h"
 #include "color.h"
-#include "LUT.h"
+#include "coord2d.h"
-#include "lcp.h"
-#include "pipettebuffer.h"
 #include "gamutwarning.h"
+#include "lcp.h"
+#include "LUT.h"
+#include "pipettebuffer.h"
+#include "shmap.h"
 
 template<typename T, const size_t num>
 class multi_array2D;
@@ -272,5 +271,5 @@ public:
     void rgb2lab(const Imagefloat &src, LabImage &dst, const Glib::ustring &workingSpace);
     void lab2rgb(const LabImage &src, Imagefloat &dst, const Glib::ustring &workingSpace);
 };
+
 }
-#endif

rtengine/iptcpairs.h

@@ -16,9 +16,7 @@
  *  You should have received a copy of the GNU General Public License
  *  along with RawTherapee.  If not, see <https://www.gnu.org/licenses/>.
  */
-#ifndef _IPTCPAIRS_
+#pragma once
-#define _IPTCPAIRS_
-
 
 struct IptcPair {
     IptcTag tag;
@@ -44,6 +42,3 @@ const IptcPair strTags[] = {
     {IPTC_TAG_ORIG_TRANS_REF, 32, "TransReference"},
     {IPTC_TAG_DATE_CREATED, 8, "DateCreated"}
 };
-
-#endif
-

rtengine/jpeg.h

@@ -1,5 +1,4 @@
-#ifndef _RT_JPEG_H
+#pragma once
-#define _RT_JPEG_H
 
 #include <csetjmp>
 
@@ -29,6 +28,3 @@ typedef struct {
 #ifdef __cplusplus
 }
 #endif
-
-
-#endif

rtengine/myfile.h

@@ -16,13 +16,15 @@
  *  You should have received a copy of the GNU General Public License
  *  along with RawTherapee.  If not, see <https://www.gnu.org/licenses/>.
  */
-#ifndef _MYFILE_
+#pragma once
-#define _MYFILE_
 
-#include <glib/gstdio.h>
 #include <cstdio>
 #include <cstring>
+
+#include <glib/gstdio.h>
+
 #include "rtengine.h"
+
 struct IMFILE {
     int fd;
     ssize_t pos;
@@ -134,6 +136,3 @@ inline unsigned char* fdata(int offset, IMFILE* f)
 
 int fscanf (IMFILE* f, const char* s ...);
 char* fgets (char* s, int n, IMFILE* f);
-
-#endif
-

rtengine/previewimage.h

@@ -16,10 +16,10 @@
  *  You should have received a copy of the GNU General Public License
  *  along with RawTherapee.  If not, see <https://www.gnu.org/licenses/>.
  */
-#ifndef _PREVIEWIMAGE_
+#pragma once
-#define _PREVIEWIMAGE_
 
 #include <glibmm/ustring.h>
+
 #include <cairomm/cairomm.h>
 
 namespace rtengine
@@ -52,5 +52,3 @@ public:
 };
 
 }
-
-#endif

rtengine/processingjob.h

@@ -16,11 +16,10 @@
  *  You should have received a copy of the GNU General Public License
  *  along with RawTherapee.  If not, see <https://www.gnu.org/licenses/>.
  */
-#ifndef _PROCESSINGJOB_
+#pragma once
-#define _PROCESSINGJOB_
 
-#include "rtengine.h"
 #include "procparams.h"
+#include "rtengine.h"
 
 namespace rtengine
 {
@@ -55,5 +54,3 @@ public:
 };
 
 }
-
-#endif

rtengine/procevents.h

@@ -16,15 +16,11 @@
  *  You should have received a copy of the GNU General Public License
  *  along with RawTherapee.  If not, see <https://www.gnu.org/licenses/>.
  */
-#ifndef __PROCEVENT__
+#pragma once
-#define __PROCEVENT__
 
 namespace rtengine
 {
 
-
-
-
 // Aligned so the first entry starts on line 30
 enum ProcEventCode {
     EvPhotoLoaded = 0,
@@ -540,13 +536,11 @@ private:
 };
 
 
-inline bool operator==(ProcEvent a, ProcEvent b) { return int(a) == int(b); }
+inline bool operator ==(ProcEvent a, ProcEvent b) { return int(a) == int(b); }
-inline bool operator==(ProcEvent a, ProcEventCode b) { return int(a) == int(b); }
+inline bool operator ==(ProcEvent a, ProcEventCode b) { return int(a) == int(b); }
-inline bool operator==(ProcEventCode a, ProcEvent b) { return int(a) == int(b); }
+inline bool operator ==(ProcEventCode a, ProcEvent b) { return int(a) == int(b); }
-inline bool operator!=(ProcEvent a, ProcEvent b) { return int(a) != int(b); }
+inline bool operator !=(ProcEvent a, ProcEvent b) { return int(a) != int(b); }
-inline bool operator!=(ProcEvent a, ProcEventCode b) { return int(a) != int(b); }
+inline bool operator !=(ProcEvent a, ProcEventCode b) { return int(a) != int(b); }
-inline bool operator!=(ProcEventCode a, ProcEvent b) { return int(a) != int(b); }
+inline bool operator !=(ProcEventCode a, ProcEvent b) { return int(a) != int(b); }
 
 }
-#endif
-

rtengine/profilestore.h

@@ -16,16 +16,16 @@
  *  You should have received a copy of the GNU General Public License
  *  along with RawTherapee.  If not, see <https://www.gnu.org/licenses/>.
  */
-#ifndef _PROFILESTORE_
+#pragma once
-#define _PROFILESTORE_
 
 #include <map>
 #include <vector>
+
 #include <glibmm/ustring.h>
 
-#include "rtengine.h"
-#include "noncopyable.h"
 #include "dynamicprofile.h"
+#include "noncopyable.h"
+#include "rtengine.h"
 
 // forward decl
 namespace rtengine
@@ -211,5 +211,3 @@ public:
 
     void dumpFolderList();
 };
-
-#endif

rtengine/rawimagesource_i.h

@@ -16,9 +16,7 @@
  *  You should have received a copy of the GNU General Public License
  *  along with RawTherapee.  If not, see <https://www.gnu.org/licenses/>.
  */
-
+#pragma once
-#ifndef RAWIMAGESOURCE_I_H_INCLUDED
-#define RAWIMAGESOURCE_I_H_INCLUDED
 
 #include "rawimagesource.h"
 
@@ -184,5 +182,3 @@ inline void RawImageSource::interpolate_row_rb_mul_pp (const array2D<float> &raw
 }
 
 }
-
-#endif

rtengine/rawmetadatalocation.h

@@ -16,8 +16,7 @@
  *  You should have received a copy of the GNU General Public License
  *  along with RawTherapee.  If not, see <https://www.gnu.org/licenses/>.
  */
-#ifndef _RAWMETADATALOCATION_
+#pragma once
-#define _RAWMETADATALOCATION_
 
 namespace rtengine
 {
@@ -36,6 +35,3 @@ public:
 };
 
 }
-
-#endif
-

rtengine/rtthumbnail.h

@@ -16,15 +16,17 @@
  *  You should have received a copy of the GNU General Public License
  *  along with RawTherapee.  If not, see <https://www.gnu.org/licenses/>.
  */
-#ifndef _THUMBPROCESSINGPARAMETERS_
+#pragma once
-#define _THUMBPROCESSINGPARAMETERS_
 
-#include "rawmetadatalocation.h"
 #include <glibmm/ustring.h>
+
 #include <lcms2.h>
-#include "image8.h"
+
 #include "image16.h"
+#include "image8.h"
 #include "imagefloat.h"
+#include "rawmetadatalocation.h"
+
 #include "../rtgui/threadutils.h"
 
 namespace rtengine
@@ -160,6 +162,3 @@ public:
     }
 };
 }
-
-#endif
-

rtengine/shmap.h

@@ -16,14 +16,14 @@
  *  You should have received a copy of the GNU General Public License
  *  along with RawTherapee.  If not, see <https://www.gnu.org/licenses/>.
  */
-#ifndef __SHMAP__
+#pragma once
-#define __SHMAP__
 
 #include "LUT.h"
 #include "noncopyable.h"
 
 namespace rtengine
 {
+
 class Imagefloat;
 
 class SHMap :
@@ -49,5 +49,5 @@ private:
     void dirpyr_shmap(float ** data_fine, float ** data_coarse, int width, int height, LUTf & rangefn, int level, int scale);
 
 };
+
 }
-#endif

rtengine/simpleprocess.h

@@ -4,24 +4,11 @@
  *
  * Created on September 18, 2010, 8:31 PM
  */
+#pragma once
 
-#ifndef SIMPLEPROCESS_H
-#define SIMPLEPROCESS_H
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-
-
-
-#ifdef  __cplusplus
-}
-#endif
 namespace rtengine
 {
 
 extern Glib::Thread *batchThread;
-}
-#endif  /* SIMPLEPROCESS_H */
 
+}

rtengine/stdimagesource.h

@@ -16,8 +16,7 @@
  *  You should have received a copy of the GNU General Public License
  *  along with RawTherapee.  If not, see <https://www.gnu.org/licenses/>.
  */
-#ifndef _STDIMAGESOURCE_
+#pragma once
-#define _STDIMAGESOURCE_
 
 #include "colortemp.h"
 #include "imagesource.h"
@@ -118,5 +117,5 @@ public:
     void        flushRGB          () override;
     void captureSharpening(const procparams::CaptureSharpeningParams &sharpeningParams, bool showMask, double &conrastThreshold, double &radius) override {};
 };
+
 }
-#endif

rtexif/rtexif.h

@@ -16,8 +16,7 @@
  *  You should have received a copy of the GNU General Public License
  *  along with RawTherapee.  If not, see <https://www.gnu.org/licenses/>.
  */
-#ifndef _MEXIF3_
+#pragma once
-#define _MEXIF3_
 
 #include <cmath>
 #include <cstdint>
@@ -687,5 +686,5 @@ extern const TagAttrib kodakIfdAttribs[];
 void parseKodakIfdTextualInfo (Tag *textualInfo, Tag* exif);
 extern const TagAttrib panasonicAttribs[];
 extern const TagAttrib panasonicRawAttribs[];
+
 }
-#endif

rtgui/addsetids.h

@@ -1,6 +1,4 @@
-#ifndef _ADDSETIDS_
+#pragma once
-#define _ADDSETIDS_
-
 
 //          UPDATE THE DEFAULT VALUE IN OPTIONS.CC  int babehav[] TOO !!!
 
@@ -146,5 +144,3 @@ enum {
 
     ADDSET_PARAM_NUM // THIS IS USED AS A DELIMITER!!
 };
-
-#endif

rtgui/adjuster.h

@@ -16,10 +16,10 @@
  *  You should have received a copy of the GNU General Public License
  *  along with RawTherapee.  If not, see <https://www.gnu.org/licenses/>.
  */
-#ifndef _ADJUSTER_H_
+#pragma once
-#define _ADJUSTER_H_
 
 #include <gtkmm.h>
+
 #include "editedstate.h"
 #include "guiutils.h"
 
@@ -130,5 +130,3 @@ public:
     void trimValue (int &val) const;
     void setLogScale(double base, double pivot, bool anchorMiddle = false);
 };
-
-#endif

rtgui/batchqueue.h

@@ -15,19 +15,18 @@
  *  You should have received a copy of the GNU General Public License
  *  along with RawTherapee.  If not, see <https://www.gnu.org/licenses/>.
  */
-#ifndef _BATCHQUEUE_
+#pragma once
-#define _BATCHQUEUE_
 
 #include <set>
 
 #include <gtkmm.h>
 
-#include "../rtengine/rtengine.h"
-
 #include "batchqueueentry.h"
 #include "lwbuttonset.h"
 #include "threadutils.h"
 #include "thumbbrowserbase.h"
+
+#include "../rtengine/rtengine.h"
 #include "../rtengine/noncopyable.h"
 
 class BatchQueueListener
@@ -123,5 +122,3 @@ private:
 
     IdleRegister idle_register;
 };
-
-#endif

rtgui/batchqueuebuttonset.h

@@ -16,12 +16,12 @@
  *  You should have received a copy of the GNU General Public License
  *  along with RawTherapee.  If not, see <https://www.gnu.org/licenses/>.
  */
-#ifndef _BATCHQUEUEBUTTONSET_
+#pragma once
-#define _BATCHQUEUEBUTTONSET_
+
+#include <gtkmm.h>
 
 #include "lwbuttonset.h"
 #include "rtsurface.h"
-#include <gtkmm.h>
 
 class BatchQueueEntry;
 class BatchQueueButtonSet : public LWButtonSet
@@ -40,5 +40,3 @@ public:
 
     explicit BatchQueueButtonSet (BatchQueueEntry* myEntry);
 };
-
-#endif

rtgui/batchqueueentry.h

@@ -16,17 +16,18 @@
  *  You should have received a copy of the GNU General Public License
  *  along with RawTherapee.  If not, see <https://www.gnu.org/licenses/>.
  */
-#ifndef _BATCHQUEUEENTRY_
+#pragma once
-#define _BATCHQUEUEENTRY_
 
 #include <memory>
 
 #include <gtkmm.h>
-#include "../rtengine/rtengine.h"
+
+#include "bqentryupdater.h"
 #include "thumbbrowserentrybase.h"
 #include "thumbnail.h"
-#include "bqentryupdater.h"
+
 #include "../rtengine/noncopyable.h"
+#include "../rtengine/rtengine.h"
 
 class BatchQueueEntry;
 struct BatchQueueEntryIdleHelper {
@@ -77,7 +78,3 @@ public:
     void updateImage (guint8* img, int w, int h, int origw, int origh, guint8* newOPreview) override;
     void _updateImage (guint8* img, int w, int h); // inside gtk thread
 };
-
-
-
-#endif

rtgui/batchqueuepanel.h

@@ -16,15 +16,15 @@
  *  You should have received a copy of the GNU General Public License
  *  along with RawTherapee.  If not, see <https://www.gnu.org/licenses/>.
  */
-#ifndef _BATCHQUEUEPANEL_
+#pragma once
-#define _BATCHQUEUEPANEL_
 
 #include <atomic>
 
 #include <gtkmm.h>
+
 #include "batchqueue.h"
-#include "saveformatpanel.h"
 #include "guiutils.h"
+#include "saveformatpanel.h"
 
 class RTWindow;
 class FileCatalog;
@@ -83,5 +83,3 @@ private:
     void formatChanged(const Glib::ustring& format) override;
     void updateTab (int qsize, int forceOrientation = 0); // forceOrientation=0: base on options / 1: horizontal / 2: vertical
 };
-#endif
-

rtgui/batchtoolpanelcoord.h

@@ -16,16 +16,16 @@
  *  You should have received a copy of the GNU General Public License
  *  along with RawTherapee.  If not, see <https://www.gnu.org/licenses/>.
  */
-#ifndef __BATCHTOOLPANELCCORD__
+#pragma once
-#define __BATCHTOOLPANELCCORD__
 
-#include "thumbnail.h"
-#include "toolpanelcoord.h"
 #include "fileselectionchangelistener.h"
-#include "../rtengine/procparams.h"
-#include "../rtengine/procevents.h"
 #include "paramsedited.h"
+#include "thumbnail.h"
 #include "thumbnaillistener.h"
+#include "toolpanelcoord.h"
+
+#include "../rtengine/procevents.h"
+#include "../rtengine/procparams.h"
 
 class FilePanel;
 class BatchToolPanelCoordinator :
@@ -85,5 +85,3 @@ public:
 
     void optionsChanged ();
 };
-
-#endif

rtgui/bayerpreprocess.h

@@ -16,10 +16,10 @@
  *  You should have received a copy of the GNU General Public License
  *  along with RawTherapee.  If not, see <https://www.gnu.org/licenses/>.
  */
-#ifndef _BAYERPREPROCESS_H_
+#pragma once
-#define _BAYERPREPROCESS_H_
 
 #include <gtkmm.h>
+
 #include "adjuster.h"
 #include "toolpanel.h"
 
@@ -53,5 +53,3 @@ public:
     void lineDenoiseDirectionChanged();
     void pdafLinesFilterChanged();
 };
-
-#endif

rtgui/bayerprocess.h

@@ -16,16 +16,22 @@
  *  You should have received a copy of the GNU General Public License
  *  along with RawTherapee.  If not, see <https://www.gnu.org/licenses/>.
  */
-#ifndef _BAYERPROCESS_H_
+#pragma once
-#define _BAYERPROCESS_H_
 
 #include <gtkmm.h>
+
 #include "adjuster.h"
 #include "checkbox.h"
 #include "guiutils.h"
 #include "toolpanel.h"
 
-class BayerProcess : public ToolParamBlock, public AdjusterListener, public CheckBoxListener, public FoldableToolPanel, public rtengine::FrameCountListener, public rtengine::AutoContrastListener
+class BayerProcess :
+    public ToolParamBlock,
+    public AdjusterListener,
+    public CheckBoxListener,
+    public FoldableToolPanel,
+    public rtengine::FrameCountListener,
+    public rtengine::AutoContrastListener
 {
 
 protected:
@@ -89,5 +95,3 @@ public:
     void autoContrastChanged (double autoContrast) override;
     void FrameCountChanged(int n, int frameNum) override;
 };
-
-#endif

rtgui/bayerrawexposure.h

@@ -16,26 +16,21 @@
  *  You should have received a copy of the GNU General Public License
  *  along with RawTherapee.  If not, see <https://www.gnu.org/licenses/>.
  */
-#ifndef _BAYERRAWEXPOSURE_H_
+#pragma once
-#define _BAYERRAWEXPOSURE_H_
 
 #include <gtkmm.h>
+
 #include "adjuster.h"
 #include "checkbox.h"
 #include "toolpanel.h"
 
-class BayerRAWExposure : public ToolParamBlock, public AdjusterListener, public CheckBoxListener, public FoldableToolPanel
+class BayerRAWExposure :
+    public ToolParamBlock,
+    public AdjusterListener,
+    public CheckBoxListener,
+    public FoldableToolPanel
 {
-
-protected:
-    Adjuster* PexBlack0;
-    Adjuster* PexBlack1;
-    Adjuster* PexBlack2;
-    Adjuster* PexBlack3;
-    CheckBox* PextwoGreen;
-
 public:
-
     BayerRAWExposure ();
 
     void read           (const rtengine::procparams::ProcParams* pp, const ParamsEdited* pedited = nullptr) override;
@@ -46,6 +41,11 @@ public:
     void checkBoxToggled     (CheckBox* c, CheckValue newval) override;
     void setAdjusterBehavior (bool pexblackadd);
     void trimValues          (rtengine::procparams::ProcParams* pp) override;
-};
 
-#endif
+protected:
+    Adjuster* PexBlack0;
+    Adjuster* PexBlack1;
+    Adjuster* PexBlack2;
+    Adjuster* PexBlack3;
+    CheckBox* PextwoGreen;
+};

rtgui/blackwhite.h

@@ -16,17 +16,17 @@
  *  You should have received a copy of the GNU General Public License
  *  along with RawTherapee.  If not, see <https://www.gnu.org/licenses/>.
  */
-#ifndef _BLACKWHITE_H_
+#pragma once
-#define _BLACKWHITE_H_
 
 #include <gtkmm.h>
+
 #include "adjuster.h"
-#include "toolpanel.h"
+#include "colorprovider.h"
-#include "guiutils.h"
 #include "curveeditor.h"
 #include "curveeditorgroup.h"
+#include "guiutils.h"
 #include "mycurve.h"
-#include "colorprovider.h"
+#include "toolpanel.h"
 
 class EditDataProvider;
 
@@ -144,5 +144,3 @@ private:
 
     IdleRegister idle_register;
 };
-
-#endif

rtgui/bqentryupdater.h

@@ -16,15 +16,15 @@
  *  You should have received a copy of the GNU General Public License
  *  along with RawTherapee.  If not, see <https://www.gnu.org/licenses/>.
  */
-#ifndef _BQENTRYUPDATER_
+#pragma once
-#define _BQENTRYUPDATER_
 
 #include <glibmm/thread.h>
 
-#include "../rtengine/rtengine.h"
 #include "threadutils.h"
 #include "thumbnail.h"
 
+#include "../rtengine/rtengine.h"
+
 class BQEntryUpdateListener
 {
 
@@ -62,5 +62,3 @@ public:
 };
 
 extern BatchQueueEntryUpdater batchQueueEntryUpdater;
-
-#endif

rtgui/browserfilter.h

@@ -16,8 +16,7 @@
  *  You should have received a copy of the GNU General Public License
  *  along with RawTherapee.  If not, see <https://www.gnu.org/licenses/>.
  */
-#ifndef _BROWSERFILTER_
+#pragma once
-#define _BROWSERFILTER_
 
 #include <vector>
 
@@ -25,7 +24,6 @@
 
 class BrowserFilter
 {
-
 public:
     bool showRanked[6];
     bool showCLabeled[6];
@@ -42,5 +40,3 @@ public:
 
     BrowserFilter ();
 };
-
-#endif

rtgui/cacheimagedata.h

@@ -16,17 +16,18 @@
  *  You should have received a copy of the GNU General Public License
  *  along with RawTherapee.  If not, see <https://www.gnu.org/licenses/>.
  */
-#ifndef _CACHEIMAGEDATA_
+#pragma once
-#define _CACHEIMAGEDATA_
 
 #include <glibmm/ustring.h>
+
 #include "options.h"
-#include "../rtengine/rtengine.h"
+
 #include "../rtengine/imageformat.h"
+#include "../rtengine/rtengine.h"
 
-class CacheImageData: public rtengine::FramesMetaData
+class CacheImageData :
+    public rtengine::FramesMetaData
 {
-
 public:
 
     // basic information
@@ -115,4 +116,3 @@ public:
     std::string getImageType (unsigned int frame) const override { return isPixelShift ? "PS" : isHDR ? "HDR" : "STD"; }
     rtengine::IIOSampleFormat getSampleFormat (unsigned int frame = 0) const override { return sampleFormat; }
 };
-#endif

rtgui/cachemanager.h

@@ -16,18 +16,17 @@
  *  You should have received a copy of the GNU General Public License
  *  along with RawTherapee.  If not, see <https://www.gnu.org/licenses/>.
  */
-#ifndef _CACHEMANAGER_
+#pragma once
-#define _CACHEMANAGER_
 
-#include <string>
 #include <map>
+#include <string>
 
 #include <glibmm/ustring.h>
 
-#include "../rtengine/noncopyable.h"
-
 #include "threadutils.h"
 
+#include "../rtengine/noncopyable.h"
+
 class Thumbnail;
 
 class CacheManager :
@@ -70,6 +69,3 @@ public:
 };
 
 #define cacheMgr CacheManager::getInstance()
-
-#endif
-

rtgui/cacorrection.h

@@ -16,14 +16,17 @@
  *  You should have received a copy of the GNU General Public License
  *  along with RawTherapee.  If not, see <https://www.gnu.org/licenses/>.
  */
-#ifndef _CACORRECTION_H_
+#pragma once
-#define _CACORRECTION_H_
 
 #include <gtkmm.h>
+
 #include "adjuster.h"
 #include "toolpanel.h"
 
-class CACorrection : public ToolParamBlock, public AdjusterListener, public FoldableToolPanel
+class CACorrection :
+    public ToolParamBlock,
+    public AdjusterListener,
+    public FoldableToolPanel
 {
 
 protected:
@@ -43,5 +46,3 @@ public:
     void setAdjusterBehavior (bool badd);
     void trimValues          (rtengine::procparams::ProcParams* pp) override;
 };
-
-#endif

rtgui/checkbox.h

@@ -16,10 +16,10 @@
  *  You should have received a copy of the GNU General Public License
  *  along with RawTherapee.  If not, see <https://www.gnu.org/licenses/>.
  */
-#ifndef _CHECKBOX_H_
+#pragma once
-#define _CHECKBOX_H_
 
 #include <gtkmm.h>
+
 #include "editedstate.h"
 #include "guiutils.h"
 
@@ -72,5 +72,3 @@ public:
     void set_tooltip_markup (const Glib::ustring& tooltip);
     */
 };
-
-#endif

rtgui/chmixer.h

@@ -16,14 +16,17 @@
  *  You should have received a copy of the GNU General Public License
  *  along with RawTherapee.  If not, see <https://www.gnu.org/licenses/>.
  */
-#ifndef _CHMIXER_H_
+#pragma once
-#define _CHMIXER_H_
 
 #include <gtkmm.h>
+
 #include "adjuster.h"
 #include "toolpanel.h"
 
-class ChMixer : public ToolParamBlock, public AdjusterListener, public FoldableToolPanel
+class ChMixer :
+    public ToolParamBlock,
+    public AdjusterListener,
+    public FoldableToolPanel
 {
 
 protected:
@@ -46,5 +49,3 @@ public:
     void trimValues          (rtengine::procparams::ProcParams* pp) override;
     void enabledChanged() override;
 };
-
-#endif

rtgui/clipboard.h

@@ -16,8 +16,7 @@
  *  You should have received a copy of the GNU General Public License
  *  along with RawTherapee.  If not, see <https://www.gnu.org/licenses/>.
  */
-#ifndef _CLIPBOARD_
+#pragma once
-#define _CLIPBOARD_
 
 #include <memory>
 #include <vector>
@@ -80,5 +79,3 @@ private:
 };
 
 extern Clipboard clipboard;
-
-#endif

rtgui/coarsepanel.h

@@ -16,13 +16,15 @@
  *  You should have received a copy of the GNU General Public License
  *  along with RawTherapee.  If not, see <https://www.gnu.org/licenses/>.
  */
-#ifndef __COARSEPANEL__
+#pragma once
-#define __COARSEPANEL__
 
 #include <gtkmm.h>
+
 #include "toolpanel.h"
 
-class CoarsePanel : public Gtk::HBox, public ToolPanel
+class CoarsePanel :
+    public Gtk::HBox,
+    public ToolPanel
 {
 
 protected:
@@ -46,5 +48,3 @@ public:
     void flipHorizontal ();
     void flipVertical   ();
 };
-
-#endif

rtgui/colorappearance.h

@@ -16,17 +16,17 @@
  *  You should have received a copy of the GNU General Public License
  *  along with RawTherapee.  If not, see <https://www.gnu.org/licenses/>.
  */
-#ifndef _COLORAPPEARANCE_H_
+#pragma once
-#define _COLORAPPEARANCE_H_
 
 #include <gtkmm.h>
+
 #include "adjuster.h"
-#include "toolpanel.h"
+#include "colorprovider.h"
 #include "curveeditor.h"
 #include "curveeditorgroup.h"
-#include "mycurve.h"
 #include "guiutils.h"
-#include "colorprovider.h"
+#include "mycurve.h"
+#include "toolpanel.h"
 
 class ColorAppearance final :
     public ToolParamBlock,
@@ -173,5 +173,3 @@ private:
 
     IdleRegister idle_register;
 };
-
-#endif

rtgui/coloredbar.h

@@ -16,8 +16,7 @@
  *  You should have received a copy of the GNU General Public License
  *  along with RawTherapee.  If not, see <https://www.gnu.org/licenses/>.
  */
-#ifndef _COLOREDBAR_
+#pragma once
-#define _COLOREDBAR_
 
 #include "colorprovider.h"
 #include "guiutils.h"
@@ -62,5 +61,3 @@ public:
         BackBuffer::setDirty(isDirty);
     }
 };
-
-#endif

rtgui/colorprovider.h

@@ -16,8 +16,7 @@
  *  You should have received a copy of the GNU General Public License
  *  along with RawTherapee.  If not, see <https://www.gnu.org/licenses/>.
  */
-#ifndef _COLORPROVIDER_
+#pragma once
-#define _COLORPROVIDER_
 
 #include <gtkmm.h>
 
@@ -61,10 +60,7 @@ public:
  */
 class ColorProvider
 {
-
 public:
-    virtual ~ColorProvider() {};
+    virtual ~ColorProvider() = default;
     virtual void colorForValue (double valX, double valY, enum ColorCaller::ElemType elemType, int callerId, ColorCaller* caller) {};
 };
-
-#endif

rtgui/colortoning.h

@@ -1,18 +1,19 @@
 /*
  *  This file is part of RawTherapee.
  */
-#ifndef _COLORTONING_H_
+#pragma once
-#define _COLORTONING_H_
 
 #include <gtkmm.h>
+
 #include "adjuster.h"
-#include "toolpanel.h"
+#include "colorprovider.h"
-#include "guiutils.h"
 #include "curveeditor.h"
 #include "curveeditorgroup.h"
-#include "thresholdadjuster.h"
+#include "guiutils.h"
-#include "colorprovider.h"
 #include "labgrid.h"
+#include "thresholdadjuster.h"
+#include "toolpanel.h"
+
 #include "../rtengine/procparams.h"
 
 class ColorToning final :
@@ -166,5 +167,3 @@ private:
 
     IdleRegister idle_register;
 };
-
-#endif

rtgui/coordinateadjuster.h

@@ -16,8 +16,7 @@
  *  You should have received a copy of the GNU General Public License
  *  along with RawTherapee.  If not, see <https://www.gnu.org/licenses/>.
  */
-#ifndef _COORDINATEADJUSTER_
+#pragma once
-#define _COORDINATEADJUSTER_
 
 #include <gtkmm.h>
 
@@ -160,6 +159,3 @@ public:
     void stopNumericalAdjustment();
 
 };
-
-
-#endif

rtgui/crop.h

@@ -16,14 +16,15 @@
  *  You should have received a copy of the GNU General Public License
  *  along with RawTherapee.  If not, see <https://www.gnu.org/licenses/>.
  */
-#ifndef _CROP_H_
+#pragma once
-#define _CROP_H_
+
+#include <vector>
 
 #include <gtkmm.h>
+
 #include "cropguilistener.h"
-#include "toolpanel.h"
 #include "guiutils.h"
-#include <vector>
+#include "toolpanel.h"
 
 class CropPanelListener
 {
@@ -129,5 +130,3 @@ private:
 
     IdleRegister idle_register;
 };
-
-#endif

rtgui/cropguilistener.h

@@ -16,8 +16,7 @@
  *  You should have received a copy of the GNU General Public License
  *  along with RawTherapee.  If not, see <https://www.gnu.org/licenses/>.
  */
-#ifndef __CROPGUILISTENER__
+#pragma once
-#define __CROPGUILISTENER__
 
 class CropGUIListener
 {
@@ -39,5 +38,3 @@ public:
     virtual bool inImageArea(int x, int y) = 0;
     virtual double getRatio() const = 0;
 };
-
-#endif

rtgui/crophandler.h

@@ -16,21 +16,20 @@
  *  You should have received a copy of the GNU General Public License
  *  along with RawTherapee.  If not, see <https://www.gnu.org/licenses/>.
  */
-#ifndef __CROPHANDLER__
+#pragma once
-#define __CROPHANDLER__
 
 #include <atomic>
-#include <vector>
 #include <memory>
+#include <vector>
 
 #include <gtkmm.h>
 
-#include "../rtengine/rtengine.h"
 #include "editbuffer.h"
-
 #include "lockablecolorpicker.h"
 #include "threadutils.h"
 
+#include "../rtengine/rtengine.h"
+
 class EditSubscriber;
 
 class CropDisplayHandler
@@ -139,5 +138,3 @@ private:
 
     IdleRegister idle_register;
 };
-
-#endif

rtgui/cursormanager.h

@@ -16,8 +16,7 @@
  *  You should have received a copy of the GNU General Public License
  *  along with RawTherapee.  If not, see <https://www.gnu.org/licenses/>.
  */
-#ifndef _CURSORMANAGER_
+#pragma once
-#define _CURSORMANAGER_
 
 #include <gtkmm.h>
 
@@ -89,6 +88,3 @@ public:
 
 extern CursorManager mainWindowCursorManager;
 extern CursorManager editWindowCursorManager;
-
-#endif
-

rtgui/curveeditor.h

@@ -16,21 +16,20 @@
  *  You should have received a copy of the GNU General Public License
  *  along with RawTherapee.  If not, see <https://www.gnu.org/licenses/>.
  */
-#ifndef _CURVEEDITOR_
+#pragma once
-#define _CURVEEDITOR_
 
-#include "popuptogglebutton.h"
-#include "../rtengine/LUT.h"
 #include "coloredbar.h"
 #include "editcallbacks.h"
 #include "mydiagonalcurve.h"
 #include "myflatcurve.h"
+#include "popuptogglebutton.h"
+
+#include "../rtengine/LUT.h"
 #include "../rtengine/noncopyable.h"
 
 class CurveEditorGroup;
 class CurveEditorSubGroup;
 
-
 /*
  *********************** Curve Editor ***********************
  */
@@ -182,7 +181,6 @@ public:
 
 class FlatCurveEditor : public CurveEditor
 {
-
     friend class FlatCurveEditorSubGroup;
 
 protected:
@@ -207,5 +205,3 @@ public:
     // set the reset curve for a given curve type. This is optional; all curve type have a default reset curve
     void setResetCurve(FlatCurveType cType, const std::vector<double> &resetCurve);
 };
-
-#endif

rtgui/curveeditorgroup.h

@@ -16,18 +16,19 @@
  *  You should have received a copy of the GNU General Public License
  *  along with RawTherapee.  If not, see <https://www.gnu.org/licenses/>.
  */
-#ifndef _CURVEEDITORGROUP_
+#pragma once
-#define _CURVEEDITORGROUP_
 
-#include <gtkmm.h>
 #include <fstream>
 #include <string>
+
+#include <gtkmm.h>
+
+#include "adjuster.h"
 #include "guiutils.h"
 #include "mycurve.h"
-#include "myflatcurve.h"
 #include "mydiagonalcurve.h"
+#include "myflatcurve.h"
 #include "shcselector.h"
-#include "adjuster.h"
 
 class CurveEditor;
 class DiagonalCurveEditorSubGroup;
@@ -169,5 +170,3 @@ protected:
     virtual const std::vector<double> getCurveFromGUI (int type) = 0;
 
 };
-
-#endif

rtgui/curvelistener.h

@@ -16,8 +16,7 @@
  *  You should have received a copy of the GNU General Public License
  *  along with RawTherapee.  If not, see <https://www.gnu.org/licenses/>.
  */
-#ifndef _CURVELISTENER_
+#pragma once
-#define _CURVELISTENER_
 
 #include <vector>
 
@@ -86,5 +85,3 @@ public:
         return retVal;
     }
 };
-
-#endif

rtgui/darkframe.h

@@ -16,24 +16,29 @@
  *  You should have received a copy of the GNU General Public License
  *  along with RawTherapee.  If not, see <https://www.gnu.org/licenses/>.
  */
-#ifndef _DARKFRAME_H_
+#pragma once
-#define _DARKFRAME_H_
 
 #include <memory>
+
 #include <gtkmm.h>
-#include "toolpanel.h"
+
-#include "../rtengine/rawimage.h"
 #include "guiutils.h"
+#include "toolpanel.h"
+
+#include "../rtengine/rawimage.h"
 
 class DFProvider
 {
 public:
+    virtual ~DFProvider() = default;
     virtual rtengine::RawImage* getDF() = 0;
     virtual Glib::ustring GetCurrentImageFilePath() = 0;
     // add other info here
 };
 
-class DarkFrame : public ToolParamBlock, public FoldableToolPanel
+class DarkFrame :
+    public ToolParamBlock,
+    public FoldableToolPanel
 {
 
 protected:
@@ -66,5 +71,3 @@ public:
         dfp = p;
     };
 };
-
-#endif

rtgui/defringe.h

@@ -16,18 +16,23 @@
  *  You should have received a copy of the GNU General Public License
  *  along with RawTherapee.  If not, see <https://www.gnu.org/licenses/>.
  */
-#ifndef _DEFRINGE_H_
+#pragma once
-#define _DEFRINGE_H_
 
 #include <gtkmm.h>
+
 #include "adjuster.h"
-#include "toolpanel.h"
+#include "colorprovider.h"
-#include "guiutils.h"
 #include "curveeditor.h"
 #include "curveeditorgroup.h"
-#include "colorprovider.h"
+#include "guiutils.h"
+#include "toolpanel.h"
 
-class Defringe : public ToolParamBlock, public AdjusterListener, public FoldableToolPanel, public CurveListener, public ColorProvider
+class Defringe :
+    public ToolParamBlock,
+    public AdjusterListener,
+    public FoldableToolPanel,
+    public CurveListener,
+    public ColorProvider
 {
 
 protected:
@@ -54,5 +59,3 @@ public:
     void colorForValue (double valX, double valY, enum ColorCaller::ElemType elemType, int callerId, ColorCaller* caller) override;
 
 };
-
-#endif

rtgui/diagonalcurveeditorsubgroup.h

@@ -16,16 +16,21 @@
  *  You should have received a copy of the GNU General Public License
  *  along with RawTherapee.  If not, see <https://www.gnu.org/licenses/>.
  */
-#ifndef _DIAGONALCURVEEDITORSUBGROUP_
+#pragma once
-#define _DIAGONALCURVEEDITORSUBGROUP_
 
 #include <gtkmm.h>
+
 #include "curveeditorgroup.h"
+
 #include "../rtengine/noncopyable.h"
 
 class DiagonalCurveEditor;
 
-class DiagonalCurveEditorSubGroup : public CurveEditorSubGroup, public SHCListener, public AdjusterListener, public rtengine::NonCopyable
+class DiagonalCurveEditorSubGroup :
+    public CurveEditorSubGroup,
+    public SHCListener,
+    public AdjusterListener,
+    public rtengine::NonCopyable
 {
 
     friend class DiagonalCurveEditor;
@@ -111,5 +116,3 @@ protected:
     void setSubGroupRangeLabels(Glib::ustring r1, Glib::ustring r2, Glib::ustring r3, Glib::ustring r4);
     void setSubGroupBottomBarBgGradient();
 };
-
-#endif

rtgui/dirbrowser.h

@@ -16,13 +16,13 @@
  *  You should have received a copy of the GNU General Public License
  *  along with RawTherapee.  If not, see <https://www.gnu.org/licenses/>.
  */
-#ifndef _DIRBROWSER_
+#pragma once
-#define _DIRBROWSER_
 
 #include <gtkmm.h>
 #include <giomm.h>
 
 #include "guiutils.h"
+
 #ifdef WIN32
 #include "windows.h"
 #endif
@@ -110,5 +110,3 @@ inline DirBrowser::DirSelectionSignal DirBrowser::dirSelected () const
 {
     return dirSelectionSignal;
 }
-
-#endif

rtgui/dirpyrdenoise.h

@@ -16,16 +16,16 @@
  *  You should have received a copy of the GNU General Public License
  *  along with RawTherapee.  If not, see <https://www.gnu.org/licenses/>.
  */
-#ifndef _DIRPYRDENOISE_H_
+#pragma once
-#define _DIRPYRDENOISE_H_
 
 #include <gtkmm.h>
+
 #include "adjuster.h"
-#include "toolpanel.h"
+#include "colorprovider.h"
 #include "curveeditor.h"
 #include "curveeditorgroup.h"
-#include "colorprovider.h"
 #include "guiutils.h"
+#include "toolpanel.h"
 
 class EditDataProvider;
 
@@ -137,5 +137,3 @@ private:
 
     IdleRegister idle_register;
 };
-
-#endif

rtgui/dirpyrequalizer.h

@@ -16,17 +16,20 @@
  *
  *  (C) 2010 Emil Martinec <ejmartin@uchicago.edu>
  */
-
+#pragma once
-#ifndef DIRPYREQUALIZER_H_INCLUDED
-#define DIRPYREQUALIZER_H_INCLUDED
 
 #include <gtkmm.h>
-#include "adjuster.h"
-#include "toolpanel.h"
-#include "thresholdadjuster.h"
-#include "colorprovider.h"
 
-class DirPyrEqualizer : public ToolParamBlock, public ThresholdAdjusterListener, public AdjusterListener, public FoldableToolPanel
+#include "adjuster.h"
+#include "colorprovider.h"
+#include "thresholdadjuster.h"
+#include "toolpanel.h"
+
+class DirPyrEqualizer :
+    public ToolParamBlock,
+    public ThresholdAdjusterListener,
+    public AdjusterListener,
+    public FoldableToolPanel
 {
 
 protected:
@@ -77,5 +80,3 @@ public:
     void adjusterChanged(ThresholdAdjuster* a, int newBottomLeft, int newTopLeft, int newBottomRight, int newTopRight) override;
     void adjusterChanged2(ThresholdAdjuster* a, int newBottomL, int newTopL, int newBottomR, int newTopR) override;
 };
-
-#endif

rtgui/distortion.h

@@ -16,15 +16,18 @@
  *  You should have received a copy of the GNU General Public License
  *  along with RawTherapee.  If not, see <https://www.gnu.org/licenses/>.
  */
-#ifndef _DISTORTION_H_
+#pragma once
-#define _DISTORTION_H_
 
 #include <gtkmm.h>
-#include "adjuster.h"
-#include "toolpanel.h"
-#include "lensgeomlistener.h"
 
-class Distortion : public ToolParamBlock, public AdjusterListener, public FoldableToolPanel
+#include "adjuster.h"
+#include "lensgeomlistener.h"
+#include "toolpanel.h"
+
+class Distortion :
+    public ToolParamBlock,
+    public AdjusterListener,
+    public FoldableToolPanel
 {
 
 protected:
@@ -51,5 +54,3 @@ public:
         rlistener = l;
     }
 };
-
-#endif

rtgui/dynamicprofilepanel.h

@@ -16,14 +16,16 @@
  *  You should have received a copy of the GNU General Public License
  *  along with RawTherapee.  If not, see <https://www.gnu.org/licenses/>.
  */
-#ifndef _DYNAMICPROFILEPANEL_H_
+#pragma once
-#define _DYNAMICPROFILEPANEL_H_
 
 #include <gtkmm.h>
-#include "../rtengine/dynamicprofile.h"
+
 #include "profilestorecombobox.h"
 
-class DynamicProfilePanel: public Gtk::VBox
+#include "../rtengine/dynamicprofile.h"
+
+class DynamicProfilePanel :
+    public Gtk::VBox
 {
 public:
     DynamicProfilePanel();
@@ -133,5 +135,3 @@ private:
     Gtk::Button button_edit_;
     Gtk::Button button_delete_;
 };
-
-#endif // _DYNAMICPROFILEPANEL_H_

rtgui/editedstate.h

@@ -16,10 +16,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with RawTherapee.  If not, see <https://www.gnu.org/licenses/>.
  */
-#ifndef _EDITEDSTATE_
+#pragma once
-#define _EDITEDSTATE_
 
 enum EditedState { UnEdited = 0, Edited = 1, Irrelevant = 2 };
-
-#endif
-

rtgui/editenums.h

@@ -16,8 +16,7 @@
  *  You should have received a copy of the GNU General Public License
  *  along with RawTherapee.  If not, see <https://www.gnu.org/licenses/>.
  */
-#ifndef _EDITENUMS_
+#pragma once
-#define _EDITENUMS_
 
 enum ImgEditState {SNormal, SCropMove, SHandMove, SResizeW1, SResizeW2, SResizeH1, SResizeH2, SResizeTL, SResizeTR, SResizeBL, SResizeBR,
                    SCropSelecting, SRotateSelecting, SCropWinMove, SCropFrameMove, SCropImgMove, SCropWinResize, SObservedMove,
@@ -26,5 +25,3 @@ enum ImgEditState {SNormal, SCropMove, SHandMove, SResizeW1, SResizeW2, SResizeH
 enum CursorArea  {CropWinButtons, CropToolBar, CropImage, ColorPicker, CropBorder, CropTop, CropTopLeft, CropTopRight, CropBottom, CropBottomLeft,
                   CropBottomRight, CropLeft, CropRight, CropInside, CropResize, CropObserved
                  };
-
-#endif

rtgui/editid.h

@@ -16,9 +16,7 @@
  *  You should have received a copy of the GNU General Public License
  *  along with RawTherapee.  If not, see <https://www.gnu.org/licenses/>.
  */
-#ifndef _EDITID_H_
+#pragma once
-#define _EDITID_H_
-
 
 /// @brief List of pipette editing operation
 enum EditUniqueID : int {
@@ -67,5 +65,3 @@ enum ObjectMode {
     OM_255,   /// less or equal than 255 objects
     OM_65535  /// less or equal than 65535 objects
 };
-
-#endif

rtgui/editorpanel.h

@@ -17,24 +17,25 @@
  *  You should have received a copy of the GNU General Public License
  *  along with RawTherapee.  If not, see <https://www.gnu.org/licenses/>.
  */
-#ifndef _EDITORPANEL_
+#pragma once
-#define _EDITORPANEL_
 
 #include <gtkmm.h>
-#include "imageareapanel.h"
+
-#include "toolpanelcoord.h"
-#include "profilepanel.h"
-#include "../rtengine/rtengine.h"
-#include "history.h"
-#include "histogrampanel.h"
-#include "thumbnail.h"
-#include "saveasdlg.h"
 #include "batchqueueentry.h"
-#include "thumbnaillistener.h"
-#include "navigator.h"
-#include "progressconnector.h"
 #include "filepanel.h"
+#include "histogrampanel.h"
+#include "history.h"
+#include "imageareapanel.h"
+#include "navigator.h"
+#include "profilepanel.h"
+#include "progressconnector.h"
+#include "saveasdlg.h"
+#include "thumbnail.h"
+#include "thumbnaillistener.h"
+#include "toolpanelcoord.h"
+
 #include "../rtengine/noncopyable.h"
+#include "../rtengine/rtengine.h"
 
 class EditorPanel;
 class MyProgressBar;
@@ -259,6 +260,3 @@ private:
 
     IdleRegister idle_register;
 };
-
-#endif
-

rtgui/editwindow.h

@@ -14,16 +14,18 @@
  *  You should have received a copy of the GNU General Public License
  *  along with RawTherapee.  If not, see <https://www.gnu.org/licenses/>.
  */
-#ifndef _EDITWINDOW_
+#pragma once
-#define _EDITWINDOW_
 
-#include <gtkmm.h>
-#include "filepanel.h"
-#include "editorpanel.h"
-#include "rtimage.h"
 #include <set>
 
-class EditWindow : public Gtk::Window
+#include <gtkmm.h>
+
+#include "editorpanel.h"
+#include "filepanel.h"
+#include "rtimage.h"
+
+class EditWindow :
+    public Gtk::Window
 {
 
 private:
@@ -67,5 +69,3 @@ public:
     void set_title_decorated(Glib::ustring fname);
     void on_realize () override;
 };
-
-#endif

rtgui/epd.h

@@ -16,14 +16,17 @@
  *  You should have received a copy of the GNU General Public License
  *  along with RawTherapee.  If not, see <https://www.gnu.org/licenses/>.
  */
-#ifndef _EPD_H_
+#pragma once
-#define _EPD_H_
 
 #include <gtkmm.h>
+
 #include "adjuster.h"
 #include "toolpanel.h"
 
-class EdgePreservingDecompositionUI : public ToolParamBlock, public AdjusterListener, public FoldableToolPanel
+class EdgePreservingDecompositionUI :
+    public ToolParamBlock,
+    public AdjusterListener,
+    public FoldableToolPanel
 {
 protected:
     Adjuster *strength;
@@ -45,5 +48,3 @@ public:
     void enabledChanged  () override;
     void setAdjusterBehavior (bool stAdd, bool gAdd, bool esAdd, bool scAdd, bool rAdd);
 };
-
-#endif

rtgui/exiffiltersettings.h

@@ -16,8 +16,7 @@
  *  You should have received a copy of the GNU General Public License
  *  along with RawTherapee.  If not, see <https://www.gnu.org/licenses/>.
  */
-#ifndef _EXIFFILTERSETTINGS_
+#pragma once
-#define _EXIFFILTERSETTINGS_
 
 #include <set>
 #include <string>
@@ -51,6 +50,3 @@ public:
     ExifFilterSettings ();
     void clear ();
 };
-
-#endif
-

rtgui/exifpanel.h

@@ -16,8 +16,7 @@
  *  You should have received a copy of the GNU General Public License
  *  along with RawTherapee.  If not, see <https://www.gnu.org/licenses/>.
  */
-#ifndef _EXIFPANEL_
+#pragma once
-#define _EXIFPANEL_
 
 #include <memory>
 
@@ -25,7 +24,9 @@
 
 #include "toolpanel.h"
 
-class ExifPanel : public Gtk::VBox, public ToolPanel
+class ExifPanel :
+    public Gtk::VBox,
+    public ToolPanel
 {
 
 private:
@@ -114,5 +115,3 @@ public:
     void notifyListener();
 
 };
-
-#endif

rtgui/exportpanel.h

@@ -17,12 +17,12 @@
  *  You should have received a copy of the GNU General Public License
  *  along with RawTherapee.  If not, see <https://www.gnu.org/licenses/>.
  */
-#ifndef _EXPORTPANEL_
+#pragma once
-#define _EXPORTPANEL_
 
 #include <gtkmm.h>
-#include "guiutils.h"
+
 #include "adjuster.h"
+#include "guiutils.h"
 
 class ExportPanelListener
 {
@@ -122,5 +122,3 @@ public:
         listener = l;
     }
 };
-
-#endif

rtgui/extprog.h

@@ -16,14 +16,12 @@
 *  You should have received a copy of the GNU General Public License
 *  along with RawTherapee.  If not, see <https://www.gnu.org/licenses/>.
 */
-
+#pragma once
-#ifndef _EXTPROG_
-#define _EXTPROG_
-
-#include <glibmm/ustring.h>
 
 #include <vector>
 
+#include <glibmm/ustring.h>
+
 #include "threadutils.h"
 
 struct ExtProgAction
@@ -74,5 +72,3 @@ inline const std::vector<ExtProgAction>& ExtProgStore::getActions () const
 {
     return actions;
 }
-
-#endif

rtgui/favoritbrowser.h

@@ -16,17 +16,19 @@
  *  You should have received a copy of the GNU General Public License
  *  along with RawTherapee.  If not, see <https://www.gnu.org/licenses/>.
  */
-#ifndef _FAVORITBROWSER_
+#pragma once
-#define _FAVORITBROWSER_
 
 #include <gtkmm.h>
+
 #include "dirbrowserremoteinterface.h"
 #include "dirselectionlistener.h"
 
-class FavoritBrowser : public Gtk::VBox, public DirSelectionListener
+class FavoritBrowser :
+    public Gtk::VBox,
+    public DirSelectionListener
 {
-
+    class FavoritColumns :
-    class FavoritColumns : public Gtk::TreeModel::ColumnRecord
+        public Gtk::TreeModel::ColumnRecord
     {
     public:
         Gtk::TreeModelColumn<Glib::RefPtr<Gio::Icon> >   icon;
@@ -61,7 +63,3 @@ public:
     void delPressed ();
     void selectionChanged ();
 };
-
-#endif
-
-

rtgui/filebrowser.h

@@ -16,25 +16,27 @@
  *  You should have received a copy of the GNU General Public License
  *  along with RawTherapee.  If not, see <https://www.gnu.org/licenses/>.
  */
-#ifndef _FILEBROWSER_
+#pragma once
-#define _FILEBROWSER_
+
+#include <map>
 
 #include <gtkmm.h>
-#include <map>
+
-#include "thumbbrowserbase.h"
-#include "exiffiltersettings.h"
-#include "filebrowserentry.h"
 #include "browserfilter.h"
-#include "pparamschangelistener.h"
+#include "exiffiltersettings.h"
-#include "partialpastedlg.h"
 #include "exportpanel.h"
 #include "extprog.h"
+#include "filebrowserentry.h"
+#include "partialpastedlg.h"
+#include "pparamschangelistener.h"
 #include "profilestorecombobox.h"
+#include "thumbbrowserbase.h"
+
 #include "../rtengine/noncopyable.h"
 
-class ProfileStoreLabel;
 class FileBrowser;
 class FileBrowserEntry;
+class ProfileStoreLabel;
 
 class FileBrowserListener
 {
@@ -210,5 +212,3 @@ public:
 
     type_trash_changed trash_changed();
 };
-
-#endif

rtgui/filebrowserentry.h

@@ -16,16 +16,13 @@
  *  You should have received a copy of the GNU General Public License
  *  along with RawTherapee.  If not, see <https://www.gnu.org/licenses/>.
  */
-#ifndef _FILEBROWSERENTRY_
+#pragma once
-#define _FILEBROWSERENTRY_
 
 #include <atomic>
 #include <memory>
 
 #include <gtkmm.h>
 
-#include "../rtengine/rtengine.h"
-
 #include "crophandler.h"
 #include "editenums.h"
 #include "filethumbnailbuttonset.h"
@@ -34,8 +31,9 @@
 #include "thumbimageupdater.h"
 #include "thumbnail.h"
 #include "thumbnaillistener.h"
-#include "../rtengine/noncopyable.h"
 
+#include "../rtengine/noncopyable.h"
+#include "../rtengine/rtengine.h"
 
 class FileBrowserEntry;
 struct FileBrowserEntryIdleHelper {
@@ -109,5 +107,3 @@ public:
     bool    pressNotify   (int button, int type, int bstate, int x, int y) override;
     bool    releaseNotify (int button, int type, int bstate, int x, int y) override;
 };
-
-#endif

rtgui/filecatalog.h

@@ -16,22 +16,24 @@
  *  You should have received a copy of the GNU General Public License
  *  along with RawTherapee.  If not, see <https://www.gnu.org/licenses/>.
  */
-#ifndef _FILECATALOG_
+#pragma once
-#define _FILECATALOG_
 
-#include "filebrowser.h"
-#include "exiffiltersettings.h"
-#include <giomm.h>
-#include "fileselectionlistener.h"
 #include <set>
-#include "fileselectionchangelistener.h"
+
+#include <giomm.h>
+
 #include "coarsepanel.h"
-#include "toolbar.h"
+#include "exiffiltersettings.h"
-#include "filterpanel.h"
 #include "exportpanel.h"
-#include "previewloader.h"
+#include "filebrowser.h"
+#include "fileselectionchangelistener.h"
+#include "fileselectionlistener.h"
+#include "filterpanel.h"
 #include "multilangmgr.h"
+#include "previewloader.h"
 #include "threadutils.h"
+#include "toolbar.h"
+
 #include "../rtengine/noncopyable.h"
 
 class FilePanel;
@@ -288,5 +290,3 @@ inline void FileCatalog::setDirSelector (const FileCatalog::DirSelectionSlot& se
 {
     this->selectDir = selectDir;
 }
-
-#endif

rtgui/filepanel.h

@@ -16,21 +16,22 @@
  *  You should have received a copy of the GNU General Public License
  *  along with RawTherapee.  If not, see <https://www.gnu.org/licenses/>.
  */
-#ifndef _FILEPANEL_
+#pragma once
-#define _FILEPANEL_
 
 #include <gtkmm.h>
+
 #include "batchtoolpanelcoord.h"
-#include "filecatalog.h"
 #include "dirbrowser.h"
-#include "fileselectionlistener.h"
-#include "placesbrowser.h"
-#include "recentbrowser.h"
-#include "pparamschangelistener.h"
-#include "history.h"
-#include "filterpanel.h"
 #include "exportpanel.h"
+#include "filecatalog.h"
+#include "fileselectionlistener.h"
+#include "filterpanel.h"
+#include "history.h"
+#include "placesbrowser.h"
+#include "pparamschangelistener.h"
 #include "progressconnector.h"
+#include "recentbrowser.h"
+
 #include "../rtengine/noncopyable.h"
 
 class RTWindow;
@@ -108,6 +109,3 @@ private:
 
     IdleRegister idle_register;
 };
-
-#endif
-

rtgui/fileselectionchangelistener.h

@@ -16,8 +16,7 @@
  *  You should have received a copy of the GNU General Public License
  *  along with RawTherapee.  If not, see <https://www.gnu.org/licenses/>.
  */
-#ifndef _FILESELECTIONCHANGELISTENER_
+#pragma once
-#define _FILESELECTIONCHANGELISTENER_
 
 class Thumbnail;
 
@@ -27,6 +26,3 @@ public:
     virtual ~FileSelectionChangeListener() = default;
     virtual void selectionChanged(const std::vector<Thumbnail*>& selected) = 0;
 };
-
-#endif
-

rtgui/fileselectionlistener.h

@@ -16,11 +16,10 @@
  *  You should have received a copy of the GNU General Public License
  *  along with RawTherapee.  If not, see <https://www.gnu.org/licenses/>.
  */
-#ifndef _FILESELECTIONLISTENER_
+#pragma once
-#define _FILESELECTIONLISTENER_
 
-class Thumbnail;
 class BatchQueueEntry;
+class Thumbnail;
 
 class FileSelectionListener
 {
@@ -29,6 +28,3 @@ public:
     virtual bool fileSelected(Thumbnail* thm) = 0;
     virtual bool addBatchQueueJobs(const std::vector<BatchQueueEntry*>& entries) = 0;
 };
-
-#endif
-

rtgui/filethumbnailbuttonset.h

@@ -16,18 +16,20 @@
  *  You should have received a copy of the GNU General Public License
  *  along with RawTherapee.  If not, see <https://www.gnu.org/licenses/>.
  */
-#ifndef _FILETHUMBNAILBUTTONSET_
+#pragma once
-#define _FILETHUMBNAILBUTTONSET_
 
 #include <array>
 
-#include "lwbuttonset.h"
 #include <gtkmm.h>
+
 #include "filebrowserentry.h"
+#include "lwbuttonset.h"
 #include "rtsurface.h"
 
 class FileBrowserEntry;
-class FileThumbnailButtonSet : public LWButtonSet
+
+class FileThumbnailButtonSet :
+    public LWButtonSet
 {
 
     static bool iconsLoaded;
@@ -55,5 +57,3 @@ public:
     void    setInTrash (bool inTrash);
 
 };
-
-#endif

rtgui/filmsimulation.h

@@ -1,14 +1,17 @@
-#ifndef FILM_SIMULATION_INCLUDED
+#pragma once
-#define FILM_SIMULATION_INCLUDED
+
+#include <memory>
 
 #include <gtkmm.h>
-#include <glibmm/ustring.h>
-#include <memory>
-#include "toolpanel.h"
-#include "guiutils.h"
-#include "adjuster.h"
 
-class ClutComboBox : public MyComboBox
+#include <glibmm/ustring.h>
+
+#include "adjuster.h"
+#include "guiutils.h"
+#include "toolpanel.h"
+
+class ClutComboBox :
+    public MyComboBox
 {
 public:
     explicit ClutComboBox(const Glib::ustring &path);
@@ -74,5 +77,3 @@ private:
 
     Adjuster *m_strength;
 };
-
-#endif

rtgui/filterpanel.h

@@ -16,10 +16,10 @@
  *  You should have received a copy of the GNU General Public License
  *  along with RawTherapee.  If not, see <https://www.gnu.org/licenses/>.
  */
-#ifndef _FILTERPANEL_
+#pragma once
-#define _FILTERPANEL_
 
 #include <gtkmm.h>
+
 #include "exiffiltersettings.h"
 
 class FilterPanelListener
@@ -79,5 +79,3 @@ public:
         enabled->set_active(enabledState);
     }
 };
-
-#endif

rtgui/flatcurveeditorsubgroup.h

@@ -16,16 +16,19 @@
  *  You should have received a copy of the GNU General Public License
  *  along with RawTherapee.  If not, see <https://www.gnu.org/licenses/>.
  */
-#ifndef _FLATCURVEEDITORSUBGROUP_
+#pragma once
-#define _FLATCURVEEDITORSUBGROUP_
 
 #include <gtkmm.h>
+
 #include "curveeditorgroup.h"
+
 #include "../rtengine/noncopyable.h"
 
 class FlatCurveEditor;
 
-class FlatCurveEditorSubGroup: public CurveEditorSubGroup, public rtengine::NonCopyable
+class FlatCurveEditorSubGroup:
+    public CurveEditorSubGroup,
+    public rtengine::NonCopyable
 {
 
     friend class FlatCurveEditor;
@@ -76,5 +79,3 @@ protected:
     void editPointToggled(Gtk::ToggleButton *button);
     void editToggled (Gtk::ToggleButton *button);
 };
-
-#endif

rtgui/flatfield.h

@@ -16,15 +16,17 @@
  *  You should have received a copy of the GNU General Public License
  *  along with RawTherapee.  If not, see <https://www.gnu.org/licenses/>.
  */
-#ifndef _FLATFIELD_H_
+#pragma once
-#define _FLATFIELD_H_
 
 #include <memory>
+
 #include <gtkmm.h>
+
 #include "adjuster.h"
-#include "toolpanel.h"
-#include "../rtengine/rawimage.h"
 #include "guiutils.h"
+#include "toolpanel.h"
+
+#include "../rtengine/rawimage.h"
 
 class FFProvider
 {
@@ -84,5 +86,3 @@ public:
     };
     void flatFieldAutoClipValueChanged(int n = 0) override;
 };
-
-#endif

rtgui/gradient.h

@@ -1,16 +1,20 @@
 /*
  *  This file is part of RawTherapee.
  */
-#ifndef _GRADIENT_H_
+#pragma once
-#define _GRADIENT_H_
 
 #include <gtkmm.h>
+
 #include "adjuster.h"
 #include "editcallbacks.h"
-#include "toolpanel.h"
 #include "guiutils.h"
+#include "toolpanel.h"
 
-class Gradient : public ToolParamBlock, public AdjusterListener, public FoldableToolPanel, public EditSubscriber
+class Gradient :
+    public ToolParamBlock,
+    public AdjusterListener,
+    public FoldableToolPanel,
+    public EditSubscriber
 {
 
 private:
@@ -58,5 +62,3 @@ public:
     bool drag1(int modifierKey) override;
     void switchOffEditMode () override;
 };
-
-#endif

rtgui/histogrampanel.h

@@ -16,21 +16,23 @@
  *  You should have received a copy of the GNU General Public License
  *  along with RawTherapee.  If not, see <https://www.gnu.org/licenses/>.
  */
-#ifndef _HISTOGRAMPANEL_
+#pragma once
-#define _HISTOGRAMPANEL_
-
 
 #include <gtkmm.h>
-#include <glibmm/ustring.h>
-#include <cairomm/cairomm.h>
-#include "../rtengine/LUT.h"
-#include "../rtengine/improccoordinator.h"
-#include "guiutils.h"
 
+#include <glibmm/ustring.h>
+
+#include <cairomm/cairomm.h>
+
+#include "guiutils.h"
 #include "pointermotionlistener.h"
+
+#include "../rtengine/improccoordinator.h"
+#include "../rtengine/LUT.h"
 #include "../rtengine/noncopyable.h"
 
 class HistogramArea;
+
 struct HistogramAreaIdleHelper {
     HistogramArea* harea;
     bool destroyed;
@@ -252,5 +254,3 @@ public:
     // drawModeListener interface
     void toggleButtonMode () override;
 };
-
-#endif

rtgui/history.h

@@ -16,14 +16,15 @@
  *  You should have received a copy of the GNU General Public License
  *  along with RawTherapee.  If not, see <https://www.gnu.org/licenses/>.
  */
-#ifndef _HISTORY_
+#pragma once
-#define _HISTORY_
 
 #include <gtkmm.h>
-#include "../rtengine/rtengine.h"
+
+#include "paramsedited.h"
 #include "pparamschangelistener.h"
 #include "profilechangelistener.h"
-#include "paramsedited.h"
+
+#include "../rtengine/rtengine.h"
 
 class HistoryBeforeLineListener
 {
@@ -135,5 +136,3 @@ public:
         bmnum = 1;
     };
 };
-
-#endif

rtgui/hsvequalizer.h

@@ -16,20 +16,22 @@
  *
  *  2010 Ilya Popov <ilia_popov@rambler.ru>
  */
-
+#pragma once
-#ifndef HSVEQUALIZER_H_INCLUDED
-#define HSVEQUALIZER_H_INCLUDED
 
 #include <gtkmm.h>
+
 #include "adjuster.h"
-#include "toolpanel.h"
+#include "colorprovider.h"
-#include "guiutils.h"
 #include "curveeditor.h"
 #include "curveeditorgroup.h"
-#include "colorprovider.h"
+#include "guiutils.h"
+#include "toolpanel.h"
 
-
+class HSVEqualizer :
-class HSVEqualizer : public ToolParamBlock, public FoldableToolPanel, public CurveListener, public ColorProvider
+    public ToolParamBlock,
+    public FoldableToolPanel,
+    public CurveListener,
+    public ColorProvider
 {
 
 protected:
@@ -56,5 +58,3 @@ public:
     //void adjusterChanged (Adjuster* a, double newval);
     void enabledChanged() override;
 };
-
-#endif

rtgui/icmpanel.h

@@ -16,16 +16,17 @@
  *  You should have received a copy of the GNU General Public License
  *  along with RawTherapee.  If not, see <https://www.gnu.org/licenses/>.
  */
-#ifndef _ICMPANEL_
+#pragma once
-#define _ICMPANEL_
 
 #include <memory>
+
 #include <gtkmm.h>
+
 #include "adjuster.h"
 #include "guiutils.h"
-
-#include "toolpanel.h"
 #include "popupbutton.h"
+#include "toolpanel.h"
+
 #include "../rtengine/imagedata.h"
 
 class ICMPanelListener
@@ -148,5 +149,3 @@ public:
         icmplistener = ipl;
     }
 };
-
-#endif

rtgui/ilabel.h

@@ -16,12 +16,12 @@
  *  You should have received a copy of the GNU General Public License
  *  along with RawTherapee.  If not, see <https://www.gnu.org/licenses/>.
  */
-#ifndef _ILABEL_
+#pragma once
-#define _ILABEL_
 
 #include <gtkmm.h>
 
-class ILabel : public Gtk::DrawingArea
+class ILabel :
+    public Gtk::DrawingArea
 {
 
     Glib::ustring label;
@@ -32,6 +32,3 @@ public:
     void on_realize() override;
     void on_style_updated () override;
 };
-
-#endif
-