diff options
| author | Johan Klokkhammer Helsing <johan.helsing@qt.io> | 2016-05-20 09:59:56 +0200 |
|---|---|---|
| committer | Johan Helsing <johan.helsing@qt.io> | 2016-05-31 13:12:44 +0000 |
| commit | 4427c867543c6a970efd5a5ad7d52ee715c11e88 (patch) | |
| tree | cadfcc8789d33125c18fd5b3c67ef0b8d6ec04e4 /tests/auto/compositor | |
| parent | 5dd65d75bef5d07d8b29b3270f3f1410a921c073 (diff) | |
| download | qtwayland-4427c867543c6a970efd5a5ad7d52ee715c11e88.tar.gz | |
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>
Diffstat (limited to 'tests/auto/compositor')
| -rw-r--r-- | tests/auto/compositor/tst_compositor.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/tests/auto/compositor/tst_compositor.cpp b/tests/auto/compositor/tst_compositor.cpp index 8405277b..d3db972b 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)); |