From 8dd6957cd7a1d86714b32b97dffe603a8636848a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= Date: Fri, 3 Jul 2020 15:40:47 +0200 Subject: Make QtPlatformHeaders a private module MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The APIs will be reintroduced as part of the new platform interface API where appropriate. Clients that still depend on the platform headers can include it via QT += platformheaders-private. Change-Id: Ifbd836d833d19f3cf48cd4f933d7fe754c06d2d9 Reviewed-by: Tor Arne Vestbø --- src/platformheaders/helper/helper.pri | 2 +- src/platformheaders/helper/qplatformheaderhelper.h | 93 ------------------ .../helper/qplatformheaderhelper_p.h | 104 +++++++++++++++++++++ 3 files changed, 105 insertions(+), 94 deletions(-) delete mode 100644 src/platformheaders/helper/qplatformheaderhelper.h create mode 100644 src/platformheaders/helper/qplatformheaderhelper_p.h (limited to 'src/platformheaders/helper') diff --git a/src/platformheaders/helper/helper.pri b/src/platformheaders/helper/helper.pri index 2f6e766214..10914f9e5e 100644 --- a/src/platformheaders/helper/helper.pri +++ b/src/platformheaders/helper/helper.pri @@ -1,2 +1,2 @@ HEADERS += \ - $$PWD/qplatformheaderhelper.h + $$PWD/qplatformheaderhelper_p.h diff --git a/src/platformheaders/helper/qplatformheaderhelper.h b/src/platformheaders/helper/qplatformheaderhelper.h deleted file mode 100644 index 6959d889ae..0000000000 --- a/src/platformheaders/helper/qplatformheaderhelper.h +++ /dev/null @@ -1,93 +0,0 @@ -/**************************************************************************** -** -** 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$ -** -****************************************************************************/ - -#ifndef QPLATFORMHEADERHELPER_H -#define QPLATFORMHEADERHELPER_H - -#include -#include - -#if 0 -#pragma qt_class(QPlatformHeaderHelper) -#endif - -QT_BEGIN_NAMESPACE - -namespace QPlatformHeaderHelper { - -template -ReturnT callPlatformFunction(const QByteArray &functionName) -{ - FunctionT func = reinterpret_cast(QGuiApplication::platformFunction(functionName)); - return func ? func() : ReturnT(); -} - -template -ReturnT callPlatformFunction(const QByteArray &functionName, Arg1 a1) -{ - FunctionT func = reinterpret_cast(QGuiApplication::platformFunction(functionName)); - return func ? func(a1) : ReturnT(); -} - -template -ReturnT callPlatformFunction(const QByteArray &functionName, Arg1 a1, Arg2 a2) -{ - FunctionT func = reinterpret_cast(QGuiApplication::platformFunction(functionName)); - return func ? func(a1, a2) : ReturnT(); -} - -template -ReturnT callPlatformFunction(const QByteArray &functionName, Arg1 a1, Arg2 a2, Arg3 a3) -{ - FunctionT func = reinterpret_cast(QGuiApplication::platformFunction(functionName)); - return func ? func(a1, a2, a3) : ReturnT(); -} - -template -ReturnT callPlatformFunction(const QByteArray &functionName, Arg1 a1, Arg2 a2, Arg3 a3, Arg4 a4) -{ - FunctionT func = reinterpret_cast(QGuiApplication::platformFunction(functionName)); - return func ? func(a1, a2, a3, a4) : ReturnT(); -} - -} - -QT_END_NAMESPACE - -#endif /*QPLATFORMHEADERHELPER_H*/ diff --git a/src/platformheaders/helper/qplatformheaderhelper_p.h b/src/platformheaders/helper/qplatformheaderhelper_p.h new file mode 100644 index 0000000000..54567667f6 --- /dev/null +++ b/src/platformheaders/helper/qplatformheaderhelper_p.h @@ -0,0 +1,104 @@ +/**************************************************************************** +** +** 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$ +** +****************************************************************************/ + +#ifndef QPLATFORMHEADERHELPER_H +#define QPLATFORMHEADERHELPER_H + +// +// W A R N I N G +// ------------- +// +// This file is not part of the Qt API. It exists purely as an +// implementation detail. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. +// + +#include +#include + +#if 0 +#pragma qt_class(QPlatformHeaderHelper) +#endif + +QT_BEGIN_NAMESPACE + +namespace QPlatformHeaderHelper { + +template +ReturnT callPlatformFunction(const QByteArray &functionName) +{ + FunctionT func = reinterpret_cast(QGuiApplication::platformFunction(functionName)); + return func ? func() : ReturnT(); +} + +template +ReturnT callPlatformFunction(const QByteArray &functionName, Arg1 a1) +{ + FunctionT func = reinterpret_cast(QGuiApplication::platformFunction(functionName)); + return func ? func(a1) : ReturnT(); +} + +template +ReturnT callPlatformFunction(const QByteArray &functionName, Arg1 a1, Arg2 a2) +{ + FunctionT func = reinterpret_cast(QGuiApplication::platformFunction(functionName)); + return func ? func(a1, a2) : ReturnT(); +} + +template +ReturnT callPlatformFunction(const QByteArray &functionName, Arg1 a1, Arg2 a2, Arg3 a3) +{ + FunctionT func = reinterpret_cast(QGuiApplication::platformFunction(functionName)); + return func ? func(a1, a2, a3) : ReturnT(); +} + +template +ReturnT callPlatformFunction(const QByteArray &functionName, Arg1 a1, Arg2 a2, Arg3 a3, Arg4 a4) +{ + FunctionT func = reinterpret_cast(QGuiApplication::platformFunction(functionName)); + return func ? func(a1, a2, a3, a4) : ReturnT(); +} + +} + +QT_END_NAMESPACE + +#endif /*QPLATFORMHEADERHELPER_H*/ -- cgit v1.2.3