From f60727c43860bdd98be3e86bcc531e1adaf8146d Mon Sep 17 00:00:00 2001
From: Xaver Hugl <xaver.hugl@gmail.com>
Date: Thu, 10 Aug 2023 18:58:58 +0200
Subject: [PATCH] utils/udev: drop Ptr alias

It's not very useful and makes it less clear what the type is
---
 src/backends/drm/drm_backend.cpp |  2 +-
 src/utils/udev.cpp               | 18 +++++++++---------
 src/utils/udev.h                 |  7 +++----
 3 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/src/backends/drm/drm_backend.cpp b/src/backends/drm/drm_backend.cpp
index 053ce50639..87db1a55bc 100644
--- a/src/backends/drm/drm_backend.cpp
+++ b/src/backends/drm/drm_backend.cpp
@@ -144,7 +144,7 @@ bool DrmBackend::initialize()
         }
     } else {
         const auto devices = m_udev->listGPUs();
-        for (const UdevDevice::Ptr &device : devices) {
+        for (const auto &device : devices) {
             if (device->seat() == m_session->seat()) {
                 addGpu(device->devNode());
             }
diff --git a/src/utils/udev.cpp b/src/utils/udev.cpp
index df723ccf19..a05688acb8 100644
--- a/src/utils/udev.cpp
+++ b/src/utils/udev.cpp
@@ -43,7 +43,7 @@ public:
     };
     void addMatch(Match match, const char *name);
     void scan();
-    std::vector<UdevDevice::Ptr> find();
+    std::vector<std::unique_ptr<UdevDevice>> find();
 
 private:
     Udev *m_udev;
@@ -92,12 +92,12 @@ void UdevEnumerate::scan()
     udev_enumerate_scan_devices(m_enumerate.get());
 }
 
-std::vector<UdevDevice::Ptr> UdevEnumerate::find()
+std::vector<std::unique_ptr<UdevDevice>> UdevEnumerate::find()
 {
     if (!m_enumerate) {
         return {};
     }
-    std::vector<UdevDevice::Ptr> vect;
+    std::vector<std::unique_ptr<UdevDevice>> vect;
     udev_list_entry *it = udev_enumerate_get_list_entry(m_enumerate.get());
     while (it) {
         auto current = it;
@@ -110,13 +110,13 @@ std::vector<UdevDevice::Ptr> UdevEnumerate::find()
     return vect;
 }
 
-std::vector<UdevDevice::Ptr> Udev::listGPUs()
+std::vector<std::unique_ptr<UdevDevice>> Udev::listGPUs()
 {
     if (!m_udev) {
         return {};
     }
 #if defined(Q_OS_FREEBSD)
-    std::vector<UdevDevice::Ptr> r;
+    std::vector<std::unique_ptr<UdevDevice>> r;
     r.push_back(deviceFromSyspath("/dev/dri/card0"));
     return r;
 #else
@@ -125,7 +125,7 @@ std::vector<UdevDevice::Ptr> Udev::listGPUs()
     enumerate.addMatch(UdevEnumerate::Match::SysName, "card[0-9]");
     enumerate.scan();
     auto vect = enumerate.find();
-    std::sort(vect.begin(), vect.end(), [](const UdevDevice::Ptr &device1, const UdevDevice::Ptr &device2) {
+    std::sort(vect.begin(), vect.end(), [](const auto &device1, const auto &device2) {
         // prevent usb devices from becoming the primaryGpu
         if (device1->isHotpluggable()) {
             return false;
@@ -149,7 +149,7 @@ std::vector<UdevDevice::Ptr> Udev::listGPUs()
 #endif
 }
 
-UdevDevice::Ptr Udev::deviceFromSyspath(const char *syspath)
+std::unique_ptr<UdevDevice> Udev::deviceFromSyspath(const char *syspath)
 {
     auto dev = udev_device_new_from_syspath(m_udev, syspath);
     if (!dev) {
@@ -282,10 +282,10 @@ void UdevMonitor::enable()
     udev_monitor_enable_receiving(m_monitor);
 }
 
-UdevDevice::Ptr UdevMonitor::getDevice()
+std::unique_ptr<UdevDevice> UdevMonitor::getDevice()
 {
     if (!m_monitor) {
-        return UdevDevice::Ptr();
+        return nullptr;
     }
     auto dev = udev_monitor_receive_device(m_monitor);
     return dev ? std::make_unique<UdevDevice>(dev) : nullptr;
diff --git a/src/utils/udev.h b/src/utils/udev.h
index bb3c7bb9ff..b935e77862 100644
--- a/src/utils/udev.h
+++ b/src/utils/udev.h
@@ -48,7 +48,6 @@ public:
     {
         return m_device;
     }
-    typedef std::unique_ptr<UdevDevice> Ptr;
 
 private:
     udev_device *const m_device;
@@ -67,7 +66,7 @@ public:
     }
     void filterSubsystemDevType(const char *subSystem, const char *devType = nullptr);
     void enable();
-    UdevDevice::Ptr getDevice();
+    std::unique_ptr<UdevDevice> getDevice();
 
 private:
     udev_monitor *m_monitor;
@@ -83,8 +82,8 @@ public:
     {
         return m_udev != nullptr;
     }
-    std::vector<UdevDevice::Ptr> listGPUs();
-    UdevDevice::Ptr deviceFromSyspath(const char *syspath);
+    std::vector<std::unique_ptr<UdevDevice>> listGPUs();
+    std::unique_ptr<UdevDevice> deviceFromSyspath(const char *syspath);
     std::unique_ptr<UdevMonitor> monitor();
     operator udev *() const
     {