1 files changed, 29 insertions, 87 deletions

diff --git a/src/gui/kernel/qkeymapper.cpp b/src/gui/kernel/qkeymapper.cpp
index 054d850dbb..4ceb508465 100644
--- a/src/gui/kernel/qkeymapper.cpp
+++ b/src/gui/kernel/qkeymapper.cpp
@@ -1,41 +1,5 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtGui module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
+// Copyright (C) 2016 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
 
 
 #include "qguiapplication.h"
@@ -45,6 +9,7 @@
 
 #include <private/qguiapplication_p.h>
 #include <qpa/qplatformintegration.h>
+#include <qpa/qplatformkeymapper.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -59,8 +24,7 @@ QT_BEGIN_NAMESPACE
 /*!
     Constructs a new key mapper.
 */
-QKeyMapper::QKeyMapper()
-    : QObject(*new QKeyMapperPrivate, nullptr)
+QKeyMapper::QKeyMapper() : QObject()
 {
 }
 
@@ -71,34 +35,34 @@ QKeyMapper::~QKeyMapper()
 {
 }
 
-static QList<int> extractKeyFromEvent(QKeyEvent *e)
+QList<QKeyCombination> QKeyMapper::possibleKeys(const 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;
-}
+    qCDebug(lcQpaKeyMapper).verbosity(3) << "Computing possible key combinations for" << e;
 
-QList<int> QKeyMapper::possibleKeys(QKeyEvent *e)
-{
-    return instance()->d_func()->possibleKeys(e);
-}
+    const auto *platformIntegration = QGuiApplicationPrivate::platformIntegration();
+    const auto *platformKeyMapper = platformIntegration->keyMapper();
+    QList<QKeyCombination> result = platformKeyMapper->possibleKeyCombinations(e);
 
-extern bool qt_sendSpontaneousEvent(QObject *receiver, QEvent *event); // in qapplication_*.cpp
-void QKeyMapper::changeKeyboard()
-{
-    // ## TODO: Support KeyboardLayoutChange on QPA
-#if 0
-    // inform all toplevel widgets of the change
-    QEvent e(QEvent::KeyboardLayoutChange);
-    QWidgetList list = QApplication::topLevelWidgets();
-    for (int i = 0; i < list.size(); ++i) {
-        QWidget *w = list.at(i);
-        qt_sendSpontaneousEvent(w, &e);
+    if (result.isEmpty()) {
+        if (e->key() && (e->key() != Qt::Key_unknown))
+            result << e->keyCombination();
+        else if (!e->text().isEmpty())
+            result << (Qt::Key(e->text().at(0).unicode()) | e->modifiers());
+    }
+
+#if QT_CONFIG(shortcut)
+    if (lcQpaKeyMapper().isDebugEnabled()) {
+        qCDebug(lcQpaKeyMapper) << "Resulting possible key combinations:";
+        for (auto keyCombination : result) {
+            auto keySequence = QKeySequence(keyCombination);
+            qCDebug(lcQpaKeyMapper).verbosity(0) << "\t-"
+                << keyCombination << "/" << keySequence << "/"
+                << qUtf8Printable(keySequence.toString(QKeySequence::NativeText));
+        }
     }
 #endif
+
+    return result;
 }
 
 Q_GLOBAL_STATIC(QKeyMapper, keymapper)
@@ -111,30 +75,6 @@ QKeyMapper *QKeyMapper::instance()
     return keymapper();
 }
 
-QKeyMapperPrivate *qt_keymapper_private()
-{
-    return QKeyMapper::instance()->d_func();
-}
-
-QKeyMapperPrivate::QKeyMapperPrivate()
-{
-    keyboardInputLocale = QLocale::system();
-    keyboardInputDirection = keyboardInputLocale.textDirection();
-}
-
-QKeyMapperPrivate::~QKeyMapperPrivate()
-{
-}
-
-QList<int> QKeyMapperPrivate::possibleKeys(QKeyEvent *e)
-{
-    QList<int> result = QGuiApplicationPrivate::platformIntegration()->possibleKeys(e);
-    if (!result.isEmpty())
-        return result;
-
-    return extractKeyFromEvent(e);
-}
-
 void *QKeyMapper::resolveInterface(const char *name, int revision) const
 {
     Q_UNUSED(name); Q_UNUSED(revision);
@@ -148,3 +88,5 @@ void *QKeyMapper::resolveInterface(const char *name, int revision) const
 }
 
 QT_END_NAMESPACE
+
+#include "moc_qkeymapper_p.cpp"