Changeset 103869 in vbox

Timestamp:

Mar 15, 2024 2:44:58 PM (12 months ago)

Author:

vboxsync

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

162240

Message:

FE/Qt. bugref:10618. Removing COMDefs.h from softkeyboard header file.

Location:

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

Files:

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

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

@@ -649 +649 @@
 
     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 sigCurrentLayoutChange();
     void sigKeyToEdit(UISoftKeyboardKey* pKey);
@@ -659 +656 @@
 public:
 
-    UISoftKeyboardWidget(QWidget *pParent = 0);
+    UISoftKeyboardWidget(QWidget *pParent, UIMachine *pMachine);
 
     virtual QSize minimumSizeHint() const RT_OVERRIDE;
@@ -714 +711 @@
     virtual void mouseMoveEvent(QMouseEvent *pEvent) RT_OVERRIDE;
     virtual void retranslateUi() RT_OVERRIDE;
+
+private slots:
+
+    void sltKeyboardLedsChange();
 
 private:
@@ -741 +742 @@
     UISoftKeyboardColorTheme *colorTheme(const QString &strColorThemeName);
     void showKeyTooltip(UISoftKeyboardKey *pKey);
-
+    void putKeyboardSequence(QVector<LONG> sequence);
+    void putUsageCodesPress(QVector<QPair<LONG, LONG> > sequence);
+    void putUsageCodesRelease(QVector<QPair<LONG, LONG> > sequence);
+
+    UIMachine         *m_pMachine;
     UISoftKeyboardKey *m_pKeyUnderMouse;
     UISoftKeyboardKey *m_pKeyBeingEdited;
@@ -2297 +2302 @@
 *********************************************************************************************************************************/
 
-UISoftKeyboardWidget::UISoftKeyboardWidget(QWidget *pParent /* = 0 */)
+UISoftKeyboardWidget::UISoftKeyboardWidget(QWidget *pParent, UIMachine *pMachine)
     :QIWithRetranslateUI<QWidget>(pParent)
+    , m_pMachine(pMachine)
     , m_pKeyUnderMouse(0)
     , m_pKeyBeingEdited(0)
@@ -2920 +2926 @@
         pModifier->release();
     }
-    emit sigPutKeyboardSequence(sequence);
+    putKeyboardSequence(sequence);
 
 #else
@@ -2934 +2940 @@
         pModifier->release();
     }
-    emit sigPutUsageCodesRelease(sequence);
+    putUsageCodesRelease(sequence);
 
 #endif
@@ -2962 +2968 @@
         sequence << pKey->scanCodePrefix();
     sequence << pKey->scanCode();
-    emit sigPutKeyboardSequence(sequence);
+    putKeyboardSequence(sequence);
 
 #else
@@ -2976 +2982 @@
 
     sequence << pKey->usagePageIdPair();
-    emit sigPutUsageCodesPress(sequence);
+    putUsageCodesPress(sequence);
 
 #endif
@@ -2991 +2997 @@
     sequence << pKey->usagePageIdPair();
     if (fRelease)
-        emit sigPutUsageCodesRelease(sequence);
+        putUsageCodesRelease(sequence);
     else
-        emit sigPutUsageCodesPress(sequence);
+        putUsageCodesPress(sequence);
 }
 
@@ -3249 +3255 @@
 {
     setMouseTracking(true);
+    connect(m_pMachine, &UIMachine::sigKeyboardLedsChange, this, &UISoftKeyboardWidget::sltKeyboardLedsChange);
 }
 
@@ -3343 +3350 @@
     return m_physicalLayouts;
 }
