Remove repetitive names from KeyboardFunctionKeys enum values

This change was made based on feedback on Qt 6.6 api review.

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

7 files changed, 18 insertions, 18 deletions

diff --git a/src/components/ChangeLanguageKey.qml b/src/components/ChangeLanguageKey.qml
index 66e9b2ae..ad14bbe4 100644
--- a/src/components/ChangeLanguageKey.qml
+++ b/src/components/ChangeLanguageKey.qml
@@ -49,5 +49,5 @@ BaseKey {
     keyPanelDelegate: keyboard.style ? keyboard.style.languageKeyPanel : undefined
     onClicked: keyboard.doKeyboardFunction(QtVirtualKeyboard.KeyboardFunction.ChangeLanguage, customLayoutsOnly)
     enabled: keyboard.isKeyboardFunctionAvailable(QtVirtualKeyboard.KeyboardFunction.ChangeLanguage, customLayoutsOnly)
-    visible: VirtualKeyboardSettings.visibleFunctionKeys & QtVirtualKeyboard.KeyboardFunctionKeys.LanguageFunctionKey
+    visible: VirtualKeyboardSettings.visibleFunctionKeys & QtVirtualKeyboard.KeyboardFunctionKeys.Language
 }
diff --git a/src/components/HideKeyboardKey.qml b/src/components/HideKeyboardKey.qml
index b61887ac..bbf16b95 100644
--- a/src/components/HideKeyboardKey.qml
+++ b/src/components/HideKeyboardKey.qml
@@ -24,5 +24,5 @@ BaseKey {
     highlighted: true
     onClicked: keyboard.doKeyboardFunction(QtVirtualKeyboard.KeyboardFunction.HideInputPanel)
     keyPanelDelegate: keyboard.style ? keyboard.style.hideKeyPanel : undefined
-    visible: VirtualKeyboardSettings.visibleFunctionKeys & QtVirtualKeyboard.KeyboardFunctionKeys.HideFunctionKey
+    visible: VirtualKeyboardSettings.visibleFunctionKeys & QtVirtualKeyboard.KeyboardFunctionKeys.Hide
 }
diff --git a/src/components/Keyboard.qml b/src/components/Keyboard.qml
index 17d5af1d..98cb76d5 100644
--- a/src/components/Keyboard.qml
+++ b/src/components/Keyboard.qml
@@ -1818,8 +1818,8 @@ Item {
     }
 
     function isFunctionPopupListAvailable() {
-        const allFunctionKeys = QtVirtualKeyboard.KeyboardFunctionKeys.HideFunctionKey |
-                              QtVirtualKeyboard.KeyboardFunctionKeys.LanguageFunctionKey
+        const allFunctionKeys = QtVirtualKeyboard.KeyboardFunctionKeys.Hide |
+                              QtVirtualKeyboard.KeyboardFunctionKeys.Language
         return (VirtualKeyboardSettings.visibleFunctionKeys & allFunctionKeys) !== allFunctionKeys ||
                 isHandwritingAvailable()
     }
diff --git a/src/settings/qquickvirtualkeyboardsettings.cpp b/src/settings/qquickvirtualkeyboardsettings.cpp
index f75c0490..b80590db 100644
--- a/src/settings/qquickvirtualkeyboardsettings.cpp
+++ b/src/settings/qquickvirtualkeyboardsettings.cpp
@@ -549,13 +549,13 @@ void QQuickVirtualKeyboardSettings::resetStyle()
     The value can be combination of the following flags:
 
     \list
