rename QWaylandExtensionTemplate::get to findIn

Change-Id: I7fcfd2e4974cf1b5b32592a6d5c03ed335a9f446

10 files changed, 15 insertions, 21 deletions

diff --git a/src/compositor/compositor_api/qwaylandquicksurface.cpp b/src/compositor/compositor_api/qwaylandquicksurface.cpp
index a1611b3c3..fda3c2110 100644
--- a/src/compositor/compositor_api/qwaylandquicksurface.cpp
+++ b/src/compositor/compositor_api/qwaylandquicksurface.cpp
@@ -169,7 +169,7 @@ void QWaylandQuickSurface::setClientRenderingEnabled(bool enabled)
     if (d->clientRenderingEnabled != enabled) {
         d->clientRenderingEnabled = enabled;
 
-        if (QtWayland::ExtendedSurface *extSurface = QtWayland::ExtendedSurface::get(this))
+        if (QtWayland::ExtendedSurface *extSurface = QtWayland::ExtendedSurface::findIn(this))
             extSurface->setVisibility(enabled ? QWindow::AutomaticVisibility : QWindow::Hidden);
 
         emit clientRenderingEnabledChanged();
diff --git a/src/compositor/extensions/qwlinputpanel.cpp b/src/compositor/extensions/qwlinputpanel.cpp
index 392a62baa..4b0016aa2 100644
--- a/src/compositor/extensions/qwlinputpanel.cpp
+++ b/src/compositor/extensions/qwlinputpanel.cpp
@@ -116,14 +116,9 @@ void QWaylandInputPanelPrivate::setCursorRectangle(const QRect &cursorRectangle)
     Q_EMIT q->cursorRectangleChanged();
 }
 
