Rename KeyboardFunctionKeyFlag and KeyboardFunctionKey

These changes were made based on feedback on Qt 6.6 api review.

- Rename QFlags class KeyboardFunctionKey to KeyboardFunctionKeys
- Rename enum class KeyboardFunctionKeyFlag to KeyboardFunctionKey
- Rename enum value QtVirtualKeyboard.NoFunctionKey to NoFunctionKeys

Also:
- don't pass QFlags by cref, pass them by value
- change include order.

This change amends commit 4ef502b77eedf1ec1683535143c01c43f4abfaf2

Pick-to: 6.6
Change-Id: I80736365b2fc5db53ae71b1b5e0ae141e9c804f5
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>

5 files changed, 16 insertions, 16 deletions

diff --git a/src/virtualkeyboard/qvirtualkeyboardinputcontext_p.cpp b/src/virtualkeyboard/qvirtualkeyboardinputcontext_p.cpp
index 82de1fe9..835b6a6a 100644
--- a/src/virtualkeyboard/qvirtualkeyboardinputcontext_p.cpp
+++ b/src/virtualkeyboard/qvirtualkeyboardinputcontext_p.cpp
@@ -264,17 +264,17 @@ bool QVirtualKeyboardInputContextPrivate::contains(const QPointF &point) const
     return !hit;
 }
 
-KeyboardFunctionKeyFlag QVirtualKeyboardInputContextPrivate::keyboardFunctionKey(QtVirtualKeyboard::KeyboardFunction keyboardFunction) const
+KeyboardFunctionKey QVirtualKeyboardInputContextPrivate::keyboardFunctionKey(QtVirtualKeyboard::KeyboardFunction keyboardFunction) const
 {
     switch (keyboardFunction) {
     case KeyboardFunction::HideInputPanel:
-        return KeyboardFunctionKeyFlag::HideFunctionKey;
+        return KeyboardFunctionKey::HideFunctionKey;
     case KeyboardFunction::ChangeLanguage:
-        return KeyboardFunctionKeyFlag::LanguageFunctionKey;
+        return KeyboardFunctionKey::LanguageFunctionKey;
     case KeyboardFunction::ToggleHandwritingMode:
-        return KeyboardFunctionKeyFlag::NoFunctionKey;
+        return KeyboardFunctionKey::NoFunctionKeys;
     }
-    return KeyboardFunctionKeyFlag::NoFunctionKey;
+    return KeyboardFunctionKey::NoFunctionKeys;
 }
 
 void QVirtualKeyboardInputContextPrivate::onInputItemChanged()
diff --git a/src/virtualkeyboard/qvirtualkeyboardinputcontext_p.h b/src/virtualkeyboard/qvirtualkeyboardinputcontext_p.h
index baa3e347..c148edc5 100644
--- a/src/virtualkeyboard/qvirtualkeyboardinputcontext_p.h
+++ b/src/virtualkeyboard/qvirtualkeyboardinputcontext_p.h
@@ -95,7 +95,7 @@ public:
     Q_INVOKABLE bool hasEnterKeyAction(QObject *item) const;
     Q_INVOKABLE void registerInputPanel(QObject *inputPanel);
     Q_INVOKABLE bool contains(const QPointF &point) const;
-    Q_INVOKABLE QtVirtualKeyboard::KeyboardFunctionKeyFlag keyboardFunctionKey(QtVirtualKeyboard::KeyboardFunction keyboardFunction) const;
+    Q_INVOKABLE QtVirtualKeyboard::KeyboardFunctionKey keyboardFunctionKey(QtVirtualKeyboard::KeyboardFunction keyboardFunction) const;
 
 Q_SIGNALS:
     void focusChanged();
