From 40217a5a3fb20a625ae4ec43cda84f89a435482d Mon Sep 17 00:00:00 2001 From: Pier Luigi Fiorini Date: Sun, 15 Nov 2015 12:14:26 +0100 Subject: Rename setPopup surface argument Make setPopup signature consistent with setTransient and fix potential issues with QML since "parent" is special. Change-Id: Ib3736af63d106f50379b3e296b73d8690d9bc09f Reviewed-by: Laszlo Agocs Reviewed-by: Paul Olav Tvete --- src/compositor/extensions/qwaylandshell.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/compositor/extensions/qwaylandshell.h b/src/compositor/extensions/qwaylandshell.h index 89016a245..3794a11da 100644 --- a/src/compositor/extensions/qwaylandshell.h +++ b/src/compositor/extensions/qwaylandshell.h @@ -134,7 +134,7 @@ Q_SIGNALS: void setDefaultToplevel(); void setTransient(QWaylandSurface *parentSurface, const QPoint &relativeToParent, FocusPolicy focusPolicy); void setFullScreen(FullScreenMethod method, uint framerate, QWaylandOutput *output); - void setPopup(QWaylandInputDevice *inputDevice, QWaylandSurface *parent, const QPoint &relativeToParent); + void setPopup(QWaylandInputDevice *inputDevice, QWaylandSurface *parentSurface, const QPoint &relativeToParent); void setMaximized(QWaylandOutput *output); private: -- cgit v1.2.3