diff options
Diffstat (limited to 'src/plugins/shellintegration/ivi-shell/qwaylandivishellintegration.h')
| -rw-r--r-- | src/plugins/shellintegration/ivi-shell/qwaylandivishellintegration.h | 49 |
1 files changed, 7 insertions, 42 deletions
diff --git a/src/plugins/shellintegration/ivi-shell/qwaylandivishellintegration.h b/src/plugins/shellintegration/ivi-shell/qwaylandivishellintegration.h index 13282e438..14d9770a8 100644 --- a/src/plugins/shellintegration/ivi-shell/qwaylandivishellintegration.h +++ b/src/plugins/shellintegration/ivi-shell/qwaylandivishellintegration.h @@ -1,41 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2017 ITAGE Corporation, author: <yusuke.binsaki@itage.co.jp> -** Contact: http://www.qt-project.org/legal -** -** 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) 2017 ITAGE Corporation, author: <yusuke.binsaki@itage.co.jp> +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only #ifndef QWAYLANDIVIINTEGRATION_H #define QWAYLANDIVIINTEGRATION_H @@ -52,9 +16,11 @@ namespace QtWaylandClient { class QWaylandWindow; class QWaylandDisplay; -class QWaylandIviControllerSurface; +class QWaylandIviController; -class Q_WAYLAND_CLIENT_EXPORT QWaylandIviShellIntegration : public QWaylandShellIntegration +class Q_WAYLANDCLIENT_EXPORT QWaylandIviShellIntegration + : public QWaylandShellIntegrationTemplate<QWaylandIviShellIntegration>, + public QtWayland::ivi_application { public: QWaylandIviShellIntegration(); @@ -66,8 +32,7 @@ private: uint32_t getNextUniqueSurfaceId(); private: - QScopedPointer<QtWayland::ivi_application> m_iviApplication; - QScopedPointer<QtWayland::ivi_controller> m_iviController; + QScopedPointer<QWaylandIviController> m_iviController; uint32_t m_lastSurfaceId = 0; uint32_t m_surfaceNumber = 0; bool m_useEnvSurfaceId = false; |