QtWidgets: use Q_ENUM instead of Q_ENUMS

Change-Id: Id5280c1d9feab95e1506569f3d0eb23eeb74935f
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>

17 files changed, 27 insertions, 22 deletions

diff --git a/src/widgets/widgets/qabstractscrollarea.h b/src/widgets/widgets/qabstractscrollarea.h
index 6a9a86b07f..9ce8d286b7 100644
--- a/src/widgets/widgets/qabstractscrollarea.h
+++ b/src/widgets/widgets/qabstractscrollarea.h
@@ -49,7 +49,6 @@ class Q_WIDGETS_EXPORT QAbstractScrollArea : public QFrame
 {
     Q_OBJECT
 
-    Q_ENUMS(SizeAdjustPolicy)
     Q_PROPERTY(Qt::ScrollBarPolicy verticalScrollBarPolicy READ verticalScrollBarPolicy WRITE setVerticalScrollBarPolicy)
     Q_PROPERTY(Qt::ScrollBarPolicy horizontalScrollBarPolicy READ horizontalScrollBarPolicy WRITE setHorizontalScrollBarPolicy)
     Q_PROPERTY(SizeAdjustPolicy sizeAdjustPolicy READ sizeAdjustPolicy WRITE setSizeAdjustPolicy)
@@ -63,6 +62,7 @@ public:
         AdjustToContentsOnFirstShow,
         AdjustToContents
     };
+    Q_ENUM(SizeAdjustPolicy)
 
     Qt::ScrollBarPolicy verticalScrollBarPolicy() const;
     void setVerticalScrollBarPolicy(Qt::ScrollBarPolicy);
diff --git a/src/widgets/widgets/qabstractspinbox.h b/src/widgets/widgets/qabstractspinbox.h
index 8fcb5eadf0..234c06bb10 100644
--- a/src/widgets/widgets/qabstractspinbox.h
+++ b/src/widgets/widgets/qabstractspinbox.h
@@ -51,8 +51,6 @@ class Q_WIDGETS_EXPORT QAbstractSpinBox : public QWidget
 {
     Q_OBJECT
 
-    Q_ENUMS(ButtonSymbols)
-    Q_ENUMS(CorrectionMode)
     Q_PROPERTY(bool wrapping READ wrapping WRITE setWrapping)
     Q_PROPERTY(bool frame READ hasFrame WRITE setFrame)
     Q_PROPERTY(Qt::Alignment alignment READ alignment WRITE setAlignment)
@@ -74,11 +72,13 @@ public:
     Q_DECLARE_FLAGS(StepEnabled, StepEnabledFlag)
 
     enum ButtonSymbols { UpDownArrows, PlusMinus, NoButtons };
+    Q_ENUM(ButtonSymbols)
 
     ButtonSymbols buttonSymbols() const;
     void setButtonSymbols(ButtonSymbols bs);
 
     enum CorrectionMode  { CorrectToPreviousValue, CorrectToNearestValue };
+    Q_ENUM(CorrectionMode)
 
     void setCorrectionMode(CorrectionMode cm);
     CorrectionMode correctionMode() const;
diff --git a/src/widgets/widgets/qcalendarwidget.h b/src/widgets/widgets/qcalendarwidget.h
index f039fdf6c9..7914b13fba 100644
--- a/src/widgets/widgets/qcalendarwidget.h
+++ b/src/widgets/widgets/qcalendarwidget.h
@@ -50,9 +50,6 @@ class Q_WIDGETS_EXPORT QCalendarWidget : public QWidget
 {
     Q_OBJECT
     Q_ENUMS(Qt::DayOfWeek)
-    Q_ENUMS(HorizontalHeaderFormat)
-    Q_ENUMS(VerticalHeaderFormat)
-    Q_ENUMS(SelectionMode)
     Q_PROPERTY(QDate selectedDate READ selectedDate WRITE setSelectedDate)
     Q_PROPERTY(QDate minimumDate READ minimumDate WRITE setMinimumDate)
     Q_PROPERTY(QDate maximumDate READ maximumDate WRITE setMaximumDate)
@@ -72,16 +69,19 @@ public:
         ShortDayNames,
         LongDayNames
     };
+    Q_ENUM(HorizontalHeaderFormat)
 
     enum VerticalHeaderFormat {
         NoVerticalHeader,
         ISOWeekNumbers
     };
+    Q_ENUM(VerticalHeaderFormat)
 
     enum SelectionMode {
         NoSelection,
         SingleSelection
     };
+    Q_ENUM(SelectionMode)
 
     explicit QCalendarWidget(QWidget *parent = 0);
     ~QCalendarWidget();
diff --git a/src/widgets/widgets/qcombobox.h b/src/widgets/widgets/qcombobox.h
index 7e399ec1f5..9c83d4dd08 100644
--- a/src/widgets/widgets/qcombobox.h
+++ b/src/widgets/widgets/qcombobox.h
@@ -52,8 +52,6 @@ class Q_WIDGETS_EXPORT QComboBox : public QWidget
 {
     Q_OBJECT
 
-    Q_ENUMS(InsertPolicy)
-    Q_ENUMS(SizeAdjustPolicy)
     Q_PROPERTY(bool editable READ isEditable WRITE setEditable)
     Q_PROPERTY(int count READ count)
     Q_PROPERTY(QString currentText READ currentText WRITE setCurrentText NOTIFY currentTextChanged USER true)
@@ -115,6 +113,7 @@ public:
         InsertBeforeCurrent,
         InsertAlphabetically
     };
+    Q_ENUM(InsertPolicy)
 
     InsertPolicy insertPolicy() const;
     void setInsertPolicy(InsertPolicy policy);
@@ -125,6 +124,7 @@ public:
         AdjustToMinimumContentsLength, // ### Qt 6: remove
         AdjustToMinimumContentsLengthWithIcon
     };
