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

Timestamp:

Mar 6, 2024 3:32:29 PM (13 months ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

162073

Message:

FE/Qt: Remove COMDef.h include from UISoftKeyboard.h

Location:

trunk/src/VBox/Frontends/VirtualBox/src/softkeyboard

Files:

• UISoftKeyboard.cpp (modified) (15 diffs)
• UISoftKeyboard.h (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/softkeyboard/UISoftKeyboard.cpp

@@ -420 +420 @@
     int height() const;
 
-    void setScanCode(LONG scanCode);
-    LONG scanCode() const;
-
-    void addScanCodePrefix(LONG scanCode);
-
-    void setUsageId(LONG usageId);
-    void setUsagePage(LONG usagePage);
-    QPair<LONG, LONG> usagePageIdPair() const;
+    void setScanCode(qint32 scanCode);
+    qint32 scanCode() const;
+
+    void addScanCodePrefix(qint32 scanCode);
+
+    void setUsageId(qint32 usageId);
+    void setUsagePage(qint32 usagePage);
+    QPair<qint32, qint32> usagePageIdPair() const;
 
     void setSpaceWidthAfter(int iSpace);
@@ -453 +453 @@
 
     void setParentWidget(UISoftKeyboardWidget* pParent);
-    QVector<LONG> scanCodeWithPrefix() const;
+    QVector<qint32> scanCodeWithPrefix() const;
 
     void setIsOSMenuKey(bool fFlag);
@@ -495 +495 @@
     int      m_iHeight;
     int      m_iSpaceWidthAfter;
-    LONG     m_scanCode;
-    QVector<LONG> m_scanCodePrefix;
+    qint32     m_scanCode;
+    QVector<qint32> m_scanCodePrefix;
 
     /** @name Cutouts are used to create non-rectangle keys polygons.
@@ -509 +509 @@
     int  m_iPosition;
     UISoftKeyboardWidget  *m_pParentWidget;
-    LONG m_iUsageId;
-    LONG m_iUsagePage;
+    qint32 m_iUsageId;
+    qint32 m_iUsagePage;
     KeyboardRegion m_enmKeyboardRegion;
     /** This is used for multimedia keys, OS key etc where we want to have a non-modifiable
@@ -648 +648 @@
 
     void sigStatusBarMessage(const QString &strMessage);
-    void sigPutKeyboardSequence(QVector<LONG> sequence);
-    void sigPutUsageCodesPress(QVector<QPair<LONG, LONG> > sequence);
-    void sigPutUsageCodesRelease(QVector<QPair<LONG, LONG> > sequence);
+    void sigPutKeyboardSequence(QVector<qint32> sequence);
+    void sigPutUsageCodesPress(QVector<QPair<qint32, qint32> > sequence);
+    void sigPutUsageCodesRelease(QVector<QPair<qint32, qint32> > sequence);
     void sigCurrentLayoutChange();
     void sigKeyToEdit(UISoftKeyboardKey* pKey);
@@ -1635 +1635 @@
 }
 
-void UISoftKeyboardKey::setScanCode(LONG scanCode)
+void UISoftKeyboardKey::setScanCode(qint32 scanCode)
 {
     m_scanCode = scanCode;
 }
 
-LONG UISoftKeyboardKey::scanCode() const
+qint32 UISoftKeyboardKey::scanCode() const
 {
     return m_scanCode;
 }
 
-void UISoftKeyboardKey::addScanCodePrefix(LONG scanCodePrefix)
+void UISoftKeyboardKey::addScanCodePrefix(qint32 scanCodePrefix)
 {
     m_scanCodePrefix << scanCodePrefix;
@@ -1660 +1660 @@
 }
 
-void UISoftKeyboardKey::setUsageId(LONG usageId)
+void UISoftKeyboardKey::setUsageId(qint32 usageId)
 {
     m_iUsageId = usageId;
 }
 
-void UISoftKeyboardKey::setUsagePage(LONG usagePage)
+void UISoftKeyboardKey::setUsagePage(qint32 usagePage)
 {
     m_iUsagePage = usagePage;
 }
 
-QPair<LONG, LONG> UISoftKeyboardKey::usagePageIdPair() const
-{
-    return QPair<LONG, LONG>(m_iUsageId, m_iUsagePage);
+QPair<qint32, qint32> UISoftKeyboardKey::usagePageIdPair() const
+{
+    return QPair<qint32, qint32>(m_iUsageId, m_iUsagePage);
 }
 
@@ -2904 +2904 @@
 #if 0
 
-    QVector<LONG> sequence;
+    QVector<qint32> sequence;
     if (!pKey->scanCodePrefix().isEmpty())
         sequence <<  pKey->scanCodePrefix();
@@ -2923 +2923 @@
 #else
 
-    QVector<QPair<LONG, LONG> > sequence;
-    sequence << QPair<LONG, LONG>(pKey->usagePageIdPair());
+    QVector<QPair<qint32, qint32> > sequence;
+    sequence << QPair<qint32, qint32>(pKey->usagePageIdPair());
     /* Add the pressed modifiers in the reverse order: */
     for (int i = m_pressedModifiers.size() - 1; i >= 0; --i)
@@ -2948 +2948 @@
 
 #if 0
-    QVector<LONG> sequence;
+    QVector<qint32> sequence;
      /* Add the pressed modifiers first: */
     for (int i = 0; i < m_pressedModifiers.size(); ++i)
@@ -2965 +2965 @@
 #else
 
-    QVector<QPair<LONG, LONG> > sequence;
+    QVector<QPair<qint32, qint32> > sequence;
 
      /* Add the pressed modifiers first: */
@@ -2987 +2987 @@
     pKey->setState(KeyState_NotPressed);
 
-    QVector<QPair<LONG, LONG> > sequence;
+    QVector<QPair<qint32, qint32> > sequence;
     sequence << pKey->usagePageIdPair();
     if (fRelease)
@@ -3443 +3443 @@
             {
                 bool fOk = false;
-                LONG iCode = strPrefix.toInt(&fOk, 16);
+                qint32 iCode = strPrefix.toInt(&fOk, 16);
                 if (fOk)
                     key.addScanCodePrefix(iCode);
@@ -4051 +4051 @@
 }
 
-void UISoftKeyboard::sltPutKeyboardSequence(QVector<LONG> sequence)
+void UISoftKeyboard::sltPutKeyboardSequence(QVector<qint32> sequence)
 {
     m_pMachine->putScancodes(sequence);
 }
 
-void UISoftKeyboard::sltPutUsageCodesPress(QVector<QPair<LONG, LONG> > sequence)
+void UISoftKeyboard::sltPutUsageCodesPress(QVector<QPair<qint32, qint32> > sequence)
 {
     for (int i = 0; i < sequence.size(); ++i)
@@ -4062 +4062 @@
 }
 
-void UISoftKeyboard::sltPutUsageCodesRelease(QVector<QPair<LONG, LONG> > sequence)
+void UISoftKeyboard::sltPutUsageCodesRelease(QVector<QPair<qint32, qint32> > sequence)
 {
     for (int i = 0; i < sequence.size(); ++i)

trunk/src/VBox/Frontends/VirtualBox/src/softkeyboard/UISoftKeyboard.h

@@ -34 +34 @@
 /* Qt includes: */
 #include <QMainWindow>
-
-/* COM includes: */
-#include "COMDefs.h"
 
 /* GUI includes: */
@@ -82 +79 @@
 
     void sltKeyboardLedsChange();
-    void sltPutKeyboardSequence(QVector<LONG> sequence);
-    void sltPutUsageCodesPress(QVector<QPair<LONG, LONG> > sequence);
-    void sltPutUsageCodesRelease(QVector<QPair<LONG, LONG> > sequence);
+    void sltPutKeyboardSequence(QVector<qint32> sequence);
+    void sltPutUsageCodesPress(QVector<QPair<qint32, qint32> > sequence);
+    void sltPutUsageCodesRelease(QVector<QPair<qint32, qint32> > sequence);
 
     /** Handles the signal we get from the layout selector widget.