From b3d09eceb83e9d34906144d98f3de727679df6f0 Mon Sep 17 00:00:00 2001 From: Jorgen Lind Date: Wed, 3 Jun 2015 14:10:19 +0200 Subject: Move the function helper to its own file Also make it a class so a forward header is generated by syncqt Change-Id: Ibab6b925dc6e9dab1b617b9b4027a4144e4a3773 Reviewed-by: Timur Pocheptsov Reviewed-by: Laszlo Agocs --- src/platformheaders/helper/helper.pri | 2 + src/platformheaders/helper/qplatformheaderhelper.h | 87 ++++++++++++++++++++++ src/platformheaders/platformheaders.pro | 1 + .../xcbfunctions/qxcbfunctionshelper.h | 84 --------------------- .../xcbfunctions/qxcbintegrationfunctions.h | 4 +- .../xcbfunctions/qxcbwindowfunctions.h | 12 +-- 6 files changed, 98 insertions(+), 92 deletions(-) create mode 100644 src/platformheaders/helper/helper.pri create mode 100644 src/platformheaders/helper/qplatformheaderhelper.h delete mode 100644 src/platformheaders/xcbfunctions/qxcbfunctionshelper.h (limited to 'src/platformheaders') diff --git a/src/platformheaders/helper/helper.pri b/src/platformheaders/helper/helper.pri new file mode 100644 index 0000000000..2f6e766214 --- /dev/null +++ b/src/platformheaders/helper/helper.pri @@ -0,0 +1,2 @@ +HEADERS += \ + $$PWD/qplatformheaderhelper.h diff --git a/src/platformheaders/helper/qplatformheaderhelper.h b/src/platformheaders/helper/qplatformheaderhelper.h new file mode 100644 index 0000000000..52302dbfba --- /dev/null +++ b/src/platformheaders/helper/qplatformheaderhelper.h @@ -0,0 +1,87 @@ +/**************************************************************************** +** +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ +** +** This file is part of the plugins of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL21$ +** 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 http://www.qt.io/terms-conditions. For further +** information use the contact form at http://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 2.1 or version 3 as published by the Free +** Software Foundation and appearing in the file LICENSE.LGPLv21 and +** LICENSE.LGPLv3 included in the packaging of this file. Please review the +** following information to ensure the GNU Lesser General Public License +** requirements will be met: https://www.gnu.org/licenses/lgpl.html and +** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** $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/platformheaders.pro b/src/platformheaders/platformheaders.pro index 5e875f7d2d..6b6294d34c 100644 --- a/src/platformheaders/platformheaders.pro +++ b/src/platformheaders/platformheaders.pro @@ -7,6 +7,7 @@ include(nativecontexts/nativecontexts.pri) include(xcbfunctions/xcbfunctions.pri) include(eglfsfunctions/eglfsfunctions.pri) include(windowsfunctions/windowsfunctions.pri) +include(helper/helper.pri) QMAKE_DOCS = $$PWD/doc/qtplatformheaders.qdocconf diff --git a/src/platformheaders/xcbfunctions/qxcbfunctionshelper.h b/src/platformheaders/xcbfunctions/qxcbfunctionshelper.h deleted file mode 100644 index a9d734a387..0000000000 --- a/src/platformheaders/xcbfunctions/qxcbfunctionshelper.h +++ /dev/null @@ -1,84 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the plugins of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL21$ -** 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 http://www.qt.io/terms-conditions. For further -** information use the contact form at http://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 2.1 or version 3 as published by the Free -** Software Foundation and appearing in the file LICENSE.LGPLv21 and -** LICENSE.LGPLv3 included in the packaging of this file. Please review the -** following information to ensure the GNU Lesser General Public License -** requirements will be met: https://www.gnu.org/licenses/lgpl.html and -** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** As a special exception, The Qt Company gives you certain additional -** rights. These rights are described in The Qt Company LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#ifndef QXCBFUNCTIONHELPER_H -#define QXCBFUNCTIONHELPER_H - -#include -#include - -QT_BEGIN_NAMESPACE - -namespace QXcbFunctionsHelper -{ - -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 /*QXCBFUNCTIONHELPER_H*/ diff --git a/src/platformheaders/xcbfunctions/qxcbintegrationfunctions.h b/src/platformheaders/xcbfunctions/qxcbintegrationfunctions.h index 87e19e6a45..66bfb72307 100644 --- a/src/platformheaders/xcbfunctions/qxcbintegrationfunctions.h +++ b/src/platformheaders/xcbfunctions/qxcbintegrationfunctions.h @@ -34,7 +34,7 @@ #ifndef QXCBINTEGRATIONFUNCTIONS_H #define QXCBINTEGRATIONFUNCTIONS_H -#include "qxcbfunctionshelper.h" +#include QT_BEGIN_NAMESPACE @@ -45,7 +45,7 @@ public: static const QByteArray xEmbedSystemTrayVisualHasAlphaChannelIdentifier() { return QByteArrayLiteral("XcbXEmbedSystemTrayVisualHasAlphaChannel"); } static bool xEmbedSystemTrayVisualHasAlphaChannel() { - return QXcbFunctionsHelper::callPlatformFunction(xEmbedSystemTrayVisualHasAlphaChannelIdentifier()); + return QPlatformHeaderHelper::callPlatformFunction(xEmbedSystemTrayVisualHasAlphaChannelIdentifier()); } }; diff --git a/src/platformheaders/xcbfunctions/qxcbwindowfunctions.h b/src/platformheaders/xcbfunctions/qxcbwindowfunctions.h index d477a63ec7..0db2e2a09d 100644 --- a/src/platformheaders/xcbfunctions/qxcbwindowfunctions.h +++ b/src/platformheaders/xcbfunctions/qxcbwindowfunctions.h @@ -34,7 +34,7 @@ #ifndef QXCBWINDOWFUNCTIONS_H #define QXCBWINDOWFUNCTIONS_H -#include "qxcbfunctionshelper.h" +#include QT_BEGIN_NAMESPACE @@ -66,35 +66,35 @@ public: static const QByteArray setWmWindowTypeIdentifier() { return QByteArrayLiteral("XcbSetWmWindowType"); } static void setWmWindowType(QWindow *window, WmWindowType type) { - return QXcbFunctionsHelper::callPlatformFunction(setWmWindowTypeIdentifier(), window, type); + return QPlatformHeaderHelper::callPlatformFunction(setWmWindowTypeIdentifier(), window, type); } typedef void (*SetWmWindowIconText)(QWindow *window, const QString &text); static const QByteArray setWmWindowIconTextIdentifier() { return QByteArrayLiteral("XcbSetWmWindowIconText"); } static void setWmWindowIconText(QWindow *window, const QString &text) { - return QXcbFunctionsHelper::callPlatformFunction(setWmWindowIconTextIdentifier(), window, text); + return QPlatformHeaderHelper::callPlatformFunction(setWmWindowIconTextIdentifier(), window, text); } typedef void (*SetParentRelativeBackPixmap)(const QWindow *window); static const QByteArray setParentRelativeBackPixmapIdentifier() { return QByteArrayLiteral("XcbSetParentRelativeBackPixmap"); } static void setParentRelativeBackPixmap(const QWindow *window) { - return QXcbFunctionsHelper::callPlatformFunction(setParentRelativeBackPixmapIdentifier(), window); + return QPlatformHeaderHelper::callPlatformFunction(setParentRelativeBackPixmapIdentifier(), window); } typedef bool (*RequestSystemTrayWindowDock)(const QWindow *window); static const QByteArray requestSystemTrayWindowDockIdentifier() { return QByteArrayLiteral("XcbRequestSystemTrayWindowDockIdentifier"); } static bool requestSystemTrayWindowDock(const QWindow *window) { - return QXcbFunctionsHelper::callPlatformFunction(requestSystemTrayWindowDockIdentifier(), window); + return QPlatformHeaderHelper::callPlatformFunction(requestSystemTrayWindowDockIdentifier(), window); } typedef QRect (*SystemTrayWindowGlobalGeometry)(const QWindow *window); static const QByteArray systemTrayWindowGlobalGeometryIdentifier() { return QByteArrayLiteral("XcbSystemTrayWindowGlobalGeometryIdentifier"); } static QRect systemTrayWindowGlobalGeometry(const QWindow *window) { - return QXcbFunctionsHelper::callPlatformFunction(systemTrayWindowGlobalGeometryIdentifier(), window); + return QPlatformHeaderHelper::callPlatformFunction(systemTrayWindowGlobalGeometryIdentifier(), window); } typedef uint (*VisualId)(QWindow *window); -- cgit v1.2.3