Add a trailing comma to last member in enum

This makes clang-format not squash the whole enum on one line. GIT_SILENT
KDE · Jul 10, 2021 · 57006d5 · 57006d5
1 parent 85337f2
commit 57006d5
Show file tree

Hide file tree

Showing 40 changed files with 57 additions and 57 deletions.
diff --git a/app/fileoperations.h b/app/fileoperations.h
@@ -32,7 +32,7 @@ namespace Gwenview
 namespace FileOperations
 {
 
-enum Operation { TRASH, COPY, MOVE, LINK, UNKNOWN, PUT };
+enum Operation { TRASH, COPY, MOVE, LINK, UNKNOWN, PUT, };
 
 void copyTo(const QList<QUrl>& urlList, QWidget* parent, ContextManager* contextManager);
 void moveTo(const QList<QUrl>& urlList, QWidget* parent, ContextManager* contextManager);

diff --git a/app/filtercontroller.h b/app/filtercontroller.h
@@ -65,7 +65,7 @@ class NameFilter : public AbstractSortedDirModelFilter
 public:
     enum Mode {
         Contains,
-        DoesNotContain
+        DoesNotContain,
     };
     NameFilter(SortedDirModel* model)
     : AbstractSortedDirModelFilter(model)
@@ -134,7 +134,7 @@ class DateFilter : public AbstractSortedDirModelFilter
     enum Mode {
         GreaterOrEqual,
         Equal,
-        LessOrEqual
+        LessOrEqual,
     };
     DateFilter(SortedDirModel* model)
     : AbstractSortedDirModelFilter(model)
@@ -207,7 +207,7 @@ class RatingFilter : public AbstractSortedDirModelFilter
     enum Mode {
         GreaterOrEqual,
         Equal,
-        LessOrEqual
+        LessOrEqual,
     };
 
     RatingFilter(SortedDirModel* model)

diff --git a/app/gvcore.h b/app/gvcore.h
@@ -54,7 +54,7 @@ class GvCore : public QObject
         NormalPalette = 0,
         NormalViewPalette,
         FullScreenPalette,
-        FullScreenViewPalette
+        FullScreenViewPalette,
     };
 
     QAbstractItemModel* recentFoldersModel() const;

diff --git a/app/mainwindow.cpp b/app/mainwindow.cpp
@@ -142,7 +142,7 @@ static const char* SESSION_URL_KEY = "Url";
 enum MainPageId {
     StartMainPageId,
     BrowseMainPageId,
-    ViewMainPageId
+    ViewMainPageId,
 };
 
 struct MainWindowState

diff --git a/app/sidebar.h b/app/sidebar.h
@@ -75,7 +75,7 @@ class SideBarTabBar : public QTabBar
     enum TabButtonStyle {
         TabButtonIconOnly,
         TabButtonTextOnly,
-        TabButtonTextBesideIcon
+        TabButtonTextBesideIcon,
     };
     Q_ENUM(TabButtonStyle)
 

diff --git a/importer/documentdirfinder.h b/importer/documentdirfinder.h
@@ -52,7 +52,7 @@ class DocumentDirFinder : public QObject
     enum Status {
         NoDocumentFound,
         DocumentDirFound,
-        MultipleDirsFound
+        MultipleDirsFound,
     };
 
     DocumentDirFinder(const QUrl& rootUrl);

