GIT_SILENT: kdecorations: Port away from Q_ENUMS to Q_ENUM
Q_ENUMS has been deprecated since Qt 5.5.
This commit is contained in:
parent
1d8ebfa475
commit
e7dc64028c
2 changed files with 5 additions and 5 deletions
|
@ -17,9 +17,6 @@
|
|||
class ColorHelper : public QObject
|
||||
{
|
||||
Q_OBJECT
|
||||
Q_ENUMS(ShadeRole)
|
||||
Q_ENUMS(ForegroundRole)
|
||||
Q_ENUMS(BackgroundRole)
|
||||
/**
|
||||
* Same as KGlobalSettings::contrastF.
|
||||
*/
|
||||
|
@ -59,6 +56,7 @@ public:
|
|||
*/
|
||||
ShadowShade
|
||||
};
|
||||
Q_ENUM(ShadeRole)
|
||||
/**
|
||||
* This enumeration describes the background color being selected from the
|
||||
* given set.
|
||||
|
@ -120,6 +118,7 @@ public:
|
|||
*/
|
||||
PositiveBackground = 7
|
||||
};
|
||||
Q_ENUM(BackgroundRole)
|
||||
|
||||
/**
|
||||
* This enumeration describes the foreground color being selected from the
|
||||
|
@ -183,6 +182,7 @@ public:
|
|||
*/
|
||||
PositiveText = 7
|
||||
};
|
||||
Q_ENUM(ForegroundRole)
|
||||
/**
|
||||
* Retrieve the requested shade color, using the specified color as the
|
||||
* base color and the system contrast setting.
|
||||
|
|
|
@ -116,8 +116,6 @@ private:
|
|||
class DecorationOptions : public QObject
|
||||
{
|
||||
Q_OBJECT
|
||||
Q_ENUMS(BorderSize)
|
||||
Q_ENUMS(DecorationButton)
|
||||
/**
|
||||
* The decoration Object for which this set of options should be used. The decoration is
|
||||
* required to get the correct colors and fonts depending on whether the decoration represents
|
||||
|
@ -175,6 +173,7 @@ public:
|
|||
BorderVeryHuge, ///< Very huge borders
|
||||
BorderOversized ///< Oversized borders
|
||||
};
|
||||
Q_ENUM(BorderSize)
|
||||
/**
|
||||
* Enum values to identify the decorations buttons which should be used
|
||||
* by the decoration.
|
||||
|
@ -203,6 +202,7 @@ public:
|
|||
*/
|
||||
DecorationButtonExplicitSpacer
|
||||
};
|
||||
Q_ENUM(DecorationButton)
|
||||
explicit DecorationOptions(QObject *parent = nullptr);
|
||||
~DecorationOptions() override;
|
||||
|
||||
|
|
Loading…
Reference in a new issue