Merge pull request #1 from InputActions/code-quality

taj-ny · web-flow · commit 474a8f0d8fb6 · 2026-01-27T18:50:34.000Z
make stuff movable
diff --git a/src/libinput-cpp/LibinputDevice.cpp b/src/libinput-cpp/LibinputDevice.cpp
@@ -59,9 +59,9 @@ QSizeF LibinputDevice::size() const
     return {width, height};
 }
 
-std::unique_ptr<UdevDevice> LibinputDevice::udevDevice() const
+UdevDevice LibinputDevice::udevDevice() const
 {
-    return std::make_unique<UdevDevice>(libinput_device_get_udev_device(m_device));
+    return {libinput_device_get_udev_device(m_device)};
 }
 
 }
diff --git a/src/libinput-cpp/LibinputDevice.h b/src/libinput-cpp/LibinputDevice.h
@@ -35,8 +35,6 @@ class LibinputDevice
     LibinputDevice(libinput_device *device);
     ~LibinputDevice();
 
-    Q_DISABLE_COPY_MOVE(LibinputDevice);
-
     libinput_device *raw() { return m_device; }
 
     /**
@@ -56,7 +54,7 @@ class LibinputDevice
     /**
      * @see libinput_device_get_udev_device
      */
-    std::unique_ptr<UdevDevice> udevDevice() const;
+    UdevDevice udevDevice() const;
 
     /**
      * @param value true - LIBINPUT_CONFIG_TAP_ENABLED, false - LIBINPUT_CONFIG_TAP_DISABLED
@@ -65,6 +63,8 @@ class LibinputDevice
     void configTapSetEnabled(bool value);
 
 private:
+    Q_DISABLE_COPY_MOVE(LibinputDevice);
+
     libinput_device *m_device;
 };
 
diff --git a/src/libinput-cpp/LibinputEvent.cpp b/src/libinput-cpp/LibinputEvent.cpp
@@ -30,8 +30,17 @@ LibinputEvent::LibinputEvent(libinput_event *event)
 {
 }
 
+LibinputEvent::LibinputEvent(LibinputEvent &&other)
+{
+    *this = std::move(other);
+}
+
 LibinputEvent::~LibinputEvent()
 {
+    if (!m_event) {
+        return;
+    }
+
     libinput_event_destroy(m_event);
 }
 
@@ -80,4 +89,10 @@ std::optional<LibinputTouchEvent> LibinputEvent::touchEvent() const
     return LibinputTouchEvent(event);
 }
 
+LibinputEvent &LibinputEvent::operator=(LibinputEvent &&other)
+{
+    std::swap(m_event, other.m_event);
+    return *this;
+}
+
 }
diff --git a/src/libinput-cpp/LibinputEvent.h b/src/libinput-cpp/LibinputEvent.h
@@ -34,10 +34,9 @@ class LibinputEvent
 {
 public:
     LibinputEvent(libinput_event *event);
+    LibinputEvent(LibinputEvent &&);
     ~LibinputEvent();
 
-    Q_DISABLE_COPY_MOVE(LibinputEvent);
-
     libinput_event_type type() const;
 
     /**
@@ -61,8 +60,12 @@ class LibinputEvent
      */
     std::optional<LibinputTouchEvent> touchEvent() const;
 
+    LibinputEvent &operator=(LibinputEvent &&);
+
 private:
-    libinput_event *m_event;
+    Q_DISABLE_COPY(LibinputEvent);
+
+    libinput_event *m_event{};
 };
 
 }
diff --git a/src/libinput-cpp/LibinputPathContext.cpp b/src/libinput-cpp/LibinputPathContext.cpp
@@ -80,14 +80,14 @@ void LibinputPathContext::dispatch()
     libinput_dispatch(m_libinput);
 }
 
-std::unique_ptr<LibinputEvent> LibinputPathContext::getEvent()
+std::optional<LibinputEvent> LibinputPathContext::getEvent()
 {
     auto *event = libinput_get_event(m_libinput);
     if (!event) {
         return {};
     }
 
-    return std::make_unique<LibinputEvent>(event);
+    return {event};
 }
 
 int LibinputPathContext::openRestricted(const char *path, int flags, void *data)
diff --git a/src/libinput-cpp/LibinputPathContext.h b/src/libinput-cpp/LibinputPathContext.h
@@ -42,9 +42,7 @@ class LibinputPathContext : public QObject
      * @see libinput_path_create_context
      */
     LibinputPathContext();
-    ~LibinputPathContext();
-
-    Q_DISABLE_COPY_MOVE(LibinputPathContext);
+    ~LibinputPathContext() override;
 
     /**
      * @see libinput_get_fd
@@ -64,7 +62,7 @@ class LibinputPathContext : public QObject
     /**
      * @see libinput_get_event
      */
-    std::unique_ptr<LibinputEvent> getEvent();
+    std::optional<LibinputEvent> getEvent();
 
 signals:
     void eventsAvailable();
@@ -73,6 +71,8 @@ class LibinputPathContext : public QObject
     static int openRestricted(const char *path, int flags, void *data);
     static void closeRestricted(int fd, void *data);
 
+    Q_DISABLE_COPY_MOVE(LibinputPathContext);
+
     libinput *m_libinput;
     std::unique_ptr<QSocketNotifier> m_notifier;
     bool m_grab{};
