Add a trailing comma to enum

Should help produce better diffs and clang-format won't squash the enum
on one line.

GIT_SILENT
This commit is contained in:
Ahmad Samir 2021-03-05 20:08:12 +02:00
parent 52b9c9e94a
commit 9ae7d71b9a
16 changed files with 37 additions and 37 deletions

View File

@ -118,7 +118,7 @@ public:
Holiday = 1, Holiday = 1,
Event = 2, Event = 2,
Todo = 4, Todo = 4,
Journal = 8 Journal = 8,
}; };
Q_ENUM(Type) Q_ENUM(Type)
Q_DECLARE_FLAGS(Types, Type) Q_DECLARE_FLAGS(Types, Type)
@ -126,7 +126,7 @@ public:
enum DateMatchingPrecision { enum DateMatchingPrecision {
MatchYear, MatchYear,
MatchYearAndMonth, MatchYearAndMonth,
MatchYearMonthAndDay MatchYearMonthAndDay,
}; };
Q_ENUM(DateMatchingPrecision) Q_ENUM(DateMatchingPrecision)

View File

@ -29,7 +29,7 @@ public:
Holiday = 1, Holiday = 1,
Event = 2, Event = 2,
Todo = 4, Todo = 4,
Journal = 8 Journal = 8,
}; };
Q_ENUM(Type) Q_ENUM(Type)
Q_DECLARE_FLAGS(Types, Type) Q_DECLARE_FLAGS(Types, Type)

View File

@ -30,7 +30,7 @@ public:
//containsJournalItems, //containsJournalItems,
dayNumber, dayNumber,
monthNumber, monthNumber,
yearNumber yearNumber,
}; };
explicit DaysModel(QObject *parent = nullptr); explicit DaysModel(QObject *parent = nullptr);

View File

@ -38,7 +38,7 @@ public:
enum Change { enum Change {
NoChange = 0, NoChange = 0,
DataEngineChanged = 1, DataEngineChanged = 1,
SourcesChanged = 2 SourcesChanged = 2,
}; };
Q_DECLARE_FLAGS(Changes, Change) Q_DECLARE_FLAGS(Changes, Change)

View File

@ -69,7 +69,7 @@ public:
FastStretch, FastStretch,
//on resize re-render the part of the frame from the SVG //on resize re-render the part of the frame from the SVG
Stretch, Stretch,
Tile Tile,
}; };
FrameItemNode(FrameSvgItem* frameSvg, FrameSvg::EnabledBorders borders, FitMode fitMode, QSGNode* parent) FrameItemNode(FrameSvgItem* frameSvg, FrameSvg::EnabledBorders borders, FitMode fitMode, QSGNode* parent)

View File

@ -18,7 +18,7 @@ public:
Opening, Opening,
Open, Open,
Closing, Closing,
Closed Closed,
}; };
Q_ENUM(Status) Q_ENUM(Status)
}; };
@ -33,7 +33,7 @@ public:
LockPortrait, LockPortrait,
LockLandscape, LockLandscape,
LockPrevious, LockPrevious,
Manual Manual,
}; };
Q_ENUM(Orientation) Q_ENUM(Orientation)
}; };
@ -47,7 +47,7 @@ public:
Inactive, Inactive,
Activating, Activating,
Active, Active,
Deactivating Deactivating,
}; };
Q_ENUM(Status) Q_ENUM(Status)
}; };

View File

