diff options
author | Gunnar Sletta <gunnar.sletta@nokia.com> | 2011-09-13 08:54:45 +0200 |
---|---|---|
committer | Gunnar Sletta <gunnar.sletta@nokia.com> | 2011-09-13 08:54:45 +0200 |
commit | b62bd0584a7872b6917917009b707785b3abd077 (patch) | |
tree | 9981f274712c098cabbff0c4667672a3934e5393 /src/gui/kernel/qplatformscreen_qpa.h | |
parent | 5e10745dca1d10025404a9f268f03ae697fb10cc (diff) | |
parent | 97baad65f65783d2b5ff938f6217aec9434f2e5f (diff) |
Merge branch 'refactor'
Conflicts:
mkspecs/qws/linux-lsb-g++/qmake.conf
src/gui/image/qpixmap_mac.cpp
src/gui/painting/qpaintengine_x11.cpp
src/gui/painting/qtessellator.cpp
src/gui/text/qfontengine_qws.cpp
src/gui/text/qfontengine_x11.cpp
src/gui/widgets/qlinecontrol.cpp
src/opengl/qgl.h
src/opengl/qgl_x11egl.cpp
src/plugins/plugins.pro
Change-Id: If52dcd55cd55f2983a756c2f843967702b60a310
Diffstat (limited to 'src/gui/kernel/qplatformscreen_qpa.h')
-rw-r--r-- | src/gui/kernel/qplatformscreen_qpa.h | 41 |
1 files changed, 32 insertions, 9 deletions
diff --git a/src/gui/kernel/qplatformscreen_qpa.h b/src/gui/kernel/qplatformscreen_qpa.h index a9ce7c29e3..3851b1821a 100644 --- a/src/gui/kernel/qplatformscreen_qpa.h +++ b/src/gui/kernel/qplatformscreen_qpa.h @@ -51,7 +51,8 @@ #include <QtGui/qcursor.h> #include <QtGui/qimage.h> -#include <QtGui/qwidget.h> +#include <QtGui/qwindowdefs.h> +#include <QtGui/qplatformpixmap_qpa.h> QT_BEGIN_HEADER @@ -59,24 +60,46 @@ QT_BEGIN_NAMESPACE QT_MODULE(Gui) -class Q_GUI_EXPORT QPlatformScreen : public QObject +class QPlatformBackingStore; +class QPlatformOpenGLContext; +class QPlatformScreenPrivate; +class QPlatformWindow; +class QScreen; +class QSurfaceFormat; + +class Q_GUI_EXPORT QPlatformScreen { - Q_OBJECT + Q_DECLARE_PRIVATE(QPlatformScreen) + public: - virtual ~QPlatformScreen() { } + QPlatformScreen(); + virtual ~QPlatformScreen(); + + virtual QPixmap grabWindow(WId window, int x, int y, int width, int height) const; virtual QRect geometry() const = 0; virtual QRect availableGeometry() const {return geometry();} + virtual int depth() const = 0; virtual QImage::Format format() const = 0; virtual QSize physicalSize() const; - //jl: should setDirty be removed. - virtual void setDirty(const QRect &) {} - virtual QWidget *topLevelAt(const QPoint &point) const; + + virtual QWindow *topLevelAt(const QPoint &point) const; + virtual QList<QPlatformScreen *> virtualSiblings() const; + + QScreen *screen() const; //jl: should this function be in QPlatformIntegration - //jl: maybe screenForWidget is a better name? - static QPlatformScreen *platformScreenForWidget(const QWidget *widget); + //jl: maybe screenForWindow is a better name? + static QPlatformScreen *platformScreenForWindow(const QWindow *window); + + virtual QString name() const { return QString(); } + +protected: + QScopedPointer<QPlatformScreenPrivate> d_ptr; + +private: + Q_DISABLE_COPY(QPlatformScreen) }; QT_END_NAMESPACE |