Make InputDevice::leds() optional

Most input devices have no leds so by making them required, we pull quite a bit of boilerplate code.
1 year ago · ecf7520525
parent f5252919dc
commit ecf7520525
15 changed files with 11 additions and 83 deletions
--- a/autotests/integration/kwin_wayland_test.h
+++ b/autotests/integration/kwin_wayland_test.h
@ -652,9 +652,6 @@ public:
    bool isEnabled() const override;
    void setEnabled(bool enabled) override;

-    LEDs leds() const override;
-    void setLeds(LEDs leds) override;
-
    bool isKeyboard() const override;
    bool isPointer() const override;
    bool isTouchpad() const override;
--- a/autotests/integration/test_helpers.cpp
+++ b/autotests/integration/test_helpers.cpp
@ -1658,15 +1658,6 @@ void VirtualInputDevice::setEnabled(bool enabled)
 {
 }

-LEDs VirtualInputDevice::leds() const
-{
-    return LEDs();
-}
-
-void VirtualInputDevice::setLeds(LEDs leds)
-{
-}
-
 bool VirtualInputDevice::isKeyboard() const
 {
    return m_keyboard;
--- a/autotests/wayland/server/test_tablet_interface.cpp
+++ b/autotests/wayland/server/test_tablet_interface.cpp
@ -175,15 +175,6 @@ public:
    {
    }

-    LEDs leds() const override
-    {
-        return LEDs();
-    }
-
-    void setLeds(LEDs leds) override
-    {
-    }
-
    bool isKeyboard() const override
    {
        return false;
--- a/src/backends/fakeinput/fakeinputdevice.cpp
+++ b/src/backends/fakeinput/fakeinputdevice.cpp
@ -40,15 +40,6 @@ void FakeInputDevice::setEnabled(bool enabled)
 {
 }

-LEDs FakeInputDevice::leds() const
-{
-    return LEDs();
-}
-
-void FakeInputDevice::setLeds(LEDs leds)
-{
-}
-
 bool FakeInputDevice::isKeyboard() const
 {
    return true;
--- a/src/backends/fakeinput/fakeinputdevice.h
+++ b/src/backends/fakeinput/fakeinputdevice.h
@ -25,9 +25,6 @@ public:
    bool isEnabled() const override;
    void setEnabled(bool enabled) override;

-    LEDs leds() const override;
-    void setLeds(LEDs leds) override;
-
    bool isKeyboard() const override;
    bool isPointer() const override;
    bool isTouchpad() const override;
--- a/src/backends/wayland/wayland_backend.cpp
+++ b/src/backends/wayland/wayland_backend.cpp
@ -229,15 +229,6 @@ void WaylandInputDevice::setEnabled(bool enabled)
 {
 }

-LEDs WaylandInputDevice::leds() const
-{
-    return LEDs();
-}
-
-void WaylandInputDevice::setLeds(LEDs leds)
-{
-}
-
 bool WaylandInputDevice::isKeyboard() const
 {
    return m_keyboard != nullptr;
--- a/src/backends/wayland/wayland_backend.h
+++ b/src/backends/wayland/wayland_backend.h
@ -72,9 +72,6 @@ public:
    bool isEnabled() const override;
    void setEnabled(bool enabled) override;

-    LEDs leds() const override;
-    void setLeds(LEDs leds) override;
-
    bool isKeyboard() const override;
    bool isPointer() const override;
    bool isTouchpad() const override;
--- a/src/backends/x11/windowed/x11_windowed_backend.cpp
+++ b/src/backends/x11/windowed/x11_windowed_backend.cpp
@ -75,15 +75,6 @@ void X11WindowedInputDevice::setEnabled(bool enabled)
 {
 }

-LEDs X11WindowedInputDevice::leds() const
-{
-    return LEDs();
-}
-
-void X11WindowedInputDevice::setLeds(LEDs leds)
-{
-}
-
 bool X11WindowedInputDevice::isKeyboard() const
 {
    return m_keyboard;
--- a/src/backends/x11/windowed/x11_windowed_backend.h
+++ b/src/backends/x11/windowed/x11_windowed_backend.h
@ -48,9 +48,6 @@ public:
    bool isEnabled() const override;
    void setEnabled(bool enabled) override;

-    LEDs leds() const override;
-    void setLeds(LEDs leds) override;
-
    bool isKeyboard() const override;
    bool isPointer() const override;
    bool isTouchpad() const override;
--- a/src/core/inputdevice.cpp
+++ b/src/core/inputdevice.cpp
@ -39,6 +39,15 @@ void *InputDevice::group() const
    return nullptr;
 }

+LEDs InputDevice::leds() const
+{
+    return LEDs();
+}
+
+void InputDevice::setLeds(LEDs leds)
+{
+}
+
 QString InputDevice::outputName() const
 {
    return {};
--- a/src/core/inputdevice.h
+++ b/src/core/inputdevice.h
@ -100,8 +100,8 @@ public:
    virtual bool isEnabled() const = 0;
    virtual void setEnabled(bool enabled) = 0;

-    virtual LEDs leds() const = 0;
-    virtual void setLeds(LEDs leds) = 0;
+    virtual LEDs leds() const;
+    virtual void setLeds(LEDs leds);

    virtual bool isKeyboard() const = 0;
    virtual bool isPointer() const = 0;
--- a/src/plugins/buttonrebinds/buttonrebindsfilter.cpp
+++ b/src/plugins/buttonrebinds/buttonrebindsfilter.cpp
@ -56,15 +56,6 @@ QString InputDevice::name() const
    return QStringLiteral("Button rebinding device");
 }

-KWin::LEDs InputDevice::leds() const
-{
-    return {};
-}
-
-void InputDevice::setLeds(KWin::LEDs leds)
-{
-}
-
 void InputDevice::setEnabled(bool enabled)
 {
 }
--- a/src/plugins/buttonrebinds/buttonrebindsfilter.h
+++ b/src/plugins/buttonrebinds/buttonrebindsfilter.h
@ -25,9 +25,6 @@ class InputDevice : public KWin::InputDevice
    bool isEnabled() const override;
    void setEnabled(bool enabled) override;

-    void setLeds(KWin::LEDs leds) override;
-    KWin::LEDs leds() const override;
-
    bool isKeyboard() const override;
    bool isPointer() const override;
    bool isTouchpad() const override;
--- a/src/plugins/eis/eisdevice.cpp
+++ b/src/plugins/eis/eisdevice.cpp
@ -68,15 +68,6 @@ void EisDevice::setEnabled(bool enabled)
    enabled ? eis_device_resume(m_device) : eis_device_pause(m_device);
 }

-LEDs EisDevice::leds() const
-{
-    return LEDs();
-}
-
-void EisDevice::setLeds(LEDs leds)
-{
-}
-
 bool EisDevice::isKeyboard() const
 {
    return eis_device_has_capability(m_device, EIS_DEVICE_CAP_KEYBOARD);
--- a/src/plugins/eis/eisdevice.h
+++ b/src/plugins/eis/eisdevice.h
@ -35,9 +35,6 @@ public:
    bool isEnabled() const override;
    void setEnabled(bool enabled) override;

-    LEDs leds() const override;
-    void setLeds(LEDs leds) override;
-
    bool isKeyboard() const override;
    bool isPointer() const override;
    bool isTouchpad() const override;