Remove the ScopedGuard and replace it with the qScopeGuard function.

Fixes keepassxreboot#11543

src/keys/drivers/YubiKeyInterfacePCSC.cpp

@@ -20,6 +20,8 @@
 #include "core/Tools.h"
 #include "crypto/Random.h"
 
+#include <QScopeGuard>
+
 // MSYS2 does not define these macros
 // So set them to the value used by pcsc-lite
 #ifndef MAX_ATR_SIZE
@@ -511,30 +513,6 @@ namespace
             return rv;
         });
     }
-
-    class ScopeGuard
-    {
-    public:
-        template <typename F>
-        explicit ScopeGuard(F&& fn)
-            : m_function(std::forward<F>(fn))
-        {
-            static_assert(std::is_convertible_v<F, std::function<void()>>,
-                          "F-typed objects are not convertible to std::function<void()>");
-            static_assert(std::is_invocable_v<F>, "F-typed objects are not invocable");
-        }
-
-        ~ScopeGuard()
-        {
-            if (m_function) {
-                m_function();
-            }
-        }
-
-    private:
-        std::function<void()> m_function{};
-    };
-
 } // namespace
 
 YubiKeyInterfacePCSC::YubiKeyInterfacePCSC()
@@ -601,7 +579,7 @@ YubiKey::KeyMap YubiKeyInterfacePCSC::findValidKeys()
             continue;
         }
 
-        ScopeGuard disconnect{[hCard]() { SCardDisconnect(hCard, SCARD_LEAVE_CARD); }};
+        auto finally = qScopeGuard([hCard]() { SCardDisconnect(hCard, SCARD_LEAVE_CARD); });
 
         // Read the protocol and the ATR record
         char pbReader[MAX_READERNAME] = {0};
@@ -700,7 +678,7 @@ YubiKey::KeyList YubiKeyInterfacePCSC::findKeys()
             continue;
         }
 
-        ScopeGuard disconnect([hCard]() { SCardDisconnect(hCard, SCARD_LEAVE_CARD); });
+        auto finally = qScopeGuard([hCard]() { SCardDisconnect(hCard, SCARD_LEAVE_CARD); });
 
         // Read the protocol and the ATR record
         char pbReader[MAX_READERNAME] = {0};