diff --git a/effects/touchpoints/touchpoints.cpp b/effects/touchpoints/touchpoints.cpp index c8e7948584..71a746943a 100644 --- a/effects/touchpoints/touchpoints.cpp +++ b/effects/touchpoints/touchpoints.cpp @@ -74,6 +74,7 @@ Qt::GlobalColor TouchPointsEffect::colorForId(quint32 id) bool TouchPointsEffect::touchDown(quint32 id, const QPointF &pos, quint32 time) { + Q_UNUSED(time) TouchPoint point; point.pos = pos; point.press = true; @@ -86,6 +87,7 @@ bool TouchPointsEffect::touchDown(quint32 id, const QPointF &pos, quint32 time) bool TouchPointsEffect::touchMotion(quint32 id, const QPointF &pos, quint32 time) { + Q_UNUSED(time) TouchPoint point; point.pos = pos; point.press = true; @@ -98,6 +100,7 @@ bool TouchPointsEffect::touchMotion(quint32 id, const QPointF &pos, quint32 time bool TouchPointsEffect::touchUp(quint32 id, quint32 time) { + Q_UNUSED(time) auto it = m_latestPositions.constFind(id); if (it != m_latestPositions.constEnd()) { TouchPoint point; diff --git a/globalshortcuts.cpp b/globalshortcuts.cpp index 5747de3942..51ca1b8a54 100644 --- a/globalshortcuts.cpp +++ b/globalshortcuts.cpp @@ -245,7 +245,7 @@ bool processShortcut(Qt::KeyboardModifiers mods, T key, U &shortcuts) return true; } -bool GlobalShortcutsManager::processKey(Qt::KeyboardModifiers mods, uint32_t key, int keyQt) +bool GlobalShortcutsManager::processKey(Qt::KeyboardModifiers mods, int keyQt) { if (m_kglobalAccelInterface) { auto check = [this] (Qt::KeyboardModifiers mods, int keyQt) { diff --git a/globalshortcuts.h b/globalshortcuts.h index e213e5104f..a03bd2920a 100644 --- a/globalshortcuts.h +++ b/globalshortcuts.h @@ -79,11 +79,10 @@ public: * @c false is returned. * * @param modifiers The current hold modifiers - * @param key The keysymbol which has been pressed * @param keyQt The Qt::Key which got pressed * @return @c true if a shortcut triggered, @c false otherwise */ - bool processKey(Qt::KeyboardModifiers modifiers, uint32_t key, int keyQt); + bool processKey(Qt::KeyboardModifiers modifiers, int keyQt); bool processPointerPressed(Qt::KeyboardModifiers modifiers, Qt::MouseButtons pointerButtons); /** * @brief Processes a pointer axis event to decide whether a shortcut needs to be triggered. diff --git a/input.cpp b/input.cpp index 0e07e1e877..11b0a4569a 100644 --- a/input.cpp +++ b/input.cpp @@ -734,7 +734,7 @@ public: } bool keyEvent(QKeyEvent *event) override { if (event->type() == QEvent::KeyPress) { - return input()->shortcuts()->processKey(static_cast(event)->modifiersRelevantForGlobalShortcuts(), event->nativeVirtualKey(), event->key()); + return input()->shortcuts()->processKey(static_cast(event)->modifiersRelevantForGlobalShortcuts(), event->key()); } return false; } @@ -1950,6 +1950,7 @@ Qt::KeyboardModifiers InputRedirection::modifiersRelevantForGlobalShortcuts() co void InputRedirection::registerShortcut(const QKeySequence &shortcut, QAction *action) { + Q_UNUSED(shortcut) kwinApp()->platform()->setupActionForGlobalAccel(action); } diff --git a/libkwineffects/kwinglutils.cpp b/libkwineffects/kwinglutils.cpp index 11a8163ea3..e63061d2f8 100644 --- a/libkwineffects/kwinglutils.cpp +++ b/libkwineffects/kwinglutils.cpp @@ -222,6 +222,7 @@ bool GLShader::link() const QByteArray GLShader::prepareSource(GLenum shaderType, const QByteArray &source) const { + Q_UNUSED(shaderType) // Prepare the source code QByteArray ba; if (GLPlatform::instance()->isGLES() && GLPlatform::instance()->glslVersion() < kVersionNumber(3, 0)) {