From dad7a6fafd27ee6331869c08adbe7cc071c16417 Mon Sep 17 00:00:00 2001 From: Johan Klokkhammer Helsing Date: Mon, 4 Jul 2016 17:54:22 +0200 Subject: Rename sendUnMaximized to sendUnmaximized Change-Id: I20add5c8b12e1345ce50c009d8bae80fde9806e1 Reviewed-by: Paul Olav Tvete --- examples/wayland/qwindow-compositor/windowcompositor.cpp | 2 +- src/compositor/extensions/qwaylandxdgshell.cpp | 2 +- src/compositor/extensions/qwaylandxdgshell.h | 2 +- src/compositor/extensions/qwaylandxdgshellintegration.cpp | 4 ++-- src/imports/compositor/plugins.qmltypes | 4 ++-- tests/auto/compositor/tst_compositor.cpp | 4 ++-- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/examples/wayland/qwindow-compositor/windowcompositor.cpp b/examples/wayland/qwindow-compositor/windowcompositor.cpp index 4c1fae23c..31126ad85 100644 --- a/examples/wayland/qwindow-compositor/windowcompositor.cpp +++ b/examples/wayland/qwindow-compositor/windowcompositor.cpp @@ -112,7 +112,7 @@ void WindowCompositorView::onXdgSetMaximized() void WindowCompositorView::onXdgUnsetMaximized() { - m_xdgSurface->sendUnMaximized(); + m_xdgSurface->sendUnmaximized(); } void WindowCompositorView::onXdgSetFullscreen(QWaylandOutput* clientPreferredOutput) diff --git a/src/compositor/extensions/qwaylandxdgshell.cpp b/src/compositor/extensions/qwaylandxdgshell.cpp index 137f3ec31..92676e0ef 100644 --- a/src/compositor/extensions/qwaylandxdgshell.cpp +++ b/src/compositor/extensions/qwaylandxdgshell.cpp @@ -938,7 +938,7 @@ uint QWaylandXdgSurface::sendMaximized(const QSize &size) return sendConfigure(size, conf.states); } -uint QWaylandXdgSurface::sendUnMaximized(const QSize &size) +uint QWaylandXdgSurface::sendUnmaximized(const QSize &size) { Q_D(QWaylandXdgSurface); QWaylandXdgSurfacePrivate::ConfigureEvent conf = d->lastSentConfigure(); diff --git a/src/compositor/extensions/qwaylandxdgshell.h b/src/compositor/extensions/qwaylandxdgshell.h index a12d16480..35b55fa23 100644 --- a/src/compositor/extensions/qwaylandxdgshell.h +++ b/src/compositor/extensions/qwaylandxdgshell.h @@ -155,7 +155,7 @@ public: Q_INVOKABLE void sendClose(); Q_INVOKABLE uint sendMaximized(const QSize &size); - Q_INVOKABLE uint sendUnMaximized(const QSize &size = QSize(0, 0)); + Q_INVOKABLE uint sendUnmaximized(const QSize &size = QSize(0, 0)); Q_INVOKABLE uint sendFullscreen(const QSize &size); Q_INVOKABLE uint sendResizing(const QSize &maxSize); diff --git a/src/compositor/extensions/qwaylandxdgshellintegration.cpp b/src/compositor/extensions/qwaylandxdgshellintegration.cpp index 514f956ba..cb3b7ea23 100644 --- a/src/compositor/extensions/qwaylandxdgshellintegration.cpp +++ b/src/compositor/extensions/qwaylandxdgshellintegration.cpp @@ -96,7 +96,7 @@ bool XdgShellIntegration::mouseReleaseEvent(QMouseEvent *event) Q_UNUSED(event); if (grabberState == GrabberState::Resize) { - m_xdgSurface->sendUnMaximized(); + m_xdgSurface->sendUnmaximized(); grabberState = GrabberState::Default; return true; } else if (grabberState == GrabberState::Move) { @@ -135,7 +135,7 @@ void XdgShellIntegration::handleSetMaximized() void XdgShellIntegration::handleUnsetMaximized() { - m_xdgSurface->sendUnMaximized(maximizeState.initialWindowSize); + m_xdgSurface->sendUnmaximized(maximizeState.initialWindowSize); } void XdgShellIntegration::handleMaximizedChanged() diff --git a/src/imports/compositor/plugins.qmltypes b/src/imports/compositor/plugins.qmltypes index 04ddb32ff..c57810a8e 100644 --- a/src/imports/compositor/plugins.qmltypes +++ b/src/imports/compositor/plugins.qmltypes @@ -659,11 +659,11 @@ Module { Parameter { name: "size"; type: "QSize" } } Method { - name: "sendUnMaximized" + name: "sendUnmaximized" type: "uint" Parameter { name: "size"; type: "QSize" } } - Method { name: "sendUnMaximized"; type: "uint" } + Method { name: "sendUnmaximized"; type: "uint" } Method { name: "sendFullscreen" type: "uint" diff --git a/tests/auto/compositor/tst_compositor.cpp b/tests/auto/compositor/tst_compositor.cpp index bf4d6f261..cf7178ed8 100644 --- a/tests/auto/compositor/tst_compositor.cpp +++ b/tests/auto/compositor/tst_compositor.cpp @@ -523,7 +523,7 @@ void tst_WaylandCompositor::sendsXdgConfigure() QTRY_VERIFY(xdgSurface->activated()); QTRY_VERIFY(xdgSurface->maximized()); - xdgSurface->sendUnMaximized(); + xdgSurface->sendUnmaximized(); compositor.flushClients(); QTRY_VERIFY(!mockXdgSurface.configureStates.contains(QWaylandXdgSurface::State::MaximizedState)); QTRY_VERIFY(mockXdgSurface.configureStates.contains(QWaylandXdgSurface::State::ActivatedState)); @@ -545,7 +545,7 @@ void tst_WaylandCompositor::sendsXdgConfigure() QTRY_COMPARE(mockXdgSurface.configureSize, QSize(1024, 768)); uint fullscreenSerial = mockXdgSurface.configureSerial; - xdgSurface->sendUnMaximized(); + xdgSurface->sendUnmaximized(); compositor.flushClients(); QTRY_VERIFY(mockXdgSurface.configureStates.contains(QWaylandXdgSurface::State::ActivatedState)); QTRY_VERIFY(!mockXdgSurface.configureStates.contains(QWaylandXdgSurface::State::FullscreenState)); -- cgit v1.2.3