diff options
Diffstat (limited to 'src/plugins/platforms/cocoa/qcocoainputcontext.h')
| -rw-r--r-- | src/plugins/platforms/cocoa/qcocoainputcontext.h | 52 |
1 files changed, 9 insertions, 43 deletions
diff --git a/src/plugins/platforms/cocoa/qcocoainputcontext.h b/src/plugins/platforms/cocoa/qcocoainputcontext.h index 7190ba0de8..58d1d7ec86 100644 --- a/src/plugins/platforms/cocoa/qcocoainputcontext.h +++ b/src/plugins/platforms/cocoa/qcocoainputcontext.h @@ -1,41 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the plugins 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 #ifndef QCOCOAINPUTCONTEXT_H #define QCOCOAINPUTCONTEXT_H @@ -44,6 +8,8 @@ #include <QtCore/QLocale> #include <QtCore/QPointer> +#include <QtCore/private/qcore_mac_p.h> + QT_BEGIN_NAMESPACE class QCocoaInputContext : public QPlatformInputContext @@ -55,18 +21,18 @@ public: bool isValid() const override { return true; } + void setFocusObject(QObject *object) override; + + void commit() override; void reset() override; QLocale locale() const override { return m_locale; } void updateLocale(); -private Q_SLOTS: - void connectSignals(); - void focusObjectChanged(QObject *focusObject); - private: - QPointer<QWindow> mWindow; + QPointer<QWindow> m_focusWindow; QLocale m_locale; + QMacNotificationObserver m_inputSourceObserver; }; QT_END_NAMESPACE |