revert

Author: droidmonkey

src/autotype/wayland/AutoTypeWayland.cpp

@@ -72,8 +72,8 @@ void AutoTypePlatformWayland::handleCreateSession(uint response, QVariantMap res
 
         QVariantMap selectDevicesOptions{
             {"handle_token", selectDevicesRequestHandle},
-            {"types", QVariant::fromValue(1)},
-            {"persist_mode", QVariant::fromValue(2)},
+            {"types", uint(1)},
+            {"persist_mode", uint(2)},
         };
 
         // TODO: Store restore token in database/some other persistent data so the dialog doesn't appear every launch
@@ -127,31 +127,15 @@ void AutoTypePlatformWayland::portalResponse(uint response, QVariantMap results,
 AutoTypeAction::Result AutoTypePlatformWayland::sendKey(xkb_keysym_t keysym, QVector<xkb_keysym_t> modifiers)
 {
     for (auto modifier : modifiers) {
-        m_remote_desktop.call("NotifyKeyboardKeysym",
-                              QVariant::fromValue(m_session_handle),
-                              QVariantMap(),
-                              QVariant::fromValue(modifier),
-                              QVariant::fromValue(1));
+        m_remote_desktop.call("NotifyKeyboardKeysym", QVariant::fromValue(m_session_handle), QVariantMap(), int(modifier), uint(1));
     }
 
-    m_remote_desktop.call("NotifyKeyboardKeysym",
-                          QVariant::fromValue(m_session_handle),
-                          QVariantMap(),
-                          QVariant::fromValue(keysym),
-                          QVariant::fromValue(1));
+    m_remote_desktop.call("NotifyKeyboardKeysym", QVariant::fromValue(m_session_handle), QVariantMap(), int(keysym), uint(1));
 
-    m_remote_desktop.call("NotifyKeyboardKeysym",
-                          QVariant::fromValue(m_session_handle),
-                          QVariantMap(),
-                          QVariant::fromValue(keysym),
-                          QVariant::fromValue(0));
+    m_remote_desktop.call("NotifyKeyboardKeysym", QVariant::fromValue(m_session_handle), QVariantMap(), int(keysym), uint(0));
 
     for (auto modifier : modifiers) {
-        m_remote_desktop.call("NotifyKeyboardKeysym",
-                              QVariant::fromValue(m_session_handle),
-                              QVariantMap(),
-                              QVariant::fromValue(modifier),
-                              QVariant::fromValue(0));
+        m_remote_desktop.call("NotifyKeyboardKeysym", QVariant::fromValue(m_session_handle), QVariantMap(), int(modifier), uint(0));
     }
     return AutoTypeAction::Result::Ok();
 }