summaryrefslogtreecommitdiffstats
path: root/src/plugins/platforms/xcb/qxcbwindow.h
diff options
context:
space:
mode:
authorTor Arne Vestbø <tor.arne.vestbo@qt.io>2016-11-25 15:02:55 +0100
committerTor Arne Vestbø <tor.arne.vestbo@qt.io>2017-01-05 12:07:35 +0000
commit2ac50ac15621e303adbf6c35cbc2456f7ae5dd2f (patch)
tree1eb44c0eff603841208c6254c9f4621fb51f2cb3 /src/plugins/platforms/xcb/qxcbwindow.h
parentc5282fc185caee86a3e35499763006c224118185 (diff)
Split QPlatformWindow::isEmbedded into isAncestorOf to separate concerns
The function was doing two things, both checking window ancestry and whether or the window was a direct child of non-Qt window. The former has now been split of in a QPlatformWindow::isAncestorOf(), which simplifies the code in e.g. QApplicationPrivate::isWindowBlocked(). Change-Id: I259a190e03ef8def23356005474eeeee74c9ae89 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Diffstat (limited to 'src/plugins/platforms/xcb/qxcbwindow.h')
-rw-r--r--src/plugins/platforms/xcb/qxcbwindow.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/platforms/xcb/qxcbwindow.h b/src/plugins/platforms/xcb/qxcbwindow.h
index 089df8f3f6..41befbf66f 100644
--- a/src/plugins/platforms/xcb/qxcbwindow.h
+++ b/src/plugins/platforms/xcb/qxcbwindow.h
@@ -87,7 +87,7 @@ public:
void setParent(const QPlatformWindow *window) override;
bool isExposed() const override;
- bool isEmbedded(const QPlatformWindow *parentWindow = 0) const override;
+ bool isEmbedded() const override;
QPoint mapToGlobal(const QPoint &pos) const override;
QPoint mapFromGlobal(const QPoint &pos) const override;