@ -29,7 +29,7 @@ import "private" as Private
/** /**
* Indicates that it's used as a footer of the plasmoid, touching the bottom border * Indicates that it's used as a footer of the plasmoid, touching the bottom border
*/ */
Footer Footer,
} }
/** /**

View File

@ -76,7 +76,7 @@ public:
BottomBorder = 2, BottomBorder = 2,
LeftBorder = 4, LeftBorder = 4,
RightBorder = 8, RightBorder = 8,
AllBorders = TopBorder | BottomBorder | LeftBorder | RightBorder AllBorders = TopBorder | BottomBorder | LeftBorder | RightBorder,
}; };
Q_DECLARE_FLAGS(EnabledBorders, EnabledBorder) Q_DECLARE_FLAGS(EnabledBorders, EnabledBorder)
Q_FLAG(EnabledBorders) Q_FLAG(EnabledBorders)

View File

@ -46,7 +46,7 @@ public:
ContextConstraint = 32, /**< the context (e.g. activity) has changed */ ContextConstraint = 32, /**< the context (e.g. activity) has changed */
UiReadyConstraint = 64, /**< The ui has been completely loaded */ // (FIXME: merged with StartupCompletedConstraint?) UiReadyConstraint = 64, /**< The ui has been completely loaded */ // (FIXME: merged with StartupCompletedConstraint?)
AllConstraints = FormFactorConstraint | LocationConstraint | ScreenConstraint | AllConstraints = FormFactorConstraint | LocationConstraint | ScreenConstraint |
ImmutableConstraint ImmutableConstraint,
}; };
Q_ENUM(Constraint) Q_ENUM(Constraint)
Q_DECLARE_FLAGS(Constraints, Constraint) Q_DECLARE_FLAGS(Constraints, Constraint)
@ -83,7 +83,7 @@ public:
can expand horizontally. */ can expand horizontally. */
Vertical, /**< The applet is constrained horizontally, but Vertical, /**< The applet is constrained horizontally, but
can expand vertically. */ can expand vertically. */
Application /**< The Applet lives in a plane and should be optimized to look as a full application, Application, /**< The Applet lives in a plane and should be optimized to look as a full application,
for the desktop or the particular device. */ for the desktop or the particular device. */
}; };
Q_ENUM(FormFactor) Q_ENUM(FormFactor)
@ -96,7 +96,7 @@ public:
NoContainmentDisplayHint = 0, NoContainmentDisplayHint = 0,
ContainmentDrawsPlasmoidHeading = 1, /**< The containment will draw an titlebar-looking header for the applets, so the applets shouldn't attempt to paint a similar thing **/ ContainmentDrawsPlasmoidHeading = 1, /**< The containment will draw an titlebar-looking header for the applets, so the applets shouldn't attempt to paint a similar thing **/
ContainmentForcesSquarePlasmoids = 2, /**< The containment will force every plasmoid to be constrained in a square icon (An example is the System Tray)**/ ContainmentForcesSquarePlasmoids = 2, /**< The containment will force every plasmoid to be constrained in a square icon (An example is the System Tray)**/
DesktopFullyCovered = 4 /**< The desktop area for the contaiment's screen is not visible at all, for instance a window has been maximized on top of it */ DesktopFullyCovered = 4, /**< The desktop area for the contaiment's screen is not visible at all, for instance a window has been maximized on top of it */
}; };
Q_ENUM(ContainmentDisplayHint) Q_ENUM(ContainmentDisplayHint)
Q_DECLARE_FLAGS(ContainmentDisplayHints, ContainmentDisplayHint) Q_DECLARE_FLAGS(ContainmentDisplayHints, ContainmentDisplayHint)
@ -115,7 +115,7 @@ public:
CustomContainment = 127, /**< A containment that is neither a desktop nor a panel CustomContainment = 127, /**< A containment that is neither a desktop nor a panel
but something application specific */ but something application specific */
CustomPanelContainment = 128, /**< A customized desktop panel */ CustomPanelContainment = 128, /**< A customized desktop panel */
CustomEmbeddedContainment = 129 /**< A customized containment embedded in another applet */ CustomEmbeddedContainment = 129, /**< A customized containment embedded in another applet */
}; };
Q_ENUM(ContainmentType) Q_ENUM(ContainmentType)
@ -128,7 +128,7 @@ public:
ControlAction = 200, /**< Generic control, similar to ConfigureAction TODO: better doc */ ControlAction = 200, /**< Generic control, similar to ConfigureAction TODO: better doc */
MiscAction = 300, /**< A type of action that doesn't fit in the other categories */ MiscAction = 300, /**< A type of action that doesn't fit in the other categories */
DestructiveAction = 400, /**< A dangerous action, such as deletion of objects, plasmoids and files. They are intended to be shown separated from other actions */ DestructiveAction = 400, /**< A dangerous action, such as deletion of objects, plasmoids and files. They are intended to be shown separated from other actions */
UserAction = DestructiveAction + 1000 /**< If new types are needed in a C++ implementation, define them as ids more than UserAction*/ UserAction = DestructiveAction + 1000, /**< If new types are needed in a C++ implementation, define them as ids more than UserAction*/
}; };
Q_ENUM(ActionType) Q_ENUM(ActionType)
@ -142,7 +142,7 @@ public:
Down = 0, /**< Display downards */ Down = 0, /**< Display downards */
Up, /**< Display upwards */ Up, /**< Display upwards */
Left, /**< Display to the left */ Left, /**< Display to the left */
Right /**< Display to the right */ Right, /**< Display to the right */
}; };
Q_ENUM(Direction) Q_ENUM(Direction)
@ -159,7 +159,7 @@ public:
TopEdge, /**< Along the top of the screen*/ TopEdge, /**< Along the top of the screen*/
BottomEdge, /**< Along the bottom of the screen*/ BottomEdge, /**< Along the bottom of the screen*/
LeftEdge, /**< Along the left side of the screen */ LeftEdge, /**< Along the left side of the screen */
RightEdge /**< Along the right side of the screen */ RightEdge, /**< Along the right side of the screen */
}; };
Q_ENUM(Location) Q_ENUM(Location)
@ -172,7 +172,7 @@ public:
RightPositioned, /**< Positioned right */ RightPositioned, /**< Positioned right */
TopPositioned, /**< Positioned top */ TopPositioned, /**< Positioned top */
BottomPositioned, /**< Positioned bottom */ BottomPositioned, /**< Positioned bottom */
CenterPositioned /**< Positioned in the center */ CenterPositioned, /**< Positioned in the center */
}; };
Q_ENUM(Position) Q_ENUM(Position)
@ -196,7 +196,7 @@ public:
to the right of the widget */ to the right of the widget */
RightPosedTopAlignedPopup, /**< Popup positioned on the right, aligned RightPosedTopAlignedPopup, /**< Popup positioned on the right, aligned
to the top of the widget */ to the top of the widget */
RightPosedBottomAlignedPopup /**< Popup positioned on the right, aligned RightPosedBottomAlignedPopup, /**< Popup positioned on the right, aligned
to the bottom of the widget */ to the bottom of the widget */
}; };
Q_ENUM(PopupPlacement) Q_ENUM(PopupPlacement)
@ -207,7 +207,7 @@ public:
enum FlipDirection { enum FlipDirection {
NoFlip = 0, /**< Do not flip */ NoFlip = 0, /**< Do not flip */
HorizontalFlip = 1, /**< Flip horizontally */ HorizontalFlip = 1, /**< Flip horizontally */
VerticalFlip = 2 /**< Flip vertically */ VerticalFlip = 2, /**< Flip vertically */
}; };
Q_ENUM(FlipDirection) Q_ENUM(FlipDirection)
Q_DECLARE_FLAGS(Flip, FlipDirection) Q_DECLARE_FLAGS(Flip, FlipDirection)
@ -218,7 +218,7 @@ public:
enum IntervalAlignment { enum IntervalAlignment {
NoAlignment = 0, /**< No alignment **/ NoAlignment = 0, /**< No alignment **/
AlignToMinute, /**< Align to the minute **/ AlignToMinute, /**< Align to the minute **/
AlignToHour /**< Align to the hour **/ AlignToHour, /**< Align to the hour **/
}; };
Q_ENUM(IntervalAlignment) Q_ENUM(IntervalAlignment)
@ -231,7 +231,7 @@ public:
Mutable = 1, /**< The item can be modified in any way **/ Mutable = 1, /**< The item can be modified in any way **/
UserImmutable = 2, /**< The user has requested a lock down, and can undo UserImmutable = 2, /**< The user has requested a lock down, and can undo
the lock down at any time **/ the lock down at any time **/
SystemImmutable = 4 /**< the item is locked down by the system, the user SystemImmutable = 4, /**< the item is locked down by the system, the user
can't unlock it **/ can't unlock it **/
}; };
Q_ENUM(ImmutabilityType) Q_ENUM(ImmutabilityType)
@ -245,7 +245,7 @@ public:
DataEngineComponent = 2, /**< Plasma::DataEngine based plugins **/ DataEngineComponent = 2, /**< Plasma::DataEngine based plugins **/
ContainmentComponent = 4,/**< Plasma::Containment based plugins **/ ContainmentComponent = 4,/**< Plasma::Containment based plugins **/
WallpaperComponent = 8, /**< Plasma::Wallpaper based plugins **/ WallpaperComponent = 8, /**< Plasma::Wallpaper based plugins **/
GenericComponent = 16 /** Generic repositories of files, usually they keep QML files and their assets **/ GenericComponent = 16, /** Generic repositories of files, usually they keep QML files and their assets **/
}; };
Q_ENUM(ComponentType) Q_ENUM(ComponentType)
Q_DECLARE_FLAGS(ComponentTypes, ComponentType) Q_DECLARE_FLAGS(ComponentTypes, ComponentType)
@ -254,7 +254,7 @@ public:
TopMargin = 0, /**< The top margin **/ TopMargin = 0, /**< The top margin **/
BottomMargin, /**< The bottom margin **/ BottomMargin, /**< The bottom margin **/
LeftMargin, /**< The left margin **/ LeftMargin, /**< The left margin **/
RightMargin /**< The right margin **/ RightMargin, /**< The right margin **/
}; };
Q_ENUM(MarginEdge) Q_ENUM(MarginEdge)
@ -270,7 +270,7 @@ public:
RequiresAttentionStatus = 4, /**< The Item needs persistent attention **/ RequiresAttentionStatus = 4, /**< The Item needs persistent attention **/
AcceptingInputStatus = 5, /**< The Item is accepting input **/ AcceptingInputStatus = 5, /**< The Item is accepting input **/
//FIXME KF6: this should be the smallest status //FIXME KF6: this should be the smallest status
HiddenStatus = 6 /**< The Item will be hidden totally **/ HiddenStatus = 6, /**< The Item will be hidden totally **/
}; };
Q_ENUM(ItemStatus) Q_ENUM(ItemStatus)
@ -283,7 +283,7 @@ public:
user's own keys*/ user's own keys*/
SelfTrusted, /**< The signature is valid and made with one of the user's own keys*/ SelfTrusted, /**< The signature is valid and made with one of the user's own keys*/
FullyTrusted, /**< The signature is valid and made with a key signed by the vendor's key*/ FullyTrusted, /**< The signature is valid and made with a key signed by the vendor's key*/
UltimatelyTrusted /**< The signature is valid and made with the vendor's key*/ UltimatelyTrusted, /**< The signature is valid and made with the vendor's key*/
}; };
Q_ENUM(TrustLevel) Q_ENUM(TrustLevel)
@ -296,7 +296,7 @@ public:
TranslucentBackground = 2, /**< An alternate version of the background is drawn, usually more translucent */ TranslucentBackground = 2, /**< An alternate version of the background is drawn, usually more translucent */
ShadowBackground = 4, /**< The applet won't have a svg background but a drop shadow of its content done via a shader */ ShadowBackground = 4, /**< The applet won't have a svg background but a drop shadow of its content done via a shader */
ConfigurableBackground = 8, /** If the hint has this flag, the user is able to configure this background */ ConfigurableBackground = 8, /** If the hint has this flag, the user is able to configure this background */
DefaultBackground = StandardBackground /**< Default settings: both standard background */ DefaultBackground = StandardBackground, /**< Default settings: both standard background */
}; };
Q_ENUM(BackgroundHints) Q_ENUM(BackgroundHints)
//TODO KF6: BackgroundHint and BackgroundHints //TODO KF6: BackgroundHint and BackgroundHints