+
+void UISoftKeyboardWidget::sltKeyboardLedsChange()
+{
+    if (m_pMachine)
+    {
+        bool fNumLockLed = m_pMachine->isNumLock();
+        bool fCapsLockLed = m_pMachine->isCapsLock();
+        bool fScrollLockLed = m_pMachine->isScrollLock();
+        updateLockKeyStates(fCapsLockLed, fNumLockLed, fScrollLockLed);
+    }
+}
+
+void UISoftKeyboardWidget::putKeyboardSequence(QVector<LONG> sequence)
+{
+    if (m_pMachine)
+        m_pMachine->putScancodes(sequence);
+}
+
+void UISoftKeyboardWidget::putUsageCodesPress(QVector<QPair<LONG, LONG> > sequence)
+{
+    if (m_pMachine)
+    {
+        for (int i = 0; i < sequence.size(); ++i)
+            m_pMachine->putUsageCode(sequence[i].first, sequence[i].second, false);
+    }
+}
+
+void UISoftKeyboardWidget::putUsageCodesRelease(QVector<QPair<LONG, LONG> > sequence)
+{
+    if (m_pMachine)
+    {
+        for (int i = 0; i < sequence.size(); ++i)
+            m_pMachine->putUsageCode(sequence[i].first, sequence[i].second, true);
+    }
+}
+
 
 /*********************************************************************************************************************************
@@ -3937 +3980 @@
 }
 
-
 /*********************************************************************************************************************************
 *   UISoftKeyboard implementation.                                                                                  *
@@ -4043 +4085 @@
 }
 
-void UISoftKeyboard::sltKeyboardLedsChange()
-{
-    bool fNumLockLed = m_pMachine->isNumLock();
-    bool fCapsLockLed = m_pMachine->isCapsLock();
-    bool fScrollLockLed = m_pMachine->isScrollLock();
-    if (m_pKeyboardWidget)
-        m_pKeyboardWidget->updateLockKeyStates(fCapsLockLed, fNumLockLed, fScrollLockLed);
-}
-
-void UISoftKeyboard::sltPutKeyboardSequence(QVector<LONG> sequence)
-{
-    m_pMachine->putScancodes(sequence);
-}
-
-void UISoftKeyboard::sltPutUsageCodesPress(QVector<QPair<LONG, LONG> > sequence)
-{
-    for (int i = 0; i < sequence.size(); ++i)
-        m_pMachine->putUsageCode(sequence[i].first, sequence[i].second, false);
-}
-
-void UISoftKeyboard::sltPutUsageCodesRelease(QVector<QPair<LONG, LONG> > sequence)
-{
-    for (int i = 0; i < sequence.size(); ++i)
-        m_pMachine->putUsageCode(sequence[i].first, sequence[i].second, true);
-}
-
 void UISoftKeyboard::sltLayoutSelectionChanged(const QUuid &layoutUid)
 {
@@ -4288 +4304 @@
         m_pSettingsWidget->hide();
     }
-    m_pKeyboardWidget = new UISoftKeyboardWidget;
+    m_pKeyboardWidget = new UISoftKeyboardWidget(this, m_pMachine);
     if (!m_pKeyboardWidget)
         return;
@@ -4310 +4326 @@
 void UISoftKeyboard::prepareConnections()
 {
-    connect(m_pMachine, &UIMachine::sigKeyboardLedsChange, this, &UISoftKeyboard::sltKeyboardLedsChange);
-    connect(m_pKeyboardWidget, &UISoftKeyboardWidget::sigPutKeyboardSequence, this, &UISoftKeyboard::sltPutKeyboardSequence);
-    connect(m_pKeyboardWidget, &UISoftKeyboardWidget::sigPutUsageCodesPress, this, &UISoftKeyboard::sltPutUsageCodesPress);
-    connect(m_pKeyboardWidget, &UISoftKeyboardWidget::sigPutUsageCodesRelease, this, &UISoftKeyboard::sltPutUsageCodesRelease);
     connect(m_pKeyboardWidget, &UISoftKeyboardWidget::sigCurrentLayoutChange, this, &UISoftKeyboard::sltCurentLayoutChanged);
     connect(m_pKeyboardWidget, &UISoftKeyboardWidget::sigKeyToEdit, this, &UISoftKeyboard::sltKeyToEditChanged);

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

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