diff --git a/src/imageformats/avif_p.h b/src/imageformats/avif_p.h
index e836e00..fa29c39 100644
--- a/src/imageformats/avif_p.h
+++ b/src/imageformats/avif_p.h
@@ -51,7 +51,7 @@ private:
   {
     ParseAvifError = -1,
     ParseAvifNotParsed = 0,
-    ParseAvifSuccess = 1
+    ParseAvifSuccess = 1,
   };
 
   ParseAvifState m_parseState;
diff --git a/src/imageformats/gimp_p.h b/src/imageformats/gimp_p.h
index 7ddcb20..fad256f 100644
--- a/src/imageformats/gimp_p.h
+++ b/src/imageformats/gimp_p.h
@@ -41,7 +41,7 @@ const uchar OPAQUE_OPACITY = 255; //!< Opaque value for 8-bit alpha component.
 typedef enum {
     RGB,
     GRAY,
-    INDEXED
+    INDEXED,
 } GimpImageBaseType;
 
 
diff --git a/src/imageformats/heif_p.h b/src/imageformats/heif_p.h
index c9fcb05..e96b46e 100644
--- a/src/imageformats/heif_p.h
+++ b/src/imageformats/heif_p.h
@@ -36,7 +36,7 @@ private:
     enum ParseHeicState {
         ParseHeicError = -1,
         ParseHeicNotParsed = 0,
-        ParseHeicSuccess = 1
+        ParseHeicSuccess = 1,
     };
 
     ParseHeicState m_parseState;
diff --git a/src/imageformats/pic_p.h b/src/imageformats/pic_p.h
index 05b108f..86e7f7e 100644
--- a/src/imageformats/pic_p.h
+++ b/src/imageformats/pic_p.h
@@ -25,7 +25,7 @@ enum PicFields {
     NoPicture = 0, /**< No picture */
     OddScanlines = 1, /**< Odd scanlines */
     EvenScanlines = 2, /**< Even scanlines */
-    BothScanlines = 3 /**< Every scanline */
+    BothScanlines = 3, /**< Every scanline */
 };
 
 /**
@@ -33,7 +33,7 @@ enum PicFields {
  */
 enum PicChannelEncoding {
     Uncompressed = 0, /**< Image is uncompressed */
-    MixedRLE = 2 /**< Run length compression */
+    MixedRLE = 2, /**< Run length compression */
 };
 
 /**
@@ -43,7 +43,7 @@ enum PicChannelCode {
     RED = 0x80, /**< Red channel */
     GREEN = 0x40, /**< Green channel */
     BLUE = 0x20, /**< Blue channel */
-    ALPHA = 0x10 /**< Alpha channel */
+    ALPHA = 0x10, /**< Alpha channel */
 };
 
 /**
@@ -155,7 +155,7 @@ public:
         Error,
         Ready,
         ReadHeader,
-        ReadChannels
+        ReadChannels,
     };
 
     SoftimagePICHandler()
diff --git a/src/imageformats/psd.cpp b/src/imageformats/psd.cpp
index 767119d..dbcfb9f 100644
--- a/src/imageformats/psd.cpp
+++ b/src/imageformats/psd.cpp
@@ -40,7 +40,7 @@ enum ColorMode {
     CM_CMYK = 4,
     CM_MULTICHANNEL = 7,
     CM_DUOTONE = 8,
-    CM_LABCOLOR = 9
+    CM_LABCOLOR = 9,
 };
 
 struct PSDHeader {
diff --git a/src/imageformats/ras.cpp b/src/imageformats/ras.cpp
index cc71efd..e64d766 100644
--- a/src/imageformats/ras.cpp
+++ b/src/imageformats/ras.cpp
@@ -28,13 +28,13 @@ enum RASType {
     RAS_TYPE_RGB_FORMAT     = 0x3,
     RAS_TYPE_TIFF_FORMAT        = 0x4,
     RAS_TYPE_IFF_FORMAT     = 0x5,
-    RAS_TYPE_EXPERIMENTAL       = 0xFFFF
+    RAS_TYPE_EXPERIMENTAL       = 0xFFFF,
 };
 
 enum RASColorMapType {
     RAS_COLOR_MAP_TYPE_NONE     = 0x0,
     RAS_COLOR_MAP_TYPE_RGB      = 0x1,
-    RAS_COLOR_MAP_TYPE_RAW      = 0x2
+    RAS_COLOR_MAP_TYPE_RAW      = 0x2,
 };
 
 struct RasHeader {
@@ -46,7 +46,7 @@ struct RasHeader {
     quint32 Type;
     quint32 ColorMapType;
     quint32 ColorMapLength;
-    enum { SIZE = 32 }; // 8 fields of four bytes each
+    enum { SIZE = 32, }; // 8 fields of four bytes each
 };
 
 static QDataStream &operator>> (QDataStream &s, RasHeader &head)
diff --git a/src/imageformats/rgb.cpp b/src/imageformats/rgb.cpp
index efe54b7..dd3a9d6 100644
--- a/src/imageformats/rgb.cpp
+++ b/src/imageformats/rgb.cpp
@@ -74,7 +74,7 @@ public:
     bool writeImage(const QImage &);
 
 private:
-    enum { NORMAL, DITHERED, SCREEN, COLORMAP }; // colormap
+    enum { NORMAL, DITHERED, SCREEN, COLORMAP, }; // colormap
     QIODevice *_dev;
     QDataStream _stream;
 
diff --git a/src/imageformats/rle_p.h b/src/imageformats/rle_p.h
index 92ff3f9..fd543a9 100644
--- a/src/imageformats/rle_p.h
+++ b/src/imageformats/rle_p.h
@@ -37,7 +37,7 @@ enum class RLEVariant {
      * of size 128, 130 of size 127, down to 255 of
      * size 2.
      */
