From 4427c867543c6a970efd5a5ad7d52ee715c11e88 Mon Sep 17 00:00:00 2001 From: Johan Klokkhammer Helsing Date: Fri, 20 May 2016 09:59:56 +0200 Subject: Rename xdg surface request methods send It could be confusing to have methods that cause Wayland events to be named request*. Change-Id: I6567f9e8fd9370e574516e97cd49858e2bf34829 Reviewed-by: Pier Luigi Fiorini --- tests/auto/compositor/tst_compositor.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'tests') 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{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)); -- cgit v1.2.3