summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohan Klokkhammer Helsing <johan.helsing@qt.io>2016-07-04 17:54:22 +0200
committerPaul Olav Tvete <paul.tvete@qt.io>2016-07-12 07:47:19 +0000
commitdad7a6fafd27ee6331869c08adbe7cc071c16417 (patch)
treebf20122d65ee9e76c7f854b900f539c15bad7c00
parent887f64448e49aa5539ad3cc23a2bac4e8c63648d (diff)
Rename sendUnMaximized to sendUnmaximized
Change-Id: I20add5c8b12e1345ce50c009d8bae80fde9806e1 Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
-rw-r--r--examples/wayland/qwindow-compositor/windowcompositor.cpp2
-rw-r--r--src/compositor/extensions/qwaylandxdgshell.cpp2
-rw-r--r--src/compositor/extensions/qwaylandxdgshell.h2
-rw-r--r--src/compositor/extensions/qwaylandxdgshellintegration.cpp4
-rw-r--r--src/imports/compositor/plugins.qmltypes4
-rw-r--r--tests/auto/compositor/tst_compositor.cpp4
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));