Changeset 97853 in vbox for trunk/src/VBox/Frontends/VirtualBox

Timestamp:

Dec 22, 2022 10:48:48 AM (2 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9898: Migrating UIKeyboardHandler bits to Qt6.

File:

• trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIKeyboardHandler.cpp (modified) (3 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIKeyboardHandler.cpp

@@ -1753 +1753 @@
         {
             /* Send prepared scan-codes to the guest: */
-#ifdef VBOX_IS_QT6_OR_LATER
             QVector<LONG> scancodes;
-            for (uint i = 0; i < uCodesCount; i++)
-                scancodes.push_back(pCodes[i]);
+            for (uint i = 0; i < uCodesCount; ++i)
+                scancodes.append(pCodes[i]);
             keyboard().PutScancodes(scancodes);
-#else
-            std::vector<LONG> scancodes(pCodes, &pCodes[uCodesCount]);
-            keyboard().PutScancodes(QVector<LONG>::fromStdVector(scancodes));
-#endif
         }
 
@@ -1784 +1779 @@
     Q_UNUSED(iHotKey);
     if (pHotKey && pHotKey[0] && !pHotKey[1])
-# ifdef VBOX_IS_QT6_OR_LATER
         fWasProcessed = actionPool()->processHotKey(QKeySequence(QChar(pHotKey[0]).toUpper().unicode()));
-# else
-        fWasProcessed = actionPool()->processHotKey(QKeySequence(Qt::UNICODE_ACCEL + QChar(pHotKey[0]).toUpper().unicode()));
-# endif
 
 #elif defined(VBOX_WS_WIN)
@@ -1822 +1813 @@
         {
             QChar qtSymbol = QString::fromLocal8Bit(&symbol, 1)[0];
-# ifdef VBOX_IS_QT6_OR_LATER
             fWasProcessed = actionPool()->processHotKey(QKeySequence(qtSymbol.toUpper().unicode()));
-# else
-            fWasProcessed = actionPool()->processHotKey(QKeySequence((Qt::UNICODE_ACCEL + qtSymbol.toUpper().unicode())));
-# endif
         }
     }