QKeyMapper: Remove indirection via QKeyMapperPrivate for possibleKeys

Change-Id: I1988ac60689b3e6f4b29e38d1167d2b998702c09
Reviewed-by: Liang Qi <liang.qi@qt.io>

2 files changed, 9 insertions, 16 deletions

diff --git a/src/gui/kernel/qkeymapper.cpp b/src/gui/kernel/qkeymapper.cpp
index b7baf9c2b5..b5405e3a54 100644
--- a/src/gui/kernel/qkeymapper.cpp
+++ b/src/gui/kernel/qkeymapper.cpp
@@ -37,7 +37,15 @@ QKeyMapper::~QKeyMapper()
 
 QList<int> QKeyMapper::possibleKeys(QKeyEvent *e)
 {
-    return instance()->d_func()->possibleKeys(e);
+    QList<int> result = QGuiApplicationPrivate::platformIntegration()->possibleKeys(e);
+    if (!result.isEmpty())
+        return 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;
 }
 
 extern bool qt_sendSpontaneousEvent(QObject *receiver, QEvent *event); // in qapplication_*.cpp
@@ -80,19 +88,6 @@ QKeyMapperPrivate::~QKeyMapperPrivate()
 {
 }
 
-QList<int> QKeyMapperPrivate::possibleKeys(QKeyEvent *e)
-{
-    QList<int> result = QGuiApplicationPrivate::platformIntegration()->possibleKeys(e);
-    if (!result.isEmpty())
-        return 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;
-}
-
 void *QKeyMapper::resolveInterface(const char *name, int revision) const
 {
     Q_UNUSED(name); Q_UNUSED(revision);
diff --git a/src/gui/kernel/qkeymapper_p.h b/src/gui/kernel/qkeymapper_p.h
index 96c5620665..6c9ea2f22c 100644
--- a/src/gui/kernel/qkeymapper_p.h
+++ b/src/gui/kernel/qkeymapper_p.h
@@ -55,8 +55,6 @@ public:
     QKeyMapperPrivate();
     ~QKeyMapperPrivate();
 
-    QList<int> possibleKeys(QKeyEvent *e);
-
     QLocale keyboardInputLocale;
     Qt::LayoutDirection keyboardInputDirection;
 };