+    Q_ENUM(SizeAdjustPolicy)
 
     SizeAdjustPolicy sizeAdjustPolicy() const;
     void setSizeAdjustPolicy(SizeAdjustPolicy policy);
diff --git a/src/widgets/widgets/qdatetimeedit.h b/src/widgets/widgets/qdatetimeedit.h
index 5a1d6dbf3f..2d37bd4351 100644
--- a/src/widgets/widgets/qdatetimeedit.h
+++ b/src/widgets/widgets/qdatetimeedit.h
@@ -51,7 +51,6 @@ class Q_WIDGETS_EXPORT QDateTimeEdit : public QAbstractSpinBox
 {
     Q_OBJECT
 
-    Q_ENUMS(Section)
     Q_FLAGS(Sections)
     Q_PROPERTY(QDateTime dateTime READ dateTime WRITE setDateTime NOTIFY dateTimeChanged USER true)
     Q_PROPERTY(QDate date READ date WRITE setDate NOTIFY dateChanged)
@@ -83,6 +82,7 @@ public:
         TimeSections_Mask = AmPmSection|MSecSection|SecondSection|MinuteSection|HourSection,
         DateSections_Mask = DaySection|MonthSection|YearSection
     };
+    Q_ENUM(Section)
 
     Q_DECLARE_FLAGS(Sections, Section)
 
diff --git a/src/widgets/widgets/qframe.h b/src/widgets/widgets/qframe.h
index 90e434722e..41fd3a92b6 100644
--- a/src/widgets/widgets/qframe.h
+++ b/src/widgets/widgets/qframe.h
@@ -46,7 +46,6 @@ class Q_WIDGETS_EXPORT QFrame : public QWidget
 {
     Q_OBJECT
 
-    Q_ENUMS(Shape Shadow)
     Q_PROPERTY(Shape frameShape READ frameShape WRITE setFrameShape)
     Q_PROPERTY(Shadow frameShadow READ frameShadow WRITE setFrameShadow)
     Q_PROPERTY(int lineWidth READ lineWidth WRITE setLineWidth)
@@ -74,11 +73,13 @@ public:
         VLine = 0x0005, // vertical line
         StyledPanel = 0x0006 // rectangular panel depending on the GUI style
     };
+    Q_ENUM(Shape)
     enum Shadow {
         Plain = 0x0010, // plain line
         Raised = 0x0020, // raised shadow effect
         Sunken = 0x0030 // sunken shadow effect
     };