diff --git a/src/libinput-cpp/UdevDevice.cpp b/src/libinput-cpp/UdevDevice.cpp
@@ -29,12 +29,22 @@ UdevDevice::UdevDevice(udev_device *device)
 
 UdevDevice::~UdevDevice()
 {
+    if (!m_device) {
+        return;
+    }
+
     udev_device_unref(m_device);
 }
 
-const char *UdevDevice::propertyValue(const char *key)
+const char *UdevDevice::propertyValue(const char *key) const
 {
     return udev_device_get_property_value(m_device, key);
 }
 
+UdevDevice &UdevDevice::operator=(UdevDevice &&other)
+{
+    std::swap(m_device, other.m_device);
+    return *this;
+}
+
 }
diff --git a/src/libinput-cpp/UdevDevice.h b/src/libinput-cpp/UdevDevice.h
@@ -29,14 +29,17 @@ class UdevDevice
 {
 public:
     UdevDevice(udev_device *device);
+    UdevDevice(UdevDevice &&);
     ~UdevDevice();
 
-    Q_DISABLE_COPY_MOVE(UdevDevice);
+    const char *propertyValue(const char *key) const;
 
-    const char *propertyValue(const char *key);
+    UdevDevice &operator=(UdevDevice &&);
 
 private:
-    udev_device *m_device;
+    Q_DISABLE_COPY(UdevDevice);
+
+    udev_device *m_device{};
 };
 
 }

Original file line number	Diff line number	Diff line change
`@@ -59,9 +59,9 @@ QSizeF LibinputDevice::size() const`
`59`	`59`	`return {width, height};`
`60`	`60`	`}`
`61`	`61`
`62`		`-std::unique_ptr<UdevDevice> LibinputDevice::udevDevice() const`
	`62`	`+UdevDevice LibinputDevice::udevDevice() const`
`63`	`63`	`{`
`64`		`- return std::make_unique<UdevDevice>(libinput_device_get_udev_device(m_device));`
	`64`	`+ return {libinput_device_get_udev_device(m_device)};`
`65`	`65`	`}`
`66`	`66`
`67`	`67`	`}`
Original file line number	Diff line number	Diff line change
`@@ -30,8 +30,17 @@ LibinputEvent::LibinputEvent(libinput_event *event)`
`30`	`30`	`{`
`31`	`31`	`}`
`32`	`32`
	`33`	`+LibinputEvent::LibinputEvent(LibinputEvent &&other)`
	`34`	`+{`
	`35`	`+ *this = std::move(other);`
	`36`	`+}`
	`37`	`+`
`33`	`38`	`LibinputEvent::~LibinputEvent()`
`34`	`39`	`{`
	`40`	`+ if (!m_event) {`
	`41`	`+ return;`
	`42`	`+ }`
	`43`	`+`
`35`	`44`	`libinput_event_destroy(m_event);`
`36`	`45`	`}`
`37`	`46`
`@@ -80,4 +89,10 @@ std::optional<LibinputTouchEvent> LibinputEvent::touchEvent() const`
`80`	`89`	`return LibinputTouchEvent(event);`
`81`	`90`	`}`
`82`	`91`
	`92`	`+LibinputEvent &LibinputEvent::operator=(LibinputEvent &&other)`
	`93`	`+{`
	`94`	`+ std::swap(m_event, other.m_event);`
	`95`	`+ return *this;`
	`96`	`+}`
	`97`	`+`
`83`	`98`	`}`
Original file line number	Diff line number	Diff line change
`@@ -80,14 +80,14 @@ void LibinputPathContext::dispatch()`
`80`	`80`	`libinput_dispatch(m_libinput);`
`81`	`81`	`}`
`82`	`82`
`83`		`-std::unique_ptr<LibinputEvent> LibinputPathContext::getEvent()`
	`83`	`+std::optional<LibinputEvent> LibinputPathContext::getEvent()`
`84`	`84`	`{`
`85`	`85`	`auto *event = libinput_get_event(m_libinput);`
`86`	`86`	`if (!event) {`
`87`	`87`	`return {};`
`88`	`88`	`}`
`89`	`89`
`90`		`- return std::make_unique<LibinputEvent>(event);`
	`90`	`+ return {event};`
`91`	`91`	`}`
`92`	`92`
`93`	`93`	`int LibinputPathContext::openRestricted(const char path, int flags, void data)`
Original file line number	Diff line number	Diff line change
`@@ -29,12 +29,22 @@ UdevDevice::UdevDevice(udev_device *device)`
`29`	`29`
`30`	`30`	`UdevDevice::~UdevDevice()`
`31`	`31`	`{`
	`32`	`+ if (!m_device) {`
	`33`	`+ return;`
	`34`	`+ }`
	`35`	`+`
`32`	`36`	`udev_device_unref(m_device);`
`33`	`37`	`}`
`34`	`38`
`35`		`-const char UdevDevice::propertyValue(const char key)`
	`39`	`+const char UdevDevice::propertyValue(const char key) const`
`36`	`40`	`{`
`37`	`41`	`return udev_device_get_property_value(m_device, key);`
`38`	`42`	`}`
`39`	`43`
	`44`	`+UdevDevice &UdevDevice::operator=(UdevDevice &&other)`
	`45`	`+{`
	`46`	`+ std::swap(m_device, other.m_device);`
	`47`	`+ return *this;`
	`48`	`+}`
	`49`	`+`
`40`	`50`	`}`