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/xcbfunctions/qxcbwindowfunctions.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src/platformheaders/xcbfunctions/qxcbwindowfunctions.h') 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