Rename xdg surface request<state> methods send<state>

It could be confusing to have methods that cause Wayland events to be
named request*.

Change-Id: I6567f9e8fd9370e574516e97cd49858e2bf34829
Reviewed-by: Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>

5 files changed, 23 insertions, 23 deletions

diff --git a/examples/wayland/qwindow-compositor/windowcompositor.cpp b/examples/wayland/qwindow-compositor/windowcompositor.cpp
index d3e3e1cf0..3a41c8704 100644
--- a/examples/wayland/qwindow-compositor/windowcompositor.cpp
+++ b/examples/wayland/qwindow-compositor/windowcompositor.cpp
@@ -101,7 +101,7 @@ bool WindowCompositorView::isCursor() const
 
 void WindowCompositorView::onXdgSetMaximized()
 {
-    m_xdgSurface->requestMaximized(output()->geometry().size());
+    m_xdgSurface->sendMaximized(output()->geometry().size());
 
     // An improvement here, would have been to wait for the commit after the ack_configure for the
     // request above before moving the window. This would have prevented the window from being
@@ -112,7 +112,7 @@ void WindowCompositorView::onXdgSetMaximized()
 
 void WindowCompositorView::onXdgUnsetMaximized()
 {
-    m_xdgSurface->requestUnMaximized();
+    m_xdgSurface->sendUnMaximized();
 }
 
 void WindowCompositorView::onXdgSetFullscreen(QWaylandOutput* clientPreferredOutput)
@@ -121,7 +121,7 @@ void WindowCompositorView::onXdgSetFullscreen(QWaylandOutput* clientPreferredOut
             ? clientPreferredOutput
             : output();
 
-    m_xdgSurface->requestFullscreen(outputToFullscreen->geometry().size());
+    m_xdgSurface->sendFullscreen(outputToFullscreen->geometry().size());
 
     // An improvement here, would have been to wait for the commit after the ack_configure for the
     // request above before moving the window. This would have prevented the window from being
@@ -431,7 +431,7 @@ void WindowCompositor::handleResize(WindowCompositorView *target, const QSize &i
     if (xdgSurface) {
         QWaylandXdgSurface::ResizeEdge edges = static_cast<QWaylandXdgSurface::ResizeEdge>(edge);
         QSize newSize = xdgSurface->sizeForResize(initialSize, delta, edges);
-        xdgSurface->requestResizing(newSize);
+        xdgSurface->sendResizing(newSize);
     }
 }
 
diff --git a/src/compositor/extensions/qwaylandxdgshell.cpp b/src/compositor/extensions/qwaylandxdgshell.cpp
index dfc68e254..ad3a1fc90 100644
--- a/src/compositor/extensions/qwaylandxdgshell.cpp
+++ b/src/compositor/extensions/qwaylandxdgshell.cpp
@@ -867,7 +867,7 @@ void QWaylandXdgSurface::sendClose()
     d->send_close();
 }
 
-uint QWaylandXdgSurface::requestMaximized(const QSize &size)
+uint QWaylandXdgSurface::sendMaximized(const QSize &size)
 {
     Q_D(QWaylandXdgSurface);
     QWaylandXdgSurfacePrivate::ConfigureEvent conf = d->lastSentConfigure();
@@ -880,7 +880,7 @@ uint QWaylandXdgSurface::requestMaximized(const QSize &size)
     return sendConfigure(size, conf.states);
 }
 
-uint QWaylandXdgSurface::requestUnMaximized(const QSize &size)
+uint QWaylandXdgSurface::sendUnMaximized(const QSize &size)
 {
     Q_D(QWaylandXdgSurface);
     QWaylandXdgSurfacePrivate::ConfigureEvent conf = d->lastSentConfigure();
@@ -892,7 +892,7 @@ uint QWaylandXdgSurface::requestUnMaximized(const QSize &size)
     return sendConfigure(size, conf.states);
 }
 
-uint QWaylandXdgSurface::requestFullscreen(const QSize &size)
+uint QWaylandXdgSurface::sendFullscreen(const QSize &size)
 {
     Q_D(QWaylandXdgSurface);
     QWaylandXdgSurfacePrivate::ConfigureEvent conf = d->lastSentConfigure();
@@ -905,7 +905,7 @@ uint QWaylandXdgSurface::requestFullscreen(const QSize &size)
     return sendConfigure(size, conf.states);
 }
 
-uint QWaylandXdgSurface::requestResizing(const QSize &maxSize)
+uint QWaylandXdgSurface::sendResizing(const QSize &maxSize)
 {
     Q_D(QWaylandXdgSurface);
     QWaylandXdgSurfacePrivate::ConfigureEvent conf = d->lastSentConfigure();
diff --git a/src/compositor/extensions/qwaylandxdgshell.h b/src/compositor/extensions/qwaylandxdgshell.h
index c01726ac6..7f52ecb82 100644
--- a/src/compositor/extensions/qwaylandxdgshell.h
+++ b/src/compositor/extensions/qwaylandxdgshell.h
@@ -154,10 +154,10 @@ public:
     Q_INVOKABLE uint sendConfigure(const QSize &size, const QVector<State> &states);
     Q_INVOKABLE void sendClose();
 
-    Q_INVOKABLE uint requestMaximized(const QSize &size);
-    Q_INVOKABLE uint requestUnMaximized(const QSize &size = QSize(0, 0));
-    Q_INVOKABLE uint requestFullscreen(const QSize &size);
-    Q_INVOKABLE uint requestResizing(const QSize &maxSize);
+    Q_INVOKABLE uint sendMaximized(const QSize &size);
+    Q_INVOKABLE uint sendUnMaximized(const QSize &size = QSize(0, 0));
+    Q_INVOKABLE uint sendFullscreen(const QSize &size);
+    Q_INVOKABLE uint sendResizing(const QSize &maxSize);
 
     QWaylandQuickShellIntegration *createIntegration(QWaylandQuickShellSurfaceItem *item) Q_DECL_OVERRIDE;
 
diff --git a/src/compositor/extensions/qwaylandxdgshellintegration.cpp b/src/compositor/extensions/qwaylandxdgshellintegration.cpp
index f77f69273..b0ba00b16 100644
--- a/src/compositor/extensions/qwaylandxdgshellintegration.cpp
+++ b/src/compositor/extensions/qwaylandxdgshellintegration.cpp
@@ -73,7 +73,7 @@ bool XdgShellIntegration::mouseMoveEvent(QMouseEvent *event)
         float scaleFactor = m_item->view()->output()->scaleFactor();
         QPointF delta = (event->windowPos() - resizeState.initialMousePos) / scaleFactor;
         QSize newSize = m_xdgSurface->sizeForResize(resizeState.initialWindowSize, delta, resizeState.resizeEdges);
-        m_xdgSurface->requestResizing(newSize);
+        m_xdgSurface->sendResizing(newSize);
     } else if (grabberState == GrabberState::Move) {
         Q_ASSERT(moveState.inputDevice == m_item->compositor()->inputDeviceFor(event));
         QQuickItem *moveItem = m_item->moveItem();
@@ -96,7 +96,7 @@ bool XdgShellIntegration::mouseReleaseEvent(QMouseEvent *event)
         float scaleFactor = m_item->view()->output()->scaleFactor();
         QPointF delta = (event->windowPos() - resizeState.initialMousePos) / scaleFactor;
         QSize newSize = m_xdgSurface->sizeForResize(resizeState.initialWindowSize, delta, resizeState.resizeEdges);
-        m_xdgSurface->requestUnMaximized(newSize);
+        m_xdgSurface->sendUnMaximized(newSize);
         grabberState = GrabberState::Default;
         return true;
     } else if (grabberState == GrabberState::Move) {
@@ -130,12 +130,12 @@ void XdgShellIntegration::handleSetMaximized()
     maximizeState.initialPosition = m_item->position();
 
     QWaylandOutput *output = m_item->compositor()->outputs().first();
-    m_xdgSurface->requestMaximized(output->geometry().size() / output->scaleFactor());
+    m_xdgSurface->sendMaximized(output->geometry().size() / output->scaleFactor());
 }
 
 void XdgShellIntegration::handleUnsetMaximized()
 {
-    m_xdgSurface->requestUnMaximized(maximizeState.initialWindowSize);
+    m_xdgSurface->sendUnMaximized(maximizeState.initialWindowSize);
 }
 
 void XdgShellIntegration::handleMaximizedChanged()
diff --git a/tests/auto/compositor/tst_compositor.cpp b/tests/auto/compositor/tst_compositor.cpp
index 8405277b4..d3db972b9 100644
--- a/tests/auto/compositor/tst_compositor.cpp
+++ b/tests/auto/compositor/tst_compositor.cpp
@@ -508,7 +508,7 @@ void tst_WaylandCompositor::sendsXdgConfigure()
     QTRY_COMPARE(mockXdgSurface.configureStates, QList<uint>{QWaylandXdgSurface::State::ActivatedState});
     QTRY_COMPARE(mockXdgSurface.configureSize, QSize(10, 20));
 
-    xdgSurface->requestMaximized(QSize(800, 600));
+    xdgSurface->sendMaximized(QSize(800, 600));
     compositor.flushClients();
     QTRY_VERIFY(mockXdgSurface.configureStates.contains(QWaylandXdgSurface::State::MaximizedState));
     QTRY_VERIFY(mockXdgSurface.configureStates.contains(QWaylandXdgSurface::State::ActivatedState));
@@ -523,7 +523,7 @@ void tst_WaylandCompositor::sendsXdgConfigure()
     QTRY_VERIFY(xdgSurface->activated());
     QTRY_VERIFY(xdgSurface->maximized());
 
-    xdgSurface->requestUnMaximized();
+    xdgSurface->sendUnMaximized();
     compositor.flushClients();
     QTRY_VERIFY(!mockXdgSurface.configureStates.contains(QWaylandXdgSurface::State::MaximizedState));
     QTRY_VERIFY(mockXdgSurface.configureStates.contains(QWaylandXdgSurface::State::ActivatedState));
@@ -533,19 +533,19 @@ void tst_WaylandCompositor::sendsXdgConfigure()
     QTRY_VERIFY(xdgSurface->maximized());
     QTRY_VERIFY(xdgSurface->activated());
 
-    xdgSurface->requestResizing(QSize(800, 600));
+    xdgSurface->sendResizing(QSize(800, 600));
     compositor.flushClients();
     QTRY_VERIFY(mockXdgSurface.configureStates.contains(QWaylandXdgSurface::State::ResizingState));
     QTRY_COMPARE(mockXdgSurface.configureSize, QSize(800, 600));
 
-    xdgSurface->requestFullscreen(QSize(1024, 768));
+    xdgSurface->sendFullscreen(QSize(1024, 768));
     compositor.flushClients();
     QTRY_VERIFY(mockXdgSurface.configureStates.contains(QWaylandXdgSurface::State::ActivatedState));
     QTRY_VERIFY(mockXdgSurface.configureStates.contains(QWaylandXdgSurface::State::FullscreenState));
     QTRY_COMPARE(mockXdgSurface.configureSize, QSize(1024, 768));
     uint fullscreenSerial = mockXdgSurface.configureSerial;
 
-    xdgSurface->requestUnMaximized();
+    xdgSurface->sendUnMaximized();
     compositor.flushClients();
     QTRY_VERIFY(mockXdgSurface.configureStates.contains(QWaylandXdgSurface::State::ActivatedState));
     QTRY_VERIFY(!mockXdgSurface.configureStates.contains(QWaylandXdgSurface::State::FullscreenState));
@@ -554,11 +554,11 @@ void tst_WaylandCompositor::sendsXdgConfigure()
     compositor.flushClients();
     QTRY_VERIFY(!mockXdgSurface.configureStates.contains(QWaylandXdgSurface::State::ActivatedState));
 
-    xdgSurface->requestMaximized(QSize(800, 600));
+    xdgSurface->sendMaximized(QSize(800, 600));
     compositor.flushClients();
     QTRY_VERIFY(!mockXdgSurface.configureStates.contains(QWaylandXdgSurface::State::ActivatedState));
 
-    xdgSurface->requestFullscreen(QSize(800, 600));
+    xdgSurface->sendFullscreen(QSize(800, 600));
     compositor.flushClients();
     QTRY_VERIFY(!mockXdgSurface.configureStates.contains(QWaylandXdgSurface::State::MaximizedState));