From ccb623188369be7bf4b991ff8a1f81d27137984c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B8rgen=20Lind?= Date: Tue, 1 Mar 2011 13:58:53 +0100 Subject: Lighthouse: Make Native Interface slightly more agile We realised that we couldn't keep on adding virtual functions for all specific needs so we made one virtual function which takes a string parameter which enables the implementation to return anything. It seems a bit odd to have a virtual function as an accessor for a class with only 1 virtual function. But the idea is that we don't want a void * in the core lighthouse api. Also, the implementations should decleare more functions to do the heavy lifting of getting the handles Reviewed-by: paul --- src/gui/kernel/qplatformnativeinterface_qpa.cpp | 27 ++----------------------- src/gui/kernel/qplatformnativeinterface_qpa.h | 6 +----- 2 files changed, 3 insertions(+), 30 deletions(-) diff --git a/src/gui/kernel/qplatformnativeinterface_qpa.cpp b/src/gui/kernel/qplatformnativeinterface_qpa.cpp index 8f128ee..ace4a7b 100644 --- a/src/gui/kernel/qplatformnativeinterface_qpa.cpp +++ b/src/gui/kernel/qplatformnativeinterface_qpa.cpp @@ -43,32 +43,9 @@ QT_BEGIN_NAMESPACE -void *QPlatformNativeInterface::nativeDisplayForWidget(QWidget *widget) -{ - Q_UNUSED(widget); - return 0; -} - -void *QPlatformNativeInterface::eglDisplayForWidget(QWidget *widget) -{ - Q_UNUSED(widget); - return 0; -} - -void *QPlatformNativeInterface::nativeConnectionForWidget(QWidget *widget) -{ - Q_UNUSED(widget); - return 0; -} - -void *QPlatformNativeInterface::nativeScreenForWidget(QWidget *widget) -{ - Q_UNUSED(widget); - return 0; -} - -void *QPlatformNativeInterface::nativeGraphicsDeviceForWidget(QWidget *widget) +void *QPlatformNativeInterface::nativeResourceForWidget(const QByteArray &resource, QWidget *widget) { + Q_UNUSED(resource); Q_UNUSED(widget); return 0; } diff --git a/src/gui/kernel/qplatformnativeinterface_qpa.h b/src/gui/kernel/qplatformnativeinterface_qpa.h index 80d6229..5ea2c13 100644 --- a/src/gui/kernel/qplatformnativeinterface_qpa.h +++ b/src/gui/kernel/qplatformnativeinterface_qpa.h @@ -55,11 +55,7 @@ class QWidget; class Q_GUI_EXPORT QPlatformNativeInterface { public: - virtual void *nativeDisplayForWidget(QWidget *widget); - virtual void *eglDisplayForWidget(QWidget *widget); - virtual void *nativeConnectionForWidget(QWidget *widget); - virtual void *nativeScreenForWidget(QWidget *widget); - virtual void *nativeGraphicsDeviceForWidget(QWidget *widget); + virtual void *nativeResourceForWidget(const QByteArray &resource, QWidget *widget); }; QT_END_NAMESPACE -- cgit v0.12