diff --git a/src/virtualkeyboard/qvirtualkeyboardnamespace.h b/src/virtualkeyboard/qvirtualkeyboardnamespace.h
index 55186407..64571f9f 100644
--- a/src/virtualkeyboard/qvirtualkeyboardnamespace.h
+++ b/src/virtualkeyboard/qvirtualkeyboardnamespace.h
@@ -41,15 +41,15 @@ enum class KeyboardFunction {
 };
 Q_ENUM_NS(KeyboardFunction)
 
-enum class KeyboardFunctionKeyFlag {
-    NoFunctionKey = 0,
+enum class KeyboardFunctionKey {
+    NoFunctionKeys = 0,
     HideFunctionKey = 0x1,
     LanguageFunctionKey = 0x2,
     AllFunctionKeys = HideFunctionKey | LanguageFunctionKey,
 };
-Q_DECLARE_FLAGS(KeyboardFunctionKey, KeyboardFunctionKeyFlag)
-Q_DECLARE_OPERATORS_FOR_FLAGS(KeyboardFunctionKey)
-Q_FLAG_NS(KeyboardFunctionKey)
+Q_DECLARE_FLAGS(KeyboardFunctionKeys, KeyboardFunctionKey)
+Q_DECLARE_OPERATORS_FOR_FLAGS(KeyboardFunctionKeys)
+Q_FLAG_NS(KeyboardFunctionKeys)
 
 } // namespace QtVirtualKeyboard
 
diff --git a/src/virtualkeyboard/settings.cpp b/src/virtualkeyboard/settings.cpp
index 9464cb27..d6f9bf70 100644
--- a/src/virtualkeyboard/settings.cpp
+++ b/src/virtualkeyboard/settings.cpp
@@ -64,7 +64,7 @@ public:
     bool handwritingModeDisabled;
     bool defaultInputMethodDisabled;
     bool defaultDictionaryDisabled;
-    QtVirtualKeyboard::KeyboardFunctionKey visibleFunctionKeys = QtVirtualKeyboard::KeyboardFunctionKeyFlag::AllFunctionKeys;
+    QtVirtualKeyboard::KeyboardFunctionKeys visibleFunctionKeys = QtVirtualKeyboard::KeyboardFunctionKey::AllFunctionKeys;
 };
 
 static QScopedPointer<Settings> s_settingsInstance;
@@ -342,13 +342,13 @@ void QtVirtualKeyboard::Settings::setDefaultDictionaryDisabled(bool defaultDicti
     }
 }
 
-QtVirtualKeyboard::KeyboardFunctionKey Settings::visibleFunctionKeys() const
+QtVirtualKeyboard::KeyboardFunctionKeys Settings::visibleFunctionKeys() const
 {
     Q_D(const Settings);
     return d->visibleFunctionKeys;
 }
 
-void Settings::setVisibleFunctionKeys(const QtVirtualKeyboard::KeyboardFunctionKey &newVisibleFunctionKeys)
+void Settings::setVisibleFunctionKeys(QtVirtualKeyboard::KeyboardFunctionKeys newVisibleFunctionKeys)
 {
     Q_D(Settings);
     if (d->visibleFunctionKeys != newVisibleFunctionKeys) {
diff --git a/src/virtualkeyboard/settings_p.h b/src/virtualkeyboard/settings_p.h
index ea2b02c8..b535273d 100644
--- a/src/virtualkeyboard/settings_p.h
+++ b/src/virtualkeyboard/settings_p.h
@@ -88,8 +88,8 @@ public:
     bool isDefaultDictionaryDisabled() const;
     void setDefaultDictionaryDisabled(bool defaultDictionaryDisabled);
 
-    QtVirtualKeyboard::KeyboardFunctionKey visibleFunctionKeys() const;
-    void setVisibleFunctionKeys(const QtVirtualKeyboard::KeyboardFunctionKey &newVisibleFunctionKeys);
+    QtVirtualKeyboard::KeyboardFunctionKeys visibleFunctionKeys() const;
+    void setVisibleFunctionKeys(QtVirtualKeyboard::KeyboardFunctionKeys newVisibleFunctionKeys);
 
 signals:
     void styleChanged();