diff options
Diffstat (limited to 'src/virtualkeyboard/platforminputcontext_p.h')
| -rw-r--r-- | src/virtualkeyboard/platforminputcontext_p.h | 37 |
1 files changed, 4 insertions, 33 deletions
diff --git a/src/virtualkeyboard/platforminputcontext_p.h b/src/virtualkeyboard/platforminputcontext_p.h index e7d29405..f6b57c31 100644 --- a/src/virtualkeyboard/platforminputcontext_p.h +++ b/src/virtualkeyboard/platforminputcontext_p.h @@ -1,31 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the Qt Virtual Keyboard module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:GPL$ -** 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 General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3 or (at your option) 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.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-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ +// Copyright (C) 2016 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #ifndef PLATFORMINPUTCONTEXT_P_H #define PLATFORMINPUTCONTEXT_P_H @@ -57,7 +31,7 @@ namespace QtVirtualKeyboard { class AbstractInputPanel; -class QVIRTUALKEYBOARD_EXPORT PlatformInputContext : public QPlatformInputContext +class Q_VIRTUALKEYBOARD_EXPORT PlatformInputContext : public QPlatformInputContext { Q_OBJECT public: @@ -90,9 +64,6 @@ public: bool eventFilter(QObject *object, QEvent *event) override; - void setInputMethods(const QStringList &inputMethods); - QStringList inputMethods() const; - signals: void focusObjectChanged(); @@ -101,6 +72,7 @@ protected: void sendKeyEvent(QKeyEvent *event); QVariant inputMethodQuery(Qt::InputMethodQuery query); void setInputContext(QVirtualKeyboardInputContext *context); + bool evaluateInputPanelVisible() const; private slots: void keyboardRectangleChanged(); @@ -110,7 +82,6 @@ private: friend class ::QVirtualKeyboardInputContext; friend class ::QVirtualKeyboardInputContextPrivate; QPointer<QVirtualKeyboardInputContext> m_inputContext; - QStringList m_inputMethods; QPointer<AbstractInputPanel> m_inputPanel; QPointer<DesktopInputSelectionControl> m_selectionControl; QPointer<QObject> m_focusObject; |