-QWaylandInputPanelPrivate *QWaylandInputPanelPrivate::get(QWaylandInputPanel *panel)
+QWaylandInputPanelPrivate *QWaylandInputPanelPrivate::findIn(QWaylandExtensionContainer *container)
 {
-    return panel->d_func();
-}
-
-QWaylandInputPanelPrivate *QWaylandInputPanelPrivate::get(QWaylandExtensionContainer *container)
-{
-    QWaylandInputPanel *panel = QWaylandInputPanel::get(container);
+    QWaylandInputPanel *panel = QWaylandInputPanel::findIn(container);
     if (!panel)
         return Q_NULLPTR;
     return panel->d_func();
diff --git a/src/compositor/extensions/qwlinputpanel_p.h b/src/compositor/extensions/qwlinputpanel_p.h
index 1add11e1a..1e41296b5 100644
--- a/src/compositor/extensions/qwlinputpanel_p.h
+++ b/src/compositor/extensions/qwlinputpanel_p.h
@@ -73,8 +73,7 @@ public:
     QRect cursorRectangle() const;
     void setCursorRectangle(const QRect &cursorRectangle);
 
-    static QWaylandInputPanelPrivate *get(QWaylandInputPanel *panel);
-    static QWaylandInputPanelPrivate *get(QWaylandExtensionContainer *container);
+    static QWaylandInputPanelPrivate *findIn(QWaylandExtensionContainer *container);
 protected:
     void input_panel_get_input_panel_surface(Resource *resource, uint32_t id, struct ::wl_resource *surface) Q_DECL_OVERRIDE;
 
diff --git a/src/compositor/extensions/qwltextinput.cpp b/src/compositor/extensions/qwltextinput.cpp
index 57dbff43f..1da6acef1 100644
--- a/src/compositor/extensions/qwltextinput.cpp
+++ b/src/compositor/extensions/qwltextinput.cpp
@@ -130,7 +130,7 @@ void TextInput::text_input_show_input_panel(Resource *)
     m_inputPanelVisible = true;
 
     if (std::find_if(m_activeInputMethods.cbegin(), m_activeInputMethods.cend(), isInputMethodBound) != m_activeInputMethods.cend()){
-        QWaylandInputPanelPrivate *panel = QWaylandInputPanelPrivate::get(m_compositor->waylandCompositor());
+        QWaylandInputPanelPrivate *panel = QWaylandInputPanelPrivate::findIn(m_compositor->waylandCompositor());
         if (panel)
             panel->setInputPanelVisible(true);
     }
@@ -141,7 +141,7 @@ void TextInput::text_input_hide_input_panel(Resource *)
     m_inputPanelVisible = false;
 
     if (std::find_if(m_activeInputMethods.cbegin(), m_activeInputMethods.cend(), isInputMethodBound) != m_activeInputMethods.cend()) {
-        QWaylandInputPanelPrivate *panel = QWaylandInputPanelPrivate::get(m_compositor->waylandCompositor());
+        QWaylandInputPanelPrivate *panel = QWaylandInputPanelPrivate::findIn(m_compositor->waylandCompositor());
         if (panel)
             panel->setInputPanelVisible(false);
     }
@@ -152,7 +152,7 @@ void TextInput::text_input_set_cursor_rectangle(Resource *, int32_t x, int32_t y
     m_cursorRectangle = QRect(x, y, width, height);
 
     if (!m_activeInputMethods.isEmpty()) {
-        QWaylandInputPanelPrivate *panel = QWaylandInputPanelPrivate::get(m_compositor->waylandCompositor());
+        QWaylandInputPanelPrivate *panel = QWaylandInputPanelPrivate::findIn(m_compositor->waylandCompositor());
         if (panel)
             panel->setCursorRectangle(m_cursorRectangle);
     }
diff --git a/src/compositor/global/qwaylandextension.h b/src/compositor/global/qwaylandextension.h
index dbb87a99b..851483268 100644
--- a/src/compositor/global/qwaylandextension.h
+++ b/src/compositor/global/qwaylandextension.h
@@ -93,7 +93,7 @@ public:
         return T::interface();
     }
 
-    static T *get(QWaylandExtensionContainer *container)
+    static T *findIn(QWaylandExtensionContainer *container)
     {
         if (!container) return Q_NULLPTR;
         return qobject_cast<T *>(container->extension(T::interfaceName()));
diff --git a/src/compositor/wayland_wrapper/qwlcompositor.cpp b/src/compositor/wayland_wrapper/qwlcompositor.cpp
index d9b0e1207..5ae77d882 100644
--- a/src/compositor/wayland_wrapper/qwlcompositor.cpp
+++ b/src/compositor/wayland_wrapper/qwlcompositor.cpp
@@ -331,7 +331,7 @@ void Compositor::destroyClient(QWaylandClient *client)
     if (!client)
         return;
 
-    WindowManagerServerIntegration *wmExtension = static_cast<WindowManagerServerIntegration *>(waylandCompositor()->extension(QtWaylandServer::qt_windowmanager::name()));
+    QWaylandWindowManagerExtension *wmExtension = QWaylandWindowManagerExtension::findIn(waylandCompositor());
     if (wmExtension)
         wmExtension->sendQuitMessage(client->client());
 
diff --git a/src/compositor/wayland_wrapper/qwlinputdevice.cpp b/src/compositor/wayland_wrapper/qwlinputdevice.cpp
index 2a93edbb8..745c3bbc5 100644
--- a/src/compositor/wayland_wrapper/qwlinputdevice.cpp
+++ b/src/compositor/wayland_wrapper/qwlinputdevice.cpp
@@ -200,7 +200,7 @@ void QWaylandInputDevicePrivate::sendFullKeyEvent(QKeyEvent *event)
         return;
     }
 
-    QtWayland::QtKeyExtensionGlobal *ext = QtWayland::QtKeyExtensionGlobal::get(m_compositor);
+    QtWayland::QtKeyExtensionGlobal *ext = QtWayland::QtKeyExtensionGlobal::findIn(m_compositor);
     if (ext && ext->postQtKeyEvent(event, keyboardFocus()->handle()))
         return;
 
@@ -214,7 +214,7 @@ void QWaylandInputDevicePrivate::sendFullKeyEvent(QKeyEvent *event)
 
 void QWaylandInputDevicePrivate::sendFullKeyEvent(QWaylandSurface *surface, QKeyEvent *event)
 {
-    QtWayland::QtKeyExtensionGlobal *ext = QtWayland::QtKeyExtensionGlobal::get(m_compositor);
+    QtWayland::QtKeyExtensionGlobal *ext = QtWayland::QtKeyExtensionGlobal::findIn(m_compositor);
     if (ext)
         ext->postQtKeyEvent(event, surface->handle());
 }
diff --git a/src/compositor/wayland_wrapper/qwlinputmethod.cpp b/src/compositor/wayland_wrapper/qwlinputmethod.cpp
index a9ea4bbb3..ca7ce53fd 100644
--- a/src/compositor/wayland_wrapper/qwlinputmethod.cpp
+++ b/src/compositor/wayland_wrapper/qwlinputmethod.cpp
@@ -78,7 +78,7 @@ void InputMethod::activate(TextInput *textInput)
 
     send_activate(m_resource->handle, m_context->resource()->handle);
 
-    QWaylandInputPanelPrivate *panel = QWaylandInputPanelPrivate::get(m_compositor);
+    QWaylandInputPanelPrivate *panel = QWaylandInputPanelPrivate::findIn(m_compositor);
     if (panel) {
         panel->setFocus(textInput->focus());
         panel->setCursorRectangle(textInput->cursorRectangle());
@@ -97,7 +97,7 @@ void InputMethod::deactivate()
     m_textInput = 0;
     m_context = 0;
 
-    QWaylandInputPanelPrivate *panel = QWaylandInputPanelPrivate::get(m_compositor);
+    QWaylandInputPanelPrivate *panel = QWaylandInputPanelPrivate::findIn(m_compositor);
     if (panel) {
         panel->setFocus(0);
         panel->setCursorRectangle(QRect());
diff --git a/src/compositor/wayland_wrapper/qwlkeyboard.cpp b/src/compositor/wayland_wrapper/qwlkeyboard.cpp
index 2a0f857ea..584bb90c3 100644
--- a/src/compositor/wayland_wrapper/qwlkeyboard.cpp
+++ b/src/compositor/wayland_wrapper/qwlkeyboard.cpp
@@ -135,7 +135,7 @@ void QWaylandKeyboardPrivate::focused(QWaylandSurface *surface)
 
 bool QWaylandKeyboardPrivate::setFocus(QWaylandSurface* surface)
 {
-    QtWayland::ShellSurface *shellsurface = QtWayland::ShellSurface::get(surface);
+    QtWayland::ShellSurface *shellsurface = QtWayland::ShellSurface::findIn(surface);
     if (shellsurface &&  shellsurface->isTransientInactive())
             return false;
     m_grab->focused(surface);
diff --git a/src/compositor/wayland_wrapper/qwltouch.cpp b/src/compositor/wayland_wrapper/qwltouch.cpp
index a0676b180..7f69f955f 100644
--- a/src/compositor/wayland_wrapper/qwltouch.cpp
+++ b/src/compositor/wayland_wrapper/qwltouch.cpp
@@ -138,7 +138,7 @@ void QWaylandTouchPrivate::sendFullTouchEvent(QTouchEvent *event)
         return;
     }
 
-    QtWayland::TouchExtensionGlobal *ext = QtWayland::TouchExtensionGlobal::get(compositor());
+    QtWayland::TouchExtensionGlobal *ext = QtWayland::TouchExtensionGlobal::findIn(compositor());
     if (ext && ext->postTouchEvent(event, m_seat->mouseFocus()))
         return;