+    Q_ENUM(Shadow)
 
     enum StyleMask {
         Shadow_Mask = 0x00f0, // mask for the shadow
diff --git a/src/widgets/widgets/qlcdnumber.h b/src/widgets/widgets/qlcdnumber.h
index 6acba3f7c1..59aad073f1 100644
--- a/src/widgets/widgets/qlcdnumber.h
+++ b/src/widgets/widgets/qlcdnumber.h
@@ -45,7 +45,6 @@ class QLCDNumberPrivate;
 class Q_WIDGETS_EXPORT QLCDNumber : public QFrame // LCD number widget
 {
     Q_OBJECT
-    Q_ENUMS(Mode SegmentStyle)
     Q_PROPERTY(bool smallDecimalPoint READ smallDecimalPoint WRITE setSmallDecimalPoint)
     Q_PROPERTY(int digitCount READ digitCount WRITE setDigitCount)
     Q_PROPERTY(Mode mode READ mode WRITE setMode)
@@ -61,9 +60,11 @@ public:
     enum Mode {
         Hex, Dec, Oct, Bin
     };
+    Q_ENUM(Mode)
     enum SegmentStyle {
         Outline, Filled, Flat
     };
+    Q_ENUM(SegmentStyle)
 
     bool smallDecimalPoint() const;
     int digitCount() const;
diff --git a/src/widgets/widgets/qlineedit.h b/src/widgets/widgets/qlineedit.h
index bfbf9fe670..c1e873f02a 100644
--- a/src/widgets/widgets/qlineedit.h
+++ b/src/widgets/widgets/qlineedit.h
@@ -58,7 +58,6 @@ class Q_WIDGETS_EXPORT QLineEdit : public QWidget
 {
     Q_OBJECT
 
-    Q_ENUMS(ActionPosition EchoMode)
     Q_PROPERTY(QString inputMask READ inputMask WRITE setInputMask)
     Q_PROPERTY(QString text READ text WRITE setText NOTIFY textChanged USER true)
     Q_PROPERTY(int maxLength READ maxLength WRITE setMaxLength)
@@ -83,6 +82,7 @@ public:
         LeadingPosition,
         TrailingPosition
     };
+    Q_ENUM(ActionPosition)
 
     explicit QLineEdit(QWidget* parent=0);
     explicit QLineEdit(const QString &, QWidget* parent=0);
@@ -105,6 +105,7 @@ public:
     bool isClearButtonEnabled() const;
 
     enum EchoMode { Normal, NoEcho, Password, PasswordEchoOnEdit };
+    Q_ENUM(EchoMode)
     EchoMode echoMode() const;
     void setEchoMode(EchoMode);
 
diff --git a/src/widgets/widgets/qmainwindow.h b/src/widgets/widgets/qmainwindow.h
index 717bc32739..a1f7df2f4e 100644
--- a/src/widgets/widgets/qmainwindow.h
+++ b/src/widgets/widgets/qmainwindow.h
@@ -53,7 +53,6 @@ class Q_WIDGETS_EXPORT QMainWindow : public QWidget
 {
     Q_OBJECT
 
-    Q_ENUMS(DockOption)
     Q_FLAGS(DockOptions)
     Q_PROPERTY(QSize iconSize READ iconSize WRITE setIconSize)
     Q_PROPERTY(Qt::ToolButtonStyle toolButtonStyle READ toolButtonStyle WRITE setToolButtonStyle)
@@ -80,6 +79,7 @@ public:
         ForceTabbedDocks = 0x08,  // implies AllowTabbedDocks, !AllowNestedDocks
         VerticalTabs = 0x10       // implies AllowTabbedDocks
     };
+    Q_ENUM(DockOption)
     Q_DECLARE_FLAGS(DockOptions, DockOption)
 
     explicit QMainWindow(QWidget *parent = 0, Qt::WindowFlags flags = 0);
diff --git a/src/widgets/widgets/qmdiarea.h b/src/widgets/widgets/qmdiarea.h
index b824cfb4ae..19deabddf8 100644
--- a/src/widgets/widgets/qmdiarea.h
+++ b/src/widgets/widgets/qmdiarea.h
@@ -48,7 +48,6 @@ class QMdiAreaPrivate;
 class Q_WIDGETS_EXPORT QMdiArea : public QAbstractScrollArea
 {
     Q_OBJECT
-    Q_ENUMS(ViewMode)
     Q_PROPERTY(QBrush background READ background WRITE setBackground)
     Q_PROPERTY(WindowOrder activationOrder READ activationOrder WRITE setActivationOrder)
     Q_PROPERTY(ViewMode viewMode READ viewMode WRITE setViewMode)
@@ -61,7 +60,6 @@ class Q_WIDGETS_EXPORT QMdiArea : public QAbstractScrollArea
     Q_PROPERTY(QTabWidget::TabShape tabShape READ tabShape WRITE setTabShape)
     Q_PROPERTY(QTabWidget::TabPosition tabPosition READ tabPosition WRITE setTabPosition)
 #endif
-    Q_ENUMS(WindowOrder)
 public:
     enum AreaOption {
         DontMaximizeSubWindowOnActivation = 0x1
@@ -73,11 +71,13 @@ public:
         StackingOrder,
         ActivationHistoryOrder
     };
+    Q_ENUM(WindowOrder)
 
     enum ViewMode {
         SubWindowView,
         TabbedView
     };
+    Q_ENUM(ViewMode)
 
     QMdiArea(QWidget *parent = 0);
     ~QMdiArea();
diff --git a/src/widgets/widgets/qplaintextedit.h b/src/widgets/widgets/qplaintextedit.h
index c47da891c8..bb9ecc9886 100644
--- a/src/widgets/widgets/qplaintextedit.h
+++ b/src/widgets/widgets/qplaintextedit.h
@@ -59,7 +59,6 @@ class Q_WIDGETS_EXPORT QPlainTextEdit : public QAbstractScrollArea
 {
     Q_OBJECT
     Q_DECLARE_PRIVATE(QPlainTextEdit)
-    Q_ENUMS(LineWrapMode)
     Q_PROPERTY(bool tabChangesFocus READ tabChangesFocus WRITE setTabChangesFocus)
     Q_PROPERTY(QString documentTitle READ documentTitle WRITE setDocumentTitle)
     Q_PROPERTY(bool undoRedoEnabled READ isUndoRedoEnabled WRITE setUndoRedoEnabled)
@@ -81,6 +80,7 @@ public:
         NoWrap,
         WidgetWidth
     };
+    Q_ENUM(LineWrapMode)
 
     explicit QPlainTextEdit(QWidget *parent = 0);
     explicit QPlainTextEdit(const QString &text, QWidget *parent = 0);
diff --git a/src/widgets/widgets/qprogressbar.h b/src/widgets/widgets/qprogressbar.h
index 898656f8f4..7e1a04bd7b 100644
--- a/src/widgets/widgets/qprogressbar.h
+++ b/src/widgets/widgets/qprogressbar.h
@@ -47,7 +47,6 @@ class QStyleOptionProgressBar;
 class Q_WIDGETS_EXPORT QProgressBar : public QWidget
 {
     Q_OBJECT
-    Q_ENUMS(Direction)
     Q_PROPERTY(int minimum READ minimum WRITE setMinimum)
     Q_PROPERTY(int maximum READ maximum WRITE setMaximum)
     Q_PROPERTY(QString text READ text)
@@ -61,6 +60,7 @@ class Q_WIDGETS_EXPORT QProgressBar : public QWidget
 
 public:
     enum Direction { TopToBottom, BottomToTop };
+    Q_ENUM(Direction)
 
     explicit QProgressBar(QWidget *parent = 0);
     ~QProgressBar();
diff --git a/src/widgets/widgets/qslider.h b/src/widgets/widgets/qslider.h
index 66b23e6fa3..6191e7fcab 100644
--- a/src/widgets/widgets/qslider.h
+++ b/src/widgets/widgets/qslider.h
@@ -47,7 +47,6 @@ class Q_WIDGETS_EXPORT QSlider : public QAbstractSlider
 {
     Q_OBJECT
 
-    Q_ENUMS(TickPosition)
     Q_PROPERTY(TickPosition tickPosition READ tickPosition WRITE setTickPosition)
     Q_PROPERTY(int tickInterval READ tickInterval WRITE setTickInterval)
 
@@ -60,6 +59,7 @@ public:
         TicksRight = TicksBelow,
         TicksBothSides = 3
     };
+    Q_ENUM(TickPosition)
 
     explicit QSlider(QWidget *parent = 0);
     explicit QSlider(Qt::Orientation orientation, QWidget *parent = 0);
diff --git a/src/widgets/widgets/qtabbar.h b/src/widgets/widgets/qtabbar.h
index 5cca289020..70cb02eb72 100644
--- a/src/widgets/widgets/qtabbar.h
+++ b/src/widgets/widgets/qtabbar.h
@@ -49,7 +49,6 @@ class Q_WIDGETS_EXPORT QTabBar: public QWidget
 {
     Q_OBJECT
 
-    Q_ENUMS(Shape)
     Q_PROPERTY(Shape shape READ shape WRITE setShape)
     Q_PROPERTY(int currentIndex READ currentIndex WRITE setCurrentIndex NOTIFY currentChanged)
     Q_PROPERTY(int count READ count)
@@ -72,6 +71,7 @@ public:
     enum Shape { RoundedNorth, RoundedSouth, RoundedWest, RoundedEast,
                  TriangularNorth, TriangularSouth, TriangularWest, TriangularEast
     };
+    Q_ENUM(Shape)
 
     enum ButtonPosition {
         LeftSide,
diff --git a/src/widgets/widgets/qtabwidget.h b/src/widgets/widgets/qtabwidget.h
index dc5c49c99c..4913a2197a 100644
--- a/src/widgets/widgets/qtabwidget.h
+++ b/src/widgets/widgets/qtabwidget.h
@@ -49,7 +49,6 @@ class QStyleOptionTabWidgetFrame;
 class Q_WIDGETS_EXPORT QTabWidget : public QWidget
 {
     Q_OBJECT
-    Q_ENUMS(TabPosition TabShape)
     Q_PROPERTY(TabPosition tabPosition READ tabPosition WRITE setTabPosition)
     Q_PROPERTY(TabShape tabShape READ tabShape WRITE setTabShape)
     Q_PROPERTY(int currentIndex READ currentIndex WRITE setCurrentIndex NOTIFY currentChanged)
@@ -100,6 +99,7 @@ public:
     int count() const;
 
     enum TabPosition { North, South, West, East };
+    Q_ENUM(TabPosition)
     TabPosition tabPosition() const;
     void setTabPosition(TabPosition);
 
@@ -110,6 +110,7 @@ public:
     void setMovable(bool movable);
 
     enum TabShape { Rounded, Triangular };
+    Q_ENUM(TabShape)
     TabShape tabShape() const;
     void setTabShape(TabShape s);
 
diff --git a/src/widgets/widgets/qtextedit.h b/src/widgets/widgets/qtextedit.h
index 4c5af67cca..30533b7435 100644
--- a/src/widgets/widgets/qtextedit.h
+++ b/src/widgets/widgets/qtextedit.h
@@ -58,7 +58,6 @@ class Q_WIDGETS_EXPORT QTextEdit : public QAbstractScrollArea
     Q_OBJECT
     Q_DECLARE_PRIVATE(QTextEdit)
     Q_FLAGS(AutoFormatting)
-    Q_ENUMS(LineWrapMode)
     Q_PROPERTY(AutoFormatting autoFormatting READ autoFormatting WRITE setAutoFormatting)
     Q_PROPERTY(bool tabChangesFocus READ tabChangesFocus WRITE setTabChangesFocus)
     Q_PROPERTY(QString documentTitle READ documentTitle WRITE setDocumentTitle)
@@ -85,6 +84,7 @@ public:
         FixedPixelWidth,
         FixedColumnWidth
     };
+    Q_ENUM(LineWrapMode)
 
     enum AutoFormattingFlag {
         AutoNone = 0,
diff --git a/src/widgets/widgets/qtoolbutton.h b/src/widgets/widgets/qtoolbutton.h
index 5301a8b22b..fdd32c7486 100644
--- a/src/widgets/widgets/qtoolbutton.h
+++ b/src/widgets/widgets/qtoolbutton.h
@@ -48,7 +48,7 @@ class QStyleOptionToolButton;
 class Q_WIDGETS_EXPORT QToolButton : public QAbstractButton
 {
     Q_OBJECT
-    Q_ENUMS(Qt::ToolButtonStyle Qt::ArrowType ToolButtonPopupMode)
+    Q_ENUMS(Qt::ToolButtonStyle Qt::ArrowType)
 #ifndef QT_NO_MENU
     Q_PROPERTY(ToolButtonPopupMode popupMode READ popupMode WRITE setPopupMode)
 #endif
@@ -62,6 +62,7 @@ public:
         MenuButtonPopup,
         InstantPopup
     };
+    Q_ENUM(ToolButtonPopupMode)
 
     explicit QToolButton(QWidget * parent=0);
     ~QToolButton();