From 7dec4643f74977fc68ae0f55efed988f8555f78f Mon Sep 17 00:00:00 2001 From: Vlad Zagorodniy Date: Fri, 21 Dec 2018 02:24:32 +0200 Subject: [PATCH] [libkwineffects] Use Q_ENUM in AnimationEffect Summary: Q_ENUMS is deprecated. Test Plan: The Window Aperture effect still works. Reviewers: #kwin, davidedmundson Reviewed By: #kwin, davidedmundson Subscribers: kwin Tags: #kwin Differential Revision: https://phabricator.kde.org/D17587 --- libkwineffects/kwinanimationeffect.h | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/libkwineffects/kwinanimationeffect.h b/libkwineffects/kwinanimationeffect.h index dcb21576f6..c63592822f 100644 --- a/libkwineffects/kwinanimationeffect.h +++ b/libkwineffects/kwinanimationeffect.h @@ -94,21 +94,24 @@ class AnimationEffectPrivate; class KWINEFFECTS_EXPORT AnimationEffect : public Effect { Q_OBJECT - Q_ENUMS(Anchor) - Q_ENUMS(Attribute) - Q_ENUMS(MetaType) + public: typedef QMap< EffectWindow*, QPair, QRect> > AniMap; enum Anchor { Left = 1<<0, Top = 1<<1, Right = 1<<2, Bottom = 1<<3, Horizontal = Left|Right, Vertical = Top|Bottom, Mouse = 1<<4 }; + Q_ENUM(Anchor) + enum Attribute { Opacity = 0, Brightness, Saturation, Scale, Rotation, Position, Size, Translation, Clip, Generic, CrossFadePrevious, NonFloatBase = Position }; + Q_ENUM(Attribute) + enum MetaType { SourceAnchor, TargetAnchor, RelativeSourceX, RelativeSourceY, RelativeTargetX, RelativeTargetY, Axis }; + Q_ENUM(MetaType) /** * This enum type is used to specify the direction of the animation.