-    PIC
+    PIC,
 };
 
 /**
diff --git a/src/imageformats/tga.cpp b/src/imageformats/tga.cpp
index 64d3909..fc9d0b7 100644
--- a/src/imageformats/tga.cpp
+++ b/src/imageformats/tga.cpp
@@ -40,7 +40,7 @@ enum TGAType {
     TGA_TYPE_GREY           = 3,
     TGA_TYPE_RLE_INDEXED    = 9,
     TGA_TYPE_RLE_RGB        = 10,
-    TGA_TYPE_RLE_GREY       = 11
+    TGA_TYPE_RLE_GREY       = 11,
 };
 
 #define TGA_INTERLEAVE_MASK 0xc0
@@ -69,7 +69,7 @@ struct TgaHeader {
     uchar pixel_size;
     uchar flags;
 
-    enum { SIZE = 18 }; // const static int SIZE = 18;
+    enum { SIZE = 18, }; // const static int SIZE = 18;
 };
 
 static QDataStream &operator>> (QDataStream &s, TgaHeader &head)
diff --git a/src/imageformats/xcf.cpp b/src/imageformats/xcf.cpp
index c508063..f9c3c75 100644
--- a/src/imageformats/xcf.cpp
+++ b/src/imageformats/xcf.cpp
@@ -131,7 +131,7 @@ public:
         PROP_BLEND_SPACE        = 37,
         PROP_FLOAT_COLOR        = 38,
         PROP_SAMPLE_POINTS      = 39,
-        MAX_SUPPORTED_PROPTYPE // should always be at the end so its value is last + 1
+        MAX_SUPPORTED_PROPTYPE, // should always be at the end so its value is last + 1
     };
     Q_ENUM(PropType);
 
@@ -141,7 +141,7 @@ public:
         COMPRESS_NONE              =  0,
         COMPRESS_RLE               =  1,
         COMPRESS_ZLIB              =  2,  /* unused */
-        COMPRESS_FRACTAL           =  3   /* unused */
+        COMPRESS_FRACTAL           =  3,   /* unused */
     };
     Q_ENUM(XcfCompressionType);
 
@@ -208,7 +208,7 @@ public:
         GIMP_LAYER_MODE_MERGE,
         GIMP_LAYER_MODE_SPLIT,
         GIMP_LAYER_MODE_PASS_THROUGH,
-        GIMP_LAYER_MODE_COUNT
+        GIMP_LAYER_MODE_COUNT,
     };
     Q_ENUM(LayerModeType);
 
@@ -219,7 +219,7 @@ public:
         GRAY_GIMAGE,
         GRAYA_GIMAGE,
         INDEXED_GIMAGE,
-        INDEXEDA_GIMAGE
+        INDEXEDA_GIMAGE,
     };
     Q_ENUM(GimpImageType);
 
@@ -227,7 +227,7 @@ public:
     enum GimpColorSpace {
         RgbLinearSpace,
         RgbPerceptualSpace,
-        LabSpace
+        LabSpace,
     };
 
     //! Mode to use when compositing layer