From 699770b7c7f0a3466f01971151a3b333443a2a2d Mon Sep 17 00:00:00 2001
From: Shawn Rutledge <shawn.rutledge@qt.io>
Date: Tue, 8 Feb 2022 20:14:51 +0100
Subject: [PATCH] Fix unused warnings

Unused lambda capture and private variables that clang complains about.

Pick-to: 6.2 6.3
Task-number: QTBUG-100249
Change-Id: I204eea8d4fc0c22542224d94bae113fa66870d15
Reviewed-by: Liang Qi <liang.qi@qt.io>
---
 src/plugins/platforms/wayland/qwaylanddisplay.cpp            | 2 +-
 src/plugins/platforms/wayland/qwaylandinputmethodcontext.cpp | 2 +-
 src/plugins/platforms/wayland/qwaylandinputmethodcontext_p.h | 2 --
 src/plugins/platforms/wayland/qwaylandtextinputv1.cpp        | 2 +-
 src/plugins/platforms/wayland/qwaylandtextinputv1_p.h        | 1 -
 5 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/plugins/platforms/wayland/qwaylanddisplay.cpp b/src/plugins/platforms/wayland/qwaylanddisplay.cpp
index 5937172f052..c97e71a9b5f 100644
--- a/src/plugins/platforms/wayland/qwaylanddisplay.cpp
+++ b/src/plugins/platforms/wayland/qwaylanddisplay.cpp
@@ -900,7 +900,7 @@ bool QWaylandDisplay::isKeyboardAvailable() const
 {
     return std::any_of(
             mInputDevices.constBegin(), mInputDevices.constEnd(),
-            [this](const QWaylandInputDevice *device) { return device->keyboard() != nullptr; });
+            [](const QWaylandInputDevice *device) { return device->keyboard() != nullptr; });
 }
 
 #if QT_CONFIG(cursor)
diff --git a/src/plugins/platforms/wayland/qwaylandinputmethodcontext.cpp b/src/plugins/platforms/wayland/qwaylandinputmethodcontext.cpp
index f8c91411587..033c89c879e 100644
--- a/src/plugins/platforms/wayland/qwaylandinputmethodcontext.cpp
+++ b/src/plugins/platforms/wayland/qwaylandinputmethodcontext.cpp
@@ -55,8 +55,8 @@ static constexpr int maxStringSize = 1000; // actual max is 4096/3
 
 QWaylandTextInputMethod::QWaylandTextInputMethod(QWaylandDisplay *display, struct ::qt_text_input_method_v1 *textInputMethod)
     : QtWayland::qt_text_input_method_v1(textInputMethod)
-    , m_display(display)
 {
+    Q_UNUSED(display);
 }
 
 QWaylandTextInputMethod::~QWaylandTextInputMethod()
diff --git a/src/plugins/platforms/wayland/qwaylandinputmethodcontext_p.h b/src/plugins/platforms/wayland/qwaylandinputmethodcontext_p.h
index 6fd0d284bc7..7fe64f2dade 100644
--- a/src/plugins/platforms/wayland/qwaylandinputmethodcontext_p.h
+++ b/src/plugins/platforms/wayland/qwaylandinputmethodcontext_p.h
@@ -103,8 +103,6 @@ public:
     void sendInputState(QInputMethodQueryEvent *state, Qt::InputMethodQueries queries = Qt::ImQueryInput);
 
 private:
-    QWaylandDisplay *m_display;
-
     QHash<int, QList<QInputMethodEvent::Attribute> > m_pendingInputMethodEvents;
     QHash<int,int> m_offsetFromCompositor;
 
diff --git a/src/plugins/platforms/wayland/qwaylandtextinputv1.cpp b/src/plugins/platforms/wayland/qwaylandtextinputv1.cpp
index 5e204a7ffba..a2c06a5ba47 100644
--- a/src/plugins/platforms/wayland/qwaylandtextinputv1.cpp
+++ b/src/plugins/platforms/wayland/qwaylandtextinputv1.cpp
@@ -73,8 +73,8 @@ const Qt::InputMethodQueries supportedQueries = Qt::ImEnabled |
 
 QWaylandTextInputv1::QWaylandTextInputv1(QWaylandDisplay *display, struct ::zwp_text_input_v1 *text_input)
     : QtWayland::zwp_text_input_v1(text_input)
-    , m_display(display)
 {
+    Q_UNUSED(display);
 }
 
 QWaylandTextInputv1::~QWaylandTextInputv1()
diff --git a/src/plugins/platforms/wayland/qwaylandtextinputv1_p.h b/src/plugins/platforms/wayland/qwaylandtextinputv1_p.h
index 238db0b8af8..068987cd12d 100644
--- a/src/plugins/platforms/wayland/qwaylandtextinputv1_p.h
+++ b/src/plugins/platforms/wayland/qwaylandtextinputv1_p.h
@@ -121,7 +121,6 @@ protected:
 private:
     Qt::KeyboardModifiers modifiersToQtModifiers(uint32_t modifiers);
 
-    QWaylandDisplay *m_display = nullptr;
     QWaylandInputMethodEventBuilder m_builder;
 
     QList<Qt::KeyboardModifier> m_modifiersMap;