diff --git a/importer/fileutils.h b/importer/fileutils.h
@@ -34,7 +34,7 @@ enum RenameResult {
     RenamedOK,           /** Renamed without problem */
     RenamedUnderNewName, /** Destination already existed, so rename() added a suffix to make the name unique */
     Skipped,             /** Destination already existed and contained the same data as source, so rename() just removed the source */
-    RenameFailed         /** Rename failed */
+    RenameFailed,        /** Rename failed */
 };
 
 /**

diff --git a/lib/crop/croptool.cpp b/lib/crop/croptool.cpp
@@ -53,7 +53,7 @@ enum CropHandleFlag {
     CH_BottomLeft = CH_Bottom | CH_Left,
     CH_TopRight = CH_Top | CH_Right,
     CH_BottomRight = CH_Bottom | CH_Right,
-    CH_Content = 16
+    CH_Content = 16,
 };
 
 Q_DECLARE_FLAGS(CropHandle, CropHandleFlag)

diff --git a/lib/document/document.h b/lib/document/document.h
@@ -88,7 +88,7 @@ class GWENVIEWLIB_EXPORT Document : public QObject, public QSharedData
         KindDetermined, ///< Image is still loading, but kind has been determined
         MetaInfoLoaded, ///< Image is still loading, but meta info has been loaded
         Loaded,         ///< Full image has been loaded
-        LoadingFailed   ///< Image loading has failed
+        LoadingFailed,   ///< Image loading has failed
     };
 
     using Ptr = QExplicitlySharedDataPointer<Document>;

diff --git a/lib/document/documentjob.h b/lib/document/documentjob.h
@@ -52,7 +52,7 @@ class GWENVIEWLIB_EXPORT DocumentJob : public KCompositeJob
     Q_OBJECT
 public:
     enum {
-        NoDocumentEditorError = UserDefinedError + 1
+        NoDocumentEditorError = UserDefinedError + 1,
     };
     DocumentJob();
     ~DocumentJob() override;

diff --git a/lib/documentview/abstractimageview.cpp b/lib/documentview/abstractimageview.cpp
@@ -43,7 +43,7 @@ struct AbstractImageViewPrivate
 {
     enum Verbosity {
         Silent,
-        Notify
+        Notify,
     };
     AbstractImageView* q;
     QCursor mZoomCursor;

diff --git a/lib/documentview/abstractimageview.h b/lib/documentview/abstractimageview.h
@@ -46,12 +46,12 @@ class AbstractImageView : public QGraphicsWidget
 public:
     enum UpdateType {
         UpdateIfNecessary,
-        ForceUpdate
+        ForceUpdate,
     };
     enum AlphaBackgroundMode {
         AlphaBackgroundNone,
         AlphaBackgroundCheckBoard,
-        AlphaBackgroundSolid
+        AlphaBackgroundSolid,
     };
 
     AbstractImageView(QGraphicsItem* parent);

diff --git a/lib/fullscreenbackground.h b/lib/fullscreenbackground.h
@@ -37,7 +37,7 @@ namespace FullScreenBackground
  */
 enum Enum {
     Black,
-    Image
+    Image,
 };
 
 } // namespace FullScreenBackground

diff --git a/lib/hud/hudtheme.h b/lib/hud/hudtheme.h
@@ -54,7 +54,7 @@ enum State
 {
     NormalState,
     MouseOverState,
-    DownState
+    DownState,
 };
 
 enum WidgetType
@@ -63,7 +63,7 @@ enum WidgetType
     FrameWidget,
     CountDown,
     SliderWidgetHandle,
-    SliderWidgetGroove
+    SliderWidgetGroove,
 };
 
 GWENVIEWLIB_EXPORT RenderInfo renderInfo(WidgetType, State = NormalState);

diff --git a/lib/hud/hudwidget.h b/lib/hud/hudwidget.h
@@ -42,7 +42,7 @@ class GWENVIEWLIB_EXPORT HudWidget : public QGraphicsWidget
     enum Option {
         OptionNone                 = 0,
         OptionCloseButton          = 1 << 1,
-        OptionOpaque               = 1 << 2
+        OptionOpaque               = 1 << 2,
     };
     Q_DECLARE_FLAGS(Options, Option)
 

diff --git a/lib/imageformats/fitsformat/bayer.h b/lib/imageformats/fitsformat/bayer.h
@@ -70,7 +70,7 @@ typedef enum {
     DC1394_INVALID_STEREO_METHOD      = -36,
     DC1394_BASLER_NO_MORE_SFF_CHUNKS  = -37,
     DC1394_BASLER_CORRUPTED_SFF_CHUNK = -38,
-    DC1394_BASLER_UNKNOWN_SFF_CHUNK   = -39
+    DC1394_BASLER_UNKNOWN_SFF_CHUNK   = -39,
 } dc1394error_t;
 #define DC1394_ERROR_MIN DC1394_BASLER_UNKNOWN_SFF_CHUNK
 #define DC1394_ERROR_MAX DC1394_SUCCESS
@@ -111,7 +111,7 @@ typedef enum {
     DC1394_VIDEO_MODE_FORMAT7_4,
     DC1394_VIDEO_MODE_FORMAT7_5,
     DC1394_VIDEO_MODE_FORMAT7_6,
-    DC1394_VIDEO_MODE_FORMAT7_7
+    DC1394_VIDEO_MODE_FORMAT7_7,
 } dc1394video_mode_t;
 #define DC1394_VIDEO_MODE_MIN DC1394_VIDEO_MODE_160x120_YUV444
 #define DC1394_VIDEO_MODE_MAX DC1394_VIDEO_MODE_FORMAT7_7
@@ -136,7 +136,7 @@ typedef enum {
     DC1394_COLOR_CODING_MONO16S,
     DC1394_COLOR_CODING_RGB16S,
     DC1394_COLOR_CODING_RAW8,
-    DC1394_COLOR_CODING_RAW16
+    DC1394_COLOR_CODING_RAW16,
 } dc1394color_coding_t;
 #define DC1394_COLOR_CODING_MIN DC1394_COLOR_CODING_MONO8
 #define DC1394_COLOR_CODING_MAX DC1394_COLOR_CODING_RAW16
