Rename ReturnKey to EnterKey

This makes the terminology consistent with Sailfish OS and the QNX QPA.
The kImePlatformDataReturnKeyType in the iOS QPA is not changed to not
break compatibility. Also, improve documentation.

Change-Id: I2780de5b1e9277185ae1d4d9bbc67e36682fbfba
Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@theqtcompany.com>

1 files changed, 9 insertions, 9 deletions

diff --git a/src/plugins/platforms/ios/qiostextresponder.mm b/src/plugins/platforms/ios/qiostextresponder.mm
index c7356d7abd..d86f545154 100644
--- a/src/plugins/platforms/ios/qiostextresponder.mm
+++ b/src/plugins/platforms/ios/qiostextresponder.mm
@@ -170,25 +170,25 @@
     QVariantMap platformData = m_configuredImeState->value(Qt::ImPlatformData).toMap();
     Qt::InputMethodHints hints = Qt::InputMethodHints(m_configuredImeState->value(Qt::ImHints).toUInt());
 
-    Qt::ReturnKeyType returnKeyType = Qt::ReturnKeyType(m_configuredImeState->value(Qt::ImReturnKeyType).toUInt());
+    Qt::EnterKeyType enterKeyType = Qt::EnterKeyType(m_configuredImeState->value(Qt::ImEnterKeyType).toUInt());
 
-    switch (returnKeyType) {
-    case Qt::ReturnKeyEnter:
+    switch (enterKeyType) {
+    case Qt::EnterKeyReturn:
         self.returnKeyType = UIReturnKeyDefault;
         break;
-    case Qt::ReturnKeyDone:
+    case Qt::EnterKeyDone:
         self.returnKeyType = UIReturnKeyDone;
         break;
-    case Qt::ReturnKeyGo:
+    case Qt::EnterKeyGo:
         self.returnKeyType = UIReturnKeyGo;
         break;
-    case Qt::ReturnKeySend:
+    case Qt::EnterKeySend:
         self.returnKeyType = UIReturnKeySend;
         break;
-    case Qt::ReturnKeySearch:
+    case Qt::EnterKeySearch:
         self.returnKeyType = UIReturnKeySearch;
         break;
-    case Qt::ReturnKeyNext:
+    case Qt::EnterKeyNext:
         self.returnKeyType = UIReturnKeyNext;
         break;
     default:
@@ -255,7 +255,7 @@
     }
 
     // Based on what we set up in initWithInputContext above
-    updatedProperties &= (Qt::ImHints | Qt::ImReturnKeyType | Qt::ImPlatformData);
+    updatedProperties &= (Qt::ImHints | Qt::ImEnterKeyType | Qt::ImPlatformData);
 
     if (!updatedProperties)
         return NO;