View File

@ -142,7 +142,7 @@ public:
enum UpdateType { enum UpdateType {
UpdateFrame, UpdateFrame,
UpdateFrameAndMargins UpdateFrameAndMargins,
}; };
void generateBackground(const QSharedPointer<FrameData> &frame); void generateBackground(const QSharedPointer<FrameData> &frame);

View File

@ -41,7 +41,7 @@ static const int DEFAULT_WALLPAPER_HEIGHT = 1200;
enum CacheType { enum CacheType {
NoCache = 0, NoCache = 0,
PixmapCache = 1, PixmapCache = 1,
SvgElementsCache = 2 SvgElementsCache = 2,
}; };
Q_DECLARE_FLAGS(CacheTypes, CacheType) Q_DECLARE_FLAGS(CacheTypes, CacheType)
Q_DECLARE_OPERATORS_FOR_FLAGS(CacheTypes) Q_DECLARE_OPERATORS_FOR_FLAGS(CacheTypes)

View File

@ -54,7 +54,7 @@ class PLASMA_EXPORT Svg : public QObject
public: public:
enum Status { enum Status {
Normal = 0, Normal = 0,
Selected Selected,
}; };
Q_ENUM(Status) Q_ENUM(Status)

View File

@ -70,7 +70,7 @@ public:
PositiveTextColor = 8, /**< color of foreground objects with a "positive message" connotation (usually green) */ PositiveTextColor = 8, /**< color of foreground objects with a "positive message" connotation (usually green) */
NeutralTextColor = 9, /**< color of foreground objects with a "neutral message" connotation (usually yellow) */ NeutralTextColor = 9, /**< color of foreground objects with a "neutral message" connotation (usually yellow) */
NegativeTextColor = 10, /**< color of foreground objects with a "negative message" connotation (usually red) */ NegativeTextColor = 10, /**< color of foreground objects with a "negative message" connotation (usually red) */
DisabledTextColor = 11 /**< color of disabled text @since 5.64 */ DisabledTextColor = 11, /**< color of disabled text @since 5.64 */
}; };
enum ColorGroup { enum ColorGroup {
@ -79,7 +79,7 @@ public:
ViewColorGroup = 2, ViewColorGroup = 2,
ComplementaryColorGroup = 3, ComplementaryColorGroup = 3,
HeaderColorGroup, HeaderColorGroup,
ToolTipColorGroup ToolTipColorGroup,
}; };
Q_ENUM(ColorGroup) Q_ENUM(ColorGroup)