-        \li \c QtVirtualKeyboard.KeyboardFunctionKeys.NoFunctionKeys All function keys are hidden
-        \li \c QtVirtualKeyboard.KeyboardFunctionKeys.HideFunctionKey Hide function key is visible
-        \li \c QtVirtualKeyboard.KeyboardFunctionKeys.LanguageFunctionKey Language function key is visible
-        \li \c QtVirtualKeyboard.KeyboardFunctionKeys.AllFunctionKeys All function keys are visible
+        \li \c QtVirtualKeyboard.KeyboardFunctionKeys.None All function keys are hidden
+        \li \c QtVirtualKeyboard.KeyboardFunctionKeys.Hide Hide function key is visible
+        \li \c QtVirtualKeyboard.KeyboardFunctionKeys.Language Language function key is visible
+        \li \c QtVirtualKeyboard.KeyboardFunctionKeys.All All function keys are visible
     \endlist
 
-    The default is \c QtVirtualKeyboard.KeyboardFunctionKeys.AllFunctionKeys.
+    The default is \c QtVirtualKeyboard.KeyboardFunctionKeys.All.
 */
 
 /*!
diff --git a/src/virtualkeyboard/qvirtualkeyboardinputcontext_p.cpp b/src/virtualkeyboard/qvirtualkeyboardinputcontext_p.cpp
index 835b6a6a..e246629b 100644
--- a/src/virtualkeyboard/qvirtualkeyboardinputcontext_p.cpp
+++ b/src/virtualkeyboard/qvirtualkeyboardinputcontext_p.cpp
@@ -268,13 +268,13 @@ KeyboardFunctionKey QVirtualKeyboardInputContextPrivate::keyboardFunctionKey(QtV
 {
     switch (keyboardFunction) {
     case KeyboardFunction::HideInputPanel:
-        return KeyboardFunctionKey::HideFunctionKey;
+        return KeyboardFunctionKey::Hide;
     case KeyboardFunction::ChangeLanguage:
-        return KeyboardFunctionKey::LanguageFunctionKey;
+        return KeyboardFunctionKey::Language;
     case KeyboardFunction::ToggleHandwritingMode:
-        return KeyboardFunctionKey::NoFunctionKeys;
+        return KeyboardFunctionKey::None;
     }
-    return KeyboardFunctionKey::NoFunctionKeys;
+    return KeyboardFunctionKey::None;
 }
 
 void QVirtualKeyboardInputContextPrivate::onInputItemChanged()
diff --git a/src/virtualkeyboard/qvirtualkeyboardnamespace_p.h b/src/virtualkeyboard/qvirtualkeyboardnamespace_p.h
index 14a72d72..98a4b89d 100644
--- a/src/virtualkeyboard/qvirtualkeyboardnamespace_p.h
+++ b/src/virtualkeyboard/qvirtualkeyboardnamespace_p.h
@@ -53,10 +53,10 @@ enum class KeyboardFunction {
 Q_ENUM_NS(KeyboardFunction)
 
 enum class KeyboardFunctionKey : quint32 {
-    NoFunctionKeys = 0,
-    HideFunctionKey = 0x1,
-    LanguageFunctionKey = 0x2,
-    AllFunctionKeys = 0xffffffff,
+    None = 0,
+    Hide = 0x1,
+    Language = 0x2,
+    All = 0xffffffff,
 };
 Q_DECLARE_FLAGS(KeyboardFunctionKeys, KeyboardFunctionKey)
 Q_DECLARE_OPERATORS_FOR_FLAGS(KeyboardFunctionKeys)
diff --git a/src/virtualkeyboard/settings.cpp b/src/virtualkeyboard/settings.cpp
index d6f9bf70..a3d4eceb 100644
--- a/src/virtualkeyboard/settings.cpp
+++ b/src/virtualkeyboard/settings.cpp
@@ -64,7 +64,7 @@ public:
     bool handwritingModeDisabled;
     bool defaultInputMethodDisabled;
     bool defaultDictionaryDisabled;
-    QtVirtualKeyboard::KeyboardFunctionKeys visibleFunctionKeys = QtVirtualKeyboard::KeyboardFunctionKey::AllFunctionKeys;
+    QtVirtualKeyboard::KeyboardFunctionKeys visibleFunctionKeys = QtVirtualKeyboard::KeyboardFunctionKey::All;
 };
 
 static QScopedPointer<Settings> s_settingsInstance;