@@ -154,7 +154,7 @@ typedef enum {
     DC1394_COLOR_FILTER_RGGB = 512,
     DC1394_COLOR_FILTER_GBRG,
     DC1394_COLOR_FILTER_GRBG,
-    DC1394_COLOR_FILTER_BGGR
+    DC1394_COLOR_FILTER_BGGR,
 } dc1394color_filter_t;
 #define DC1394_COLOR_FILTER_MIN DC1394_COLOR_FILTER_RGGB
 #define DC1394_COLOR_FILTER_MAX DC1394_COLOR_FILTER_BGGR
@@ -165,7 +165,7 @@ typedef enum {
  *
  * IIDC cameras always return data in UYVY order, but conversion functions can change this if requested.
  */
-typedef enum { DC1394_BYTE_ORDER_UYVY = 800, DC1394_BYTE_ORDER_YUYV } dc1394byte_order_t;
+typedef enum { DC1394_BYTE_ORDER_UYVY = 800, DC1394_BYTE_ORDER_YUYV, } dc1394byte_order_t;
 #define DC1394_BYTE_ORDER_MIN DC1394_BYTE_ORDER_UYVY
 #define DC1394_BYTE_ORDER_MAX DC1394_BYTE_ORDER_YUYV
 #define DC1394_BYTE_ORDER_NUM (DC1394_BYTE_ORDER_MAX - DC1394_BYTE_ORDER_MIN + 1)
@@ -191,12 +191,12 @@ typedef struct
 /**
  * Yet another boolean data type
  */
-typedef enum { DC1394_FALSE = 0, DC1394_TRUE } dc1394bool_t;
+typedef enum { DC1394_FALSE = 0, DC1394_TRUE, } dc1394bool_t;
 
 /**
  * Yet another boolean data type, a bit more oriented towards electrical-engineers
  */
-typedef enum { DC1394_OFF = 0, DC1394_ON } dc1394switch_t;
+typedef enum { DC1394_OFF = 0, DC1394_ON, } dc1394switch_t;
 
 /**
  * A list of de-mosaicing techniques for Bayer-patterns.
@@ -211,7 +211,7 @@ typedef enum {
     DC1394_BAYER_METHOD_DOWNSAMPLE,
     DC1394_BAYER_METHOD_EDGESENSE,
     DC1394_BAYER_METHOD_VNG,
-    DC1394_BAYER_METHOD_AHD
+    DC1394_BAYER_METHOD_AHD,
 } dc1394bayer_method_t;
 #define DC1394_BAYER_METHOD_MIN DC1394_BAYER_METHOD_NEAREST
 #define DC1394_BAYER_METHOD_MAX DC1394_BAYER_METHOD_AHD

diff --git a/lib/imageformats/fitsformat/fitsdata.h b/lib/imageformats/fitsformat/fitsdata.h
@@ -24,7 +24,7 @@ Gwenview: an image viewer
 
 #include "bayer.h"
 
-typedef enum { FITS_NORMAL, FITS_FOCUS, FITS_GUIDE, FITS_CALIBRATE, FITS_ALIGN } FITSMode;
+typedef enum { FITS_NORMAL, FITS_FOCUS, FITS_GUIDE, FITS_CALIBRATE, FITS_ALIGN, } FITSMode;
 
 #ifdef WIN32
 // This header must be included before fitsio.h to avoid compiler errors with Visual Studio

diff --git a/lib/imagemetainfomodel.cpp b/lib/imagemetainfomodel.cpp
@@ -53,14 +53,14 @@ enum GroupRow {
     IptcGroup,
     XmpGroup,
     NoGroupSpace,   // second last entry
-    NoGroup         // last entry
+    NoGroup,         // last entry
 };
 
 class MetaInfoGroup
 {
 public:
     enum {
-        InvalidRow = -1
+        InvalidRow = -1,
     };
 
     class Entry

diff --git a/lib/mimetypeutils.h b/lib/mimetypeutils.h
@@ -50,7 +50,7 @@ enum Kind {
     KIND_FILE         = 1 << 3,
     KIND_RASTER_IMAGE = 1 << 4,
     KIND_SVG_IMAGE    = 1 << 5,
-    KIND_VIDEO        = 1 << 6
+    KIND_VIDEO        = 1 << 6,
 };
 Q_DECLARE_FLAGS(Kinds, Kind)
 
@@ -60,7 +60,7 @@ GWENVIEWLIB_EXPORT Kind mimeTypeKind(const QString& mimeType);
 
 enum MimeTarget {
     ClipboardTarget,
-    DropTarget
+    DropTarget,
 };
 
 /**

diff --git a/lib/mousewheelbehavior.h b/lib/mousewheelbehavior.h
@@ -35,7 +35,7 @@ namespace MouseWheelBehavior
 enum Enum {
     Scroll,
     Browse,
-    Zoom
+    Zoom,
 };
 
 } // namespace MouseWheelBehavior

diff --git a/lib/orientation.h b/lib/orientation.h
@@ -49,7 +49,7 @@ enum Orientation {
     TRANSPOSE = 5,
     ROT_90 = 6,
     TRANSVERSE = 7,
-    ROT_270 = 8
+    ROT_270 = 8,
 };
 
 }

diff --git a/lib/print/printoptionspage.h b/lib/print/printoptionspage.h
@@ -39,14 +39,14 @@ class PrintOptionsPage : public QWidget
     enum ScaleMode {
         NoScale,
         ScaleToPage,
-        ScaleToCustomSize
+        ScaleToCustomSize,
     };
 
     // Order should match the content of the unit combbox in the ui file
     enum Unit {
         Millimeters,
         Centimeters,
-        Inches
+        Inches,
     };
 
     PrintOptionsPage(const QSize& imageSize);

diff --git a/lib/redeyereduction/redeyereductiontool.h b/lib/redeyereduction/redeyereductiontool.h
@@ -43,7 +43,7 @@ class GWENVIEWLIB_EXPORT RedEyeReductionTool : public AbstractRasterImageViewToo
 public:
     enum Status {
         NotSet,
-        Adjusting
+        Adjusting,
     };
 
     explicit RedEyeReductionTool(RasterImageView* parent);

diff --git a/lib/renderingintent.h b/lib/renderingintent.h
@@ -33,7 +33,7 @@ namespace RenderingIntent
  */
 enum Enum : cmsUInt32Number {
     Perceptual = INTENT_PERCEPTUAL,
-    Relative = INTENT_RELATIVE_COLORIMETRIC
+    Relative = INTENT_RELATIVE_COLORIMETRIC,
 };
 
 } // namespace RenderingIntent

