diff options
author | Shawn Rutledge <shawn.rutledge@qt.io> | 2022-02-08 20:14:51 +0100 |
---|---|---|
committer | Shawn Rutledge <shawn.rutledge@qt.io> | 2022-02-09 14:39:52 +0100 |
commit | c17f0eaff0a50a31a969e33b14a29a945e7aa0a8 (patch) | |
tree | ed775bdd11859f01a0d69783bd0d0bc01573945f | |
parent | 770c0ce2f1f451f7e70f5637e0997b11677b4b50 (diff) | |
download | qtwayland-c17f0eaff0a50a31a969e33b14a29a945e7aa0a8.tar.gz |
Fix unused warnings
Unused lambda capture and private variables that clang complains about.
Task-number: QTBUG-100249
Change-Id: I204eea8d4fc0c22542224d94bae113fa66870d15
Reviewed-by: Liang Qi <liang.qi@qt.io>
(cherry picked from commit 389a0a54ea3774cd07a2265ea71fcae92e7b3894)
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
-rw-r--r-- | src/client/qwaylanddisplay.cpp | 2 | ||||
-rw-r--r-- | src/client/qwaylandinputmethodcontext.cpp | 2 | ||||
-rw-r--r-- | src/client/qwaylandinputmethodcontext_p.h | 2 | ||||
-rw-r--r-- | src/compositor/compositor_api/qwaylandquickitem.cpp | 2 | ||||
-rw-r--r-- | src/compositor/compositor_api/qwaylandquickitem_p.h | 3 |
5 files changed, 3 insertions, 8 deletions
diff --git a/src/client/qwaylanddisplay.cpp b/src/client/qwaylanddisplay.cpp index 4e0a90b7..16cbfc51 100644 --- a/src/client/qwaylanddisplay.cpp +++ b/src/client/qwaylanddisplay.cpp @@ -866,7 +866,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/client/qwaylandinputmethodcontext.cpp b/src/client/qwaylandinputmethodcontext.cpp index f8c91411..033c89c8 100644 --- a/src/client/qwaylandinputmethodcontext.cpp +++ b/src/client/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/client/qwaylandinputmethodcontext_p.h b/src/client/qwaylandinputmethodcontext_p.h index 6fd0d284..7fe64f2d 100644 --- a/src/client/qwaylandinputmethodcontext_p.h +++ b/src/client/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/compositor/compositor_api/qwaylandquickitem.cpp b/src/compositor/compositor_api/qwaylandquickitem.cpp index 70e8bdd7..1b8f4049 100644 --- a/src/compositor/compositor_api/qwaylandquickitem.cpp +++ b/src/compositor/compositor_api/qwaylandquickitem.cpp @@ -145,8 +145,8 @@ static const struct { }; QWaylandBufferMaterialShader::QWaylandBufferMaterialShader(QWaylandBufferRef::BufferFormatEgl format) - : m_format(format) { + Q_UNUSED(format); setShaderFileName(VertexStage, QString::fromLatin1(bufferTypes[format].vertexShaderSourceFile)); auto fragmentShaderSourceFile = QString::fromLatin1(bufferTypes[format].fragmentShaderSourceFile); diff --git a/src/compositor/compositor_api/qwaylandquickitem_p.h b/src/compositor/compositor_api/qwaylandquickitem_p.h index 13892204..d25f21f1 100644 --- a/src/compositor/compositor_api/qwaylandquickitem_p.h +++ b/src/compositor/compositor_api/qwaylandquickitem_p.h @@ -65,9 +65,6 @@ public: void updateSampledImage(RenderState &state, int binding, QSGTexture **texture, QSGMaterial *newMaterial, QSGMaterial *oldMaterial) override; void setupExternalOESShader(const QString &shaderFilename); - -private: - const QWaylandBufferRef::BufferFormatEgl m_format; }; class QWaylandBufferMaterial : public QSGMaterial |