View File

@ -58,7 +58,7 @@ public:
SourceRole, SourceRole,
PluginNameRole, PluginNameRole,
VisibleRole, VisibleRole,
KCMRole KCMRole,
}; };
explicit ConfigModel(QObject *parent = nullptr); explicit ConfigModel(QObject *parent = nullptr);
~ConfigModel() override; ~ConfigModel() override;

View File

@ -153,7 +153,7 @@ public:
Tooltip = NET::Tooltip, Tooltip = NET::Tooltip,
Notification = NET::Notification, Notification = NET::Notification,
OnScreenDisplay = NET::OnScreenDisplay, OnScreenDisplay = NET::OnScreenDisplay,
CriticalNotification = NET::CriticalNotification CriticalNotification = NET::CriticalNotification,
}; };
Q_ENUM(WindowType) Q_ENUM(WindowType)

View File

@ -48,14 +48,14 @@ public:
DefaultLauncherPreloadWeight = 100, DefaultLauncherPreloadWeight = 100,
DelayedPreloadWeight = 25, DelayedPreloadWeight = 25,
PreloadWeightIncrement = 5, PreloadWeightIncrement = 5,
PreloadWeightDecrement = 8 PreloadWeightDecrement = 8,
}; };
enum PreloadPolicy { enum PreloadPolicy {
Uninitialized = -1, Uninitialized = -1,
None = 0, None = 0,
Adaptive = 1, Adaptive = 1,
Aggressive = 2 Aggressive = 2,
}; };
AppletQuickItemPrivate(Plasma::Applet *a, AppletQuickItem *item); AppletQuickItemPrivate(Plasma::Applet *a, AppletQuickItem *item);