From e768d96e8bc161211b2d4ad377f3fb250f270a9b Mon Sep 17 00:00:00 2001
From: Olivier Goffart <ogoffart@woboq.com>
Date: Sat, 7 Feb 2015 13:00:27 +0100
Subject: QtGui: use Q_ENUM instead of Q_ENUMS

Change-Id: I92ac2ea218e9134aa36ecb179b8ae790a2dba56a
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
---
 src/gui/text/qfont.h         | 2 +-
 src/gui/text/qfontdatabase.h | 4 ++--
 src/gui/text/qtextformat.h   | 4 +++-
 3 files changed, 6 insertions(+), 4 deletions(-)

(limited to 'src/gui/text')

diff --git a/src/gui/text/qfont.h b/src/gui/text/qfont.h
index 165c4a85b9..a1baa6fceb 100644
--- a/src/gui/text/qfont.h
+++ b/src/gui/text/qfont.h
@@ -49,7 +49,6 @@ class QVariant;
 class Q_GUI_EXPORT QFont
 {
     Q_GADGET
-    Q_ENUMS(StyleStrategy)
 public:
     enum StyleHint {
         Helvetica,  SansSerif = Helvetica,
@@ -78,6 +77,7 @@ public:
         NoSubpixelAntialias = 0x0800,
         NoFontMerging       = 0x8000
     };
+    Q_ENUM(StyleStrategy)
 
     enum HintingPreference {
         PreferDefaultHinting        = 0,
diff --git a/src/gui/text/qfontdatabase.h b/src/gui/text/qfontdatabase.h
index 4e1ab501ba..b63cdb7c61 100644
--- a/src/gui/text/qfontdatabase.h
+++ b/src/gui/text/qfontdatabase.h
@@ -51,8 +51,6 @@ class QFontDatabasePrivate;
 class Q_GUI_EXPORT QFontDatabase
 {
     Q_GADGET
-    Q_ENUMS(WritingSystem)
-    Q_ENUMS(SystemFont)
 public:
     // do not re-order or delete entries from this enum without updating the
     // QPF2 format and makeqpf!!
@@ -98,6 +96,7 @@ public:
 
         WritingSystemsCount
     };
+    Q_ENUM(WritingSystem)
 
     enum SystemFont {
         GeneralFont,
@@ -105,6 +104,7 @@ public:
         TitleFont,
         SmallestReadableFont
     };
+    Q_ENUM(SystemFont)
 
     static QList<int> standardSizes();
 
diff --git a/src/gui/text/qtextformat.h b/src/gui/text/qtextformat.h
index 94c5b83cc0..370e8a96b8 100644
--- a/src/gui/text/qtextformat.h
+++ b/src/gui/text/qtextformat.h
@@ -126,7 +126,6 @@ Q_GUI_EXPORT QDebug operator<<(QDebug, const QTextFormat &);
 class Q_GUI_EXPORT QTextFormat
 {
     Q_GADGET
-    Q_ENUMS(FormatType Property ObjectTypes)
 public:
     enum FormatType {
         InvalidFormat = -1,
@@ -140,6 +139,7 @@ public:
 
         UserFormat = 100
     };
+    Q_ENUM(FormatType)
 
     enum Property {
         ObjectIndex = 0x0,
@@ -257,6 +257,7 @@ public:
         // --
         UserProperty = 0x100000
     };
+    Q_ENUM(Property)
 
     enum ObjectTypes {
         NoObject,
@@ -266,6 +267,7 @@ public:
 
         UserObject = 0x1000
     };
+    Q_ENUM(ObjectTypes)
 
     enum PageBreakFlag {
         PageBreak_Auto = 0,
-- 
cgit v1.2.3