From 36b039638fdc8dd9f2eab18bc7096f6b76cf3114 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gordan=20Marku=C5=A1?= <gordan.markus@pelagicore.com>
Date: Tue, 9 May 2017 10:34:51 +0200
Subject: Replace deprecated Q_ENUMS macro with Q_ENUM

Change-Id: I705129c56e968a72cf3d4de5b37b092cee93965c
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
---
 src/virtualkeyboard/enterkeyaction.h     | 3 ++-
 src/virtualkeyboard/inputengine.h        | 7 ++++---
 src/virtualkeyboard/selectionlistmodel.h | 5 +++--
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/virtualkeyboard/enterkeyaction.h b/src/virtualkeyboard/enterkeyaction.h
index 5fa9d6d0..b78e09ec 100644
--- a/src/virtualkeyboard/enterkeyaction.h
+++ b/src/virtualkeyboard/enterkeyaction.h
@@ -39,7 +39,6 @@ class EnterKeyActionAttachedType;
 class EnterKeyAction : public QObject
 {
     Q_OBJECT
-    Q_ENUMS(Id)
 
 public:
     enum Id {
@@ -51,6 +50,8 @@ public:
         Done
     };
 
+    Q_ENUM(Id)
+
 public:
     static EnterKeyActionAttachedType *qmlAttachedProperties(QObject *object);
 };
diff --git a/src/virtualkeyboard/inputengine.h b/src/virtualkeyboard/inputengine.h
index 7551d754..784ed91c 100644
--- a/src/virtualkeyboard/inputengine.h
+++ b/src/virtualkeyboard/inputengine.h
@@ -46,9 +46,6 @@ class InputEngine : public QObject
     Q_OBJECT
     Q_DISABLE_COPY(InputEngine)
     Q_DECLARE_PRIVATE(InputEngine)
-    Q_ENUMS(TextCase)
-    Q_ENUMS(InputMode)
-    Q_ENUMS(PatternRecognitionMode)
     Q_FLAGS(ReselectFlags)
     Q_PROPERTY(Qt::Key activeKey READ activeKey NOTIFY activeKeyChanged)
     Q_PROPERTY(Qt::Key previousKey READ previousKey NOTIFY previousKeyChanged)
@@ -87,6 +84,10 @@ public:
         WordAfterCursor = 0x2,
         WordAtCursor = WordBeforeCursor | WordAfterCursor
     };
+
+    Q_ENUM(TextCase)
+    Q_ENUM(InputMode)
+    Q_ENUM(PatternRecognitionMode)
     Q_DECLARE_FLAGS(ReselectFlags, ReselectFlag)
 
 public:
diff --git a/src/virtualkeyboard/selectionlistmodel.h b/src/virtualkeyboard/selectionlistmodel.h
index 47153558..f129637b 100644
--- a/src/virtualkeyboard/selectionlistmodel.h
+++ b/src/virtualkeyboard/selectionlistmodel.h
@@ -41,8 +41,6 @@ class SelectionListModelPrivate;
 class SelectionListModel : public QAbstractListModel
 {
     Q_OBJECT
-    Q_ENUMS(Type)
-    Q_ENUMS(Role)
     Q_DECLARE_PRIVATE(SelectionListModel)
     Q_PROPERTY(int count READ count NOTIFY countChanged)
 
@@ -59,6 +57,9 @@ public:
         WordCompletionLengthRole = Qt::UserRole + 1
     };
 
+    Q_ENUM(Type)
+    Q_ENUM(Role)
+
     ~SelectionListModel();
     void setDataSource(AbstractInputMethod *dataSource, Type type);
     AbstractInputMethod *dataSource() const;
-- 
cgit v1.2.3