QKeyMapper: Merge default implementation of possibleKeys into call site

Task-number: QTBUG-116873
Change-Id: I9091f4a9d465fb928afcabce0536fcd2d03b7f82
Reviewed-by: Andrey Butirsky <butirsky@gmail.com>
Reviewed-by: Liang Qi <liang.qi@qt.io>

1 files changed, 5 insertions, 11 deletions

diff --git a/src/gui/kernel/qkeymapper.cpp b/src/gui/kernel/qkeymapper.cpp
index aa8eca5214..b7baf9c2b5 100644
--- a/src/gui/kernel/qkeymapper.cpp
+++ b/src/gui/kernel/qkeymapper.cpp
@@ -35,16 +35,6 @@ QKeyMapper::~QKeyMapper()
 {
 }
 
-static QList<int> extractKeyFromEvent(QKeyEvent *e)
-{
-    QList<int> result;
-    if (e->key() && (e->key() != Qt::Key_unknown))
-        result << e->keyCombination().toCombined();
-    else if (!e->text().isEmpty())
-        result << int(e->text().at(0).unicode() + (int)e->modifiers());
-    return result;
-}
-
 QList<int> QKeyMapper::possibleKeys(QKeyEvent *e)
 {
     return instance()->d_func()->possibleKeys(e);
@@ -96,7 +86,11 @@ QList<int> QKeyMapperPrivate::possibleKeys(QKeyEvent *e)
     if (!result.isEmpty())
         return result;
 
-    return extractKeyFromEvent(e);
+    if (e->key() && (e->key() != Qt::Key_unknown))
+        result << e->keyCombination().toCombined();
+    else if (!e->text().isEmpty())
+        result << int(e->text().at(0).unicode() + (int)e->modifiers());
+    return result;
 }
 
 void *QKeyMapper::resolveInterface(const char *name, int revision) const