diff --git a/lib/semanticinfo/fakesemanticinfobackend.h b/lib/semanticinfo/fakesemanticinfobackend.h
@@ -43,7 +43,7 @@ class GWENVIEWLIB_EXPORT FakeSemanticInfoBackEnd : public AbstractSemanticInfoBa
 {
     Q_OBJECT
 public:
-    enum InitializeMode { InitializeEmpty, InitializeRandom };
+    enum InitializeMode { InitializeEmpty, InitializeRandom, };
     FakeSemanticInfoBackEnd(QObject* parent, InitializeMode initializeMode);
 
     virtual TagSet allTags() const;

diff --git a/lib/semanticinfo/semanticinfodirmodel.h b/lib/semanticinfo/semanticinfodirmodel.h
@@ -47,7 +47,7 @@ class SemanticInfoDirModel : public KDirModel
     enum {
         RatingRole = 0x21a43a51,
         DescriptionRole = 0x26FB33FA,
-        TagsRole = 0x0462F0A8
+        TagsRole = 0x0462F0A8,
     };
     SemanticInfoDirModel(QObject* parent);
     ~SemanticInfoDirModel() override;

diff --git a/lib/semanticinfo/tagmodel.h b/lib/semanticinfo/tagmodel.h
@@ -49,12 +49,12 @@ class GWENVIEWLIB_EXPORT TagModel : public QStandardItemModel
     enum {
         TagRole = Qt::UserRole,
         SortRole,
-        AssignmentStatusRole
+        AssignmentStatusRole,
     };
 
     enum AssignmentStatus {
         PartiallyAssigned,
-        FullyAssigned
+        FullyAssigned,
     };
 
     void setSemanticInfoBackEnd(AbstractSemanticInfoBackEnd*);

diff --git a/lib/shadowfilter.h b/lib/shadowfilter.h
@@ -48,7 +48,7 @@ class GWENVIEWLIB_EXPORT ShadowFilter : public QObject
         LeftEdge,
         TopEdge,
         RightEdge,
-        BottomEdge
+        BottomEdge,
     };
     explicit ShadowFilter(QWidget* parent);
     ~ShadowFilter() override;

diff --git a/lib/slideshow.cpp b/lib/slideshow.cpp
@@ -50,7 +50,7 @@ namespace Gwenview
 enum State {
     Paused,
     Started,
-    WaitForEndOfUrl
+    WaitForEndOfUrl,
 };
 
 /**

diff --git a/lib/slideshow.h b/lib/slideshow.h
@@ -42,7 +42,7 @@ class GWENVIEWLIB_EXPORT SlideShow : public QObject
     enum NavigationEndNotification {
         NeverWarn,
         WarnOnSlideshow,
-        AlwaysWarn
+        AlwaysWarn,
     };
     Q_ENUM